diff --git a/atst/domain/task_orders.py b/atst/domain/task_orders.py
index 67dca82b..9d9d7219 100644
--- a/atst/domain/task_orders.py
+++ b/atst/domain/task_orders.py
@@ -16,6 +16,7 @@ class TaskOrderError(Exception):
 class TaskOrders(object):
     SECTIONS = {
         "app_info": [
+            "portfolio_name",
             "scope",
             "defense_component",
             "app_migration",
diff --git a/atst/forms/task_order.py b/atst/forms/task_order.py
index f618ee0e..85dd2bc6 100644
--- a/atst/forms/task_order.py
+++ b/atst/forms/task_order.py
@@ -51,6 +51,7 @@ class AppInfoForm(CacheableForm):
         translate("forms.task_order.native_apps.label"),
         description=translate("forms.task_order.native_apps.description"),
         choices=[("yes", "Yes"), ("no", "No"), ("not_sure", "Not Sure")],
+        default="",
         validators=[Optional()],
     )
     complexity = SelectMultipleField(
diff --git a/templates/task_orders/new/review.html b/templates/task_orders/new/review.html
index bfd90827..57fb5e9f 100644
--- a/templates/task_orders/new/review.html
+++ b/templates/task_orders/new/review.html
@@ -67,8 +67,13 @@
 <h3 class="subheading">{{ "task_orders.new.review.reporting"| translate }} {{ TOEditLink(screen=1, anchor="reporting") }}</h3>
 
 <div class="row">
-  {{ ReviewField(("forms.task_order.app_migration.label" | translate), ("forms.task_order.app_migration.{}".format(task_order.app_migration) | translate), filter="removeHtml") }}
-  {{ ReviewField(("forms.task_order.native_apps.label" | translate), ("forms.task_order.native_apps.{}".format(task_order.native_apps))| translate) }}
+  {% if task_order.app_migration %}
+    {{ ReviewField(("forms.task_order.app_migration.label" | translate), ("forms.task_order.app_migration.{}".format(task_order.app_migration) | translate), filter="removeHtml") }}
+  {% endif %}
+
+  {% if task_order.native_apps %}
+    {{ ReviewField(("forms.task_order.native_apps.label" | translate), ("forms.task_order.native_apps.{}".format(task_order.native_apps))| translate) }}
+  {% endif %}
 </div>
 
 <h4 class='task-order-form__heading'>{{ "task_orders.new.review.complexity"| translate }}</h4>
@@ -104,7 +109,9 @@
     {% endif %}
   </div>
 
-  {{ ReviewField(("forms.task_order.team_experience.label" |translate), ("forms.task_order.team_experience.{}".format(task_order.team_experience)) | translate) }}
+  {% if task_order.team_experience %}
+    {{ ReviewField(("forms.task_order.team_experience.label" |translate), ("forms.task_order.team_experience.{}".format(task_order.team_experience)) | translate) }}
+  {% endif %}
 </div>
 
 <hr>
diff --git a/tests/domain/test_task_orders.py b/tests/domain/test_task_orders.py
index aa4bd476..d62a8634 100644
--- a/tests/domain/test_task_orders.py
+++ b/tests/domain/test_task_orders.py
@@ -16,6 +16,7 @@ def test_section_completion_status():
     dict_keys = [k for k in TaskOrders.SECTIONS.keys()]
     section = dict_keys[0]
     attrs = TaskOrders.SECTIONS[section].copy()
+    attrs.remove("portfolio_name")
     task_order = TaskOrderFactory.create(**{k: None for k in attrs})
     leftover = attrs.pop()