diff --git a/uitests/New_Portfolio.html b/uitests/New_Portfolio.html
index 356cb2b3..5495828f 100644
--- a/uitests/New_Portfolio.html
+++ b/uitests/New_Portfolio.html
@@ -16,7 +16,7 @@
 <meta name="ghost-inspector-screenshotTarget" content="" />
 <meta name="ghost-inspector-screenshotExclusions" content="div.global-navigation, time" />
 <meta name="ghost-inspector-screenshotCompareEnabled" content="true" />
-<meta name="ghost-inspector-screenshotCompareThreshold" content="0.05" />
+<meta name="ghost-inspector-screenshotCompareThreshold" content="0.02" />
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
@@ -63,7 +63,7 @@
 <td>css=a[href="/portfolios/new"]</td>
 <td></td>
 </tr>
-<tr>
+<tr original-target="a[href="/portfolios/new"],xpath=//a[contains(text(), "Add New Portfolio")]">
 <td>click</td>
 <td>css=a[href="/portfolios/new"]</td>
 <td></td>
@@ -75,13 +75,28 @@
 </tr>
 <tr>
 <td>waitForElementPresent</td>
-<td>css=main.usa-section > h1</td>
+<td>css=.portfolio-header__name > h1</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=main.usa-section > h1</td>
-<td>*New Portfolio Form*</td>
+<td>css=.portfolio-header__name > h1</td>
+<td>*New Portfolio*</td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.sticky-cta-text > h3</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.sticky-cta-text > h3</td>
+<td>*Create New Portfolio*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -105,177 +120,12 @@
 </tr>
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component</td>
+<td>css=fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
 <td></td>
 </tr>
-<tr>
-<td>type</td>
-<td>css=#defense_component</td>
-<td>Defense Logistics Agency</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#description</td>
-<td></td>
-</tr>
-<tr>
-<td>type</td>
-<td>css=#description</td>
-<td>Maintenance and monitoring of the energy grid</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#app_migration > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
+<tr original-target="fieldset.usa-input__choices > ul > li:nth-of-type(5) > label,xpath=//label[contains(text(), "Other")]">
 <td>click</td>
-<td>css=#app_migration > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#native_apps > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#native_apps > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(4) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(4) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#team_experience > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#team_experience > li:nth-of-type(5) > label</td>
+<td>css=fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
 <td></td>
 </tr>
 <tr>
@@ -289,53 +139,23 @@
 <td></td>
 </tr>
 <tr>
+<td>click</td>
+<td>css=input[type="submit"]</td>
+<td></td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.empty-state > h3</td>
+<td></td>
+</tr>
+<tr>
 <td>assertText</td>
-<td>css=input[type="submit"]</td>
-<td>Save</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>waitForElementPresent</td>
-<td>css=input[type="submit"]</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=input[type="submit"]</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>waitForElementPresent</td>
-<td>css=.portfolio-header__name > h1</td>
-<td></td>
-</tr>
-<tr>
-<td>assertText</td>
-<td>css=.portfolio-header__name > h1</td>
-<td>*Tatooine Energy Maintenance Systems*</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>waitForElementPresent</td>
-<td>css=.empty-state h3</td>
-<td></td>
-</tr>
-<tr>
-<td>assertText</td>
-<td>css=.empty-state h3</td>
+<td>css=.empty-state > h3</td>
 <td>*You don't have any Applications yet*</td>
 </tr>
 </tbody>
diff --git a/uitests/TO_Step_1.html b/uitests/TO_Step_1.html
index f8536744..217798ca 100644
--- a/uitests/TO_Step_1.html
+++ b/uitests/TO_Step_1.html
@@ -16,7 +16,7 @@
 <meta name="ghost-inspector-screenshotTarget" content="" />
 <meta name="ghost-inspector-screenshotExclusions" content="div.global-navigation, time" />
 <meta name="ghost-inspector-screenshotCompareEnabled" content="true" />
-<meta name="ghost-inspector-screenshotCompareThreshold" content="0.05" />
+<meta name="ghost-inspector-screenshotCompareThreshold" content="0.02" />
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
@@ -66,7 +66,7 @@ Imported from: AT-AT CI - login-->
 <td>css=a[href="/portfolios/new"]</td>
 <td></td>
 </tr>
-<tr>
+<tr original-target="a[href="/portfolios/new"],xpath=//a[contains(text(), "Add New Portfolio")]">
 <td>click</td>
 <td>css=a[href="/portfolios/new"]</td>
 <td></td>
@@ -79,13 +79,29 @@ Imported from: AT-AT CI - login-->
 <!--Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=main.usa-section > h1</td>
+<td>css=.portfolio-header__name > h1</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=main.usa-section > h1</td>
-<td>*New Portfolio Form*</td>
+<td>css=.portfolio-header__name > h1</td>
+<td>*New Portfolio*</td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - New Portfolio-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.sticky-cta-text > h3</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.sticky-cta-text > h3</td>
+<td>*Create New Portfolio*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -111,188 +127,12 @@ Imported from: AT-AT CI - login-->
 <!--Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component</td>
+<td>css=fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
 <td></td>
 </tr>
-<tr>
-<td>type</td>
-<td>css=#defense_component</td>
-<td>Defense Logistics Agency</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#description</td>
-<td></td>
-</tr>
-<tr>
-<td>type</td>
-<td>css=#description</td>
-<td>Maintenance and monitoring of the energy grid</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#app_migration > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
+<tr original-target="fieldset.usa-input__choices > ul > li:nth-of-type(5) > label,xpath=//label[contains(text(), "Other")]">
 <td>click</td>
-<td>css=#app_migration > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#native_apps > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#native_apps > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(4) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(4) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#team_experience > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#team_experience > li:nth-of-type(5) > label</td>
+<td>css=fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
 <td></td>
 </tr>
 <tr>
@@ -307,56 +147,24 @@ Imported from: AT-AT CI - login-->
 <td></td>
 </tr>
 <tr>
+<td>click</td>
+<td>css=input[type="submit"]</td>
+<td></td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - New Portfolio-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.empty-state > h3</td>
+<td></td>
+</tr>
+<tr>
 <td>assertText</td>
-<td>css=input[type="submit"]</td>
-<td>Save</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=input[type="submit"]</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=input[type="submit"]</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=.portfolio-header__name > h1</td>
-<td></td>
-</tr>
-<tr>
-<td>assertText</td>
-<td>css=.portfolio-header__name > h1</td>
-<td>*Tatooine Energy Maintenance Systems*</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=.empty-state h3</td>
-<td></td>
-</tr>
-<tr>
-<td>assertText</td>
-<td>css=.empty-state h3</td>
+<td>css=.empty-state > h3</td>
 <td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
@@ -411,13 +219,13 @@ Imported from: AT-AT CI - login-->
 </tr>
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.sticky-cta-text > h3</td>
+<td>css=.sticky-cta-context</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.sticky-cta-text > h3</td>
-<td>*Add Task Order (step 1 of 5)*</td>
+<td>css=.sticky-cta-context</td>
+<td>*Step 1 of 5*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
diff --git a/uitests/TO_Step_2.html b/uitests/TO_Step_2.html
index 4dd7f908..980b2628 100644
--- a/uitests/TO_Step_2.html
+++ b/uitests/TO_Step_2.html
@@ -16,7 +16,7 @@
 <meta name="ghost-inspector-screenshotTarget" content="" />
 <meta name="ghost-inspector-screenshotExclusions" content="div.global-navigation, time" />
 <meta name="ghost-inspector-screenshotCompareEnabled" content="true" />
-<meta name="ghost-inspector-screenshotCompareThreshold" content="0.05" />
+<meta name="ghost-inspector-screenshotCompareThreshold" content="0.02" />
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
@@ -69,7 +69,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td>css=a[href="/portfolios/new"]</td>
 <td></td>
 </tr>
-<tr>
+<tr original-target="a[href="/portfolios/new"],xpath=//a[contains(text(), "Add New Portfolio")]">
 <td>click</td>
 <td>css=a[href="/portfolios/new"]</td>
 <td></td>
@@ -83,13 +83,30 @@ Imported from: AT-AT CI - New Portfolio-->
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=main.usa-section > h1</td>
+<td>css=.portfolio-header__name > h1</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=main.usa-section > h1</td>
-<td>*New Portfolio Form*</td>
+<td>css=.portfolio-header__name > h1</td>
+<td>*New Portfolio*</td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - TO Step 1
+Imported from: AT-AT CI - New Portfolio-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.sticky-cta-text > h3</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.sticky-cta-text > h3</td>
+<td>*Create New Portfolio*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -117,199 +134,12 @@ Imported from: AT-AT CI - New Portfolio-->
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component</td>
+<td>css=fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
 <td></td>
 </tr>
-<tr>
-<td>type</td>
-<td>css=#defense_component</td>
-<td>Defense Logistics Agency</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#description</td>
-<td></td>
-</tr>
-<tr>
-<td>type</td>
-<td>css=#description</td>
-<td>Maintenance and monitoring of the energy grid</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#app_migration > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
+<tr original-target="fieldset.usa-input__choices > ul > li:nth-of-type(5) > label,xpath=//label[contains(text(), "Other")]">
 <td>click</td>
-<td>css=#app_migration > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#native_apps > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#native_apps > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(4) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(4) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#team_experience > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#team_experience > li:nth-of-type(5) > label</td>
+<td>css=fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
 <td></td>
 </tr>
 <tr>
@@ -325,59 +155,25 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 </tr>
 <tr>
+<td>click</td>
+<td>css=input[type="submit"]</td>
+<td></td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - TO Step 1
+Imported from: AT-AT CI - New Portfolio-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.empty-state > h3</td>
+<td></td>
+</tr>
+<tr>
 <td>assertText</td>
-<td>css=input[type="submit"]</td>
-<td>Save</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=input[type="submit"]</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=input[type="submit"]</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=.portfolio-header__name > h1</td>
-<td></td>
-</tr>
-<tr>
-<td>assertText</td>
-<td>css=.portfolio-header__name > h1</td>
-<td>*Tatooine Energy Maintenance Systems*</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=.empty-state h3</td>
-<td></td>
-</tr>
-<tr>
-<td>assertText</td>
-<td>css=.empty-state h3</td>
+<td>css=.empty-state > h3</td>
 <td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
@@ -436,13 +232,13 @@ Imported from: AT-AT CI - New Portfolio-->
 <!--Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.sticky-cta-text > h3</td>
+<td>css=.sticky-cta-context</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.sticky-cta-text > h3</td>
-<td>*Add Task Order (step 1 of 5)*</td>
+<td>css=.sticky-cta-context</td>
+<td>*Step 1 of 5*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -526,13 +322,13 @@ This is Ghost Inspector flow control. The test will wait until the file is uploa
 </tr>
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.sticky-cta-text > h3</td>
+<td>css=.sticky-cta-context</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.sticky-cta-text > h3</td>
-<td>*Add Task Order (step 2 of 5)*</td>
+<td>css=.sticky-cta-context</td>
+<td>*Step 2 of 5*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
diff --git a/uitests/TO_Step_3.html b/uitests/TO_Step_3.html
index 08a12033..6467b614 100644
--- a/uitests/TO_Step_3.html
+++ b/uitests/TO_Step_3.html
@@ -16,7 +16,7 @@
 <meta name="ghost-inspector-screenshotTarget" content="" />
 <meta name="ghost-inspector-screenshotExclusions" content="div.global-navigation, time" />
 <meta name="ghost-inspector-screenshotCompareEnabled" content="true" />
-<meta name="ghost-inspector-screenshotCompareThreshold" content="0.05" />
+<meta name="ghost-inspector-screenshotCompareThreshold" content="0.02" />
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
@@ -72,7 +72,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td>css=a[href="/portfolios/new"]</td>
 <td></td>
 </tr>
-<tr>
+<tr original-target="a[href="/portfolios/new"],xpath=//a[contains(text(), "Add New Portfolio")]">
 <td>click</td>
 <td>css=a[href="/portfolios/new"]</td>
 <td></td>
@@ -87,13 +87,31 @@ Imported from: AT-AT CI - TO Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=main.usa-section > h1</td>
+<td>css=.portfolio-header__name > h1</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=main.usa-section > h1</td>
-<td>*New Portfolio Form*</td>
+<td>css=.portfolio-header__name > h1</td>
+<td>*New Portfolio*</td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - TO Step 2
+Imported from: AT-AT CI - TO Step 1
+Imported from: AT-AT CI - New Portfolio-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.sticky-cta-text > h3</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.sticky-cta-text > h3</td>
+<td>*Create New Portfolio*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -123,210 +141,12 @@ Imported from: AT-AT CI - TO Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component</td>
+<td>css=fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
 <td></td>
 </tr>
-<tr>
-<td>type</td>
-<td>css=#defense_component</td>
-<td>Defense Logistics Agency</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#description</td>
-<td></td>
-</tr>
-<tr>
-<td>type</td>
-<td>css=#description</td>
-<td>Maintenance and monitoring of the energy grid</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#app_migration > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
+<tr original-target="fieldset.usa-input__choices > ul > li:nth-of-type(5) > label,xpath=//label[contains(text(), "Other")]">
 <td>click</td>
-<td>css=#app_migration > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#native_apps > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#native_apps > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(4) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(4) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#team_experience > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#team_experience > li:nth-of-type(5) > label</td>
+<td>css=fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
 <td></td>
 </tr>
 <tr>
@@ -343,62 +163,26 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 </tr>
 <tr>
+<td>click</td>
+<td>css=input[type="submit"]</td>
+<td></td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - TO Step 2
+Imported from: AT-AT CI - TO Step 1
+Imported from: AT-AT CI - New Portfolio-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.empty-state > h3</td>
+<td></td>
+</tr>
+<tr>
 <td>assertText</td>
-<td>css=input[type="submit"]</td>
-<td>Save</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=input[type="submit"]</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=input[type="submit"]</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=.portfolio-header__name > h1</td>
-<td></td>
-</tr>
-<tr>
-<td>assertText</td>
-<td>css=.portfolio-header__name > h1</td>
-<td>*Tatooine Energy Maintenance Systems*</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=.empty-state h3</td>
-<td></td>
-</tr>
-<tr>
-<td>assertText</td>
-<td>css=.empty-state h3</td>
+<td>css=.empty-state > h3</td>
 <td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
@@ -461,13 +245,13 @@ Imported from: AT-AT CI - TO Step 1-->
 Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.sticky-cta-text > h3</td>
+<td>css=.sticky-cta-context</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.sticky-cta-text > h3</td>
-<td>*Add Task Order (step 1 of 5)*</td>
+<td>css=.sticky-cta-context</td>
+<td>*Step 1 of 5*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -557,13 +341,13 @@ Imported from: AT-AT CI - TO Step 1-->
 <!--Imported from: AT-AT CI - TO Step 2-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.sticky-cta-text > h3</td>
+<td>css=.sticky-cta-context</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.sticky-cta-text > h3</td>
-<td>*Add Task Order (step 2 of 5)*</td>
+<td>css=.sticky-cta-context</td>
+<td>*Step 2 of 5*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -619,13 +403,13 @@ Imported from: AT-AT CI - TO Step 1-->
 </tr>
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.sticky-cta-text > h3</td>
+<td>css=.sticky-cta-context</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.sticky-cta-text > h3</td>
-<td>*Add Task Order (step 3 of 5)*</td>
+<td>css=.sticky-cta-context</td>
+<td>*Step 3 of 5*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
diff --git a/uitests/TO_Step_3_-_Add_CLIN.html b/uitests/TO_Step_3_-_Add_CLIN.html
index c9230826..e385a3a8 100644
--- a/uitests/TO_Step_3_-_Add_CLIN.html
+++ b/uitests/TO_Step_3_-_Add_CLIN.html
@@ -16,7 +16,7 @@
 <meta name="ghost-inspector-screenshotTarget" content="" />
 <meta name="ghost-inspector-screenshotExclusions" content="div.global-navigation, time" />
 <meta name="ghost-inspector-screenshotCompareEnabled" content="true" />
-<meta name="ghost-inspector-screenshotCompareThreshold" content="0.05" />
+<meta name="ghost-inspector-screenshotCompareThreshold" content="0.02" />
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
@@ -75,7 +75,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td>css=a[href="/portfolios/new"]</td>
 <td></td>
 </tr>
-<tr>
+<tr original-target="a[href="/portfolios/new"],xpath=//a[contains(text(), "Add New Portfolio")]">
 <td>click</td>
 <td>css=a[href="/portfolios/new"]</td>
 <td></td>
@@ -91,13 +91,32 @@ Imported from: AT-AT CI - TO Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=main.usa-section > h1</td>
+<td>css=.portfolio-header__name > h1</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=main.usa-section > h1</td>
-<td>*New Portfolio Form*</td>
+<td>css=.portfolio-header__name > h1</td>
+<td>*New Portfolio*</td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - TO Step 3
+Imported from: AT-AT CI - TO Step 2
+Imported from: AT-AT CI - TO Step 1
+Imported from: AT-AT CI - New Portfolio-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.sticky-cta-text > h3</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.sticky-cta-text > h3</td>
+<td>*Create New Portfolio*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -129,221 +148,12 @@ Imported from: AT-AT CI - TO Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component</td>
+<td>css=fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
 <td></td>
 </tr>
-<tr>
-<td>type</td>
-<td>css=#defense_component</td>
-<td>Defense Logistics Agency</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#description</td>
-<td></td>
-</tr>
-<tr>
-<td>type</td>
-<td>css=#description</td>
-<td>Maintenance and monitoring of the energy grid</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#app_migration > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
+<tr original-target="fieldset.usa-input__choices > ul > li:nth-of-type(5) > label,xpath=//label[contains(text(), "Other")]">
 <td>click</td>
-<td>css=#app_migration > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#native_apps > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#native_apps > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(4) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(4) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#team_experience > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#team_experience > li:nth-of-type(5) > label</td>
+<td>css=fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
 <td></td>
 </tr>
 <tr>
@@ -361,65 +171,27 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 </tr>
 <tr>
+<td>click</td>
+<td>css=input[type="submit"]</td>
+<td></td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - TO Step 3
+Imported from: AT-AT CI - TO Step 2
+Imported from: AT-AT CI - TO Step 1
+Imported from: AT-AT CI - New Portfolio-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.empty-state > h3</td>
+<td></td>
+</tr>
+<tr>
 <td>assertText</td>
-<td>css=input[type="submit"]</td>
-<td>Save</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=input[type="submit"]</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=input[type="submit"]</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=.portfolio-header__name > h1</td>
-<td></td>
-</tr>
-<tr>
-<td>assertText</td>
-<td>css=.portfolio-header__name > h1</td>
-<td>*Tatooine Energy Maintenance Systems*</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=.empty-state h3</td>
-<td></td>
-</tr>
-<tr>
-<td>assertText</td>
-<td>css=.empty-state h3</td>
+<td>css=.empty-state > h3</td>
 <td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
@@ -486,13 +258,13 @@ Imported from: AT-AT CI - TO Step 2
 Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.sticky-cta-text > h3</td>
+<td>css=.sticky-cta-context</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.sticky-cta-text > h3</td>
-<td>*Add Task Order (step 1 of 5)*</td>
+<td>css=.sticky-cta-context</td>
+<td>*Step 1 of 5*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -588,13 +360,13 @@ Imported from: AT-AT CI - TO Step 2-->
 Imported from: AT-AT CI - TO Step 2-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.sticky-cta-text > h3</td>
+<td>css=.sticky-cta-context</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.sticky-cta-text > h3</td>
-<td>*Add Task Order (step 2 of 5)*</td>
+<td>css=.sticky-cta-context</td>
+<td>*Step 2 of 5*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -654,13 +426,13 @@ Imported from: AT-AT CI - TO Step 2-->
 <!--Imported from: AT-AT CI - TO Step 3-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.sticky-cta-text > h3</td>
+<td>css=.sticky-cta-context</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.sticky-cta-text > h3</td>
-<td>*Add Task Order (step 3 of 5)*</td>
+<td>css=.sticky-cta-context</td>
+<td>*Step 3 of 5*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
diff --git a/uitests/TO_Step_4.html b/uitests/TO_Step_4.html
index bd2e0450..bf7ecb81 100644
--- a/uitests/TO_Step_4.html
+++ b/uitests/TO_Step_4.html
@@ -16,7 +16,7 @@
 <meta name="ghost-inspector-screenshotTarget" content="" />
 <meta name="ghost-inspector-screenshotExclusions" content="div.global-navigation, time" />
 <meta name="ghost-inspector-screenshotCompareEnabled" content="true" />
-<meta name="ghost-inspector-screenshotCompareThreshold" content="0.05" />
+<meta name="ghost-inspector-screenshotCompareThreshold" content="0.02" />
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
@@ -75,7 +75,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td>css=a[href="/portfolios/new"]</td>
 <td></td>
 </tr>
-<tr>
+<tr original-target="a[href="/portfolios/new"],xpath=//a[contains(text(), "Add New Portfolio")]">
 <td>click</td>
 <td>css=a[href="/portfolios/new"]</td>
 <td></td>
@@ -91,13 +91,32 @@ Imported from: AT-AT CI - TO Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=main.usa-section > h1</td>
+<td>css=.portfolio-header__name > h1</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=main.usa-section > h1</td>
-<td>*New Portfolio Form*</td>
+<td>css=.portfolio-header__name > h1</td>
+<td>*New Portfolio*</td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - TO Step 3
+Imported from: AT-AT CI - TO Step 2
+Imported from: AT-AT CI - TO Step 1
+Imported from: AT-AT CI - New Portfolio-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.sticky-cta-text > h3</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.sticky-cta-text > h3</td>
+<td>*Create New Portfolio*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -129,221 +148,12 @@ Imported from: AT-AT CI - TO Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component</td>
+<td>css=fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
 <td></td>
 </tr>
-<tr>
-<td>type</td>
-<td>css=#defense_component</td>
-<td>Defense Logistics Agency</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#description</td>
-<td></td>
-</tr>
-<tr>
-<td>type</td>
-<td>css=#description</td>
-<td>Maintenance and monitoring of the energy grid</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#app_migration > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
+<tr original-target="fieldset.usa-input__choices > ul > li:nth-of-type(5) > label,xpath=//label[contains(text(), "Other")]">
 <td>click</td>
-<td>css=#app_migration > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#native_apps > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#native_apps > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(4) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(4) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#team_experience > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#team_experience > li:nth-of-type(5) > label</td>
+<td>css=fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
 <td></td>
 </tr>
 <tr>
@@ -361,65 +171,27 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 </tr>
 <tr>
+<td>click</td>
+<td>css=input[type="submit"]</td>
+<td></td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - TO Step 3
+Imported from: AT-AT CI - TO Step 2
+Imported from: AT-AT CI - TO Step 1
+Imported from: AT-AT CI - New Portfolio-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.empty-state > h3</td>
+<td></td>
+</tr>
+<tr>
 <td>assertText</td>
-<td>css=input[type="submit"]</td>
-<td>Save</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=input[type="submit"]</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=input[type="submit"]</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=.portfolio-header__name > h1</td>
-<td></td>
-</tr>
-<tr>
-<td>assertText</td>
-<td>css=.portfolio-header__name > h1</td>
-<td>*Tatooine Energy Maintenance Systems*</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=.empty-state h3</td>
-<td></td>
-</tr>
-<tr>
-<td>assertText</td>
-<td>css=.empty-state h3</td>
+<td>css=.empty-state > h3</td>
 <td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
@@ -486,13 +258,13 @@ Imported from: AT-AT CI - TO Step 2
 Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.sticky-cta-text > h3</td>
+<td>css=.sticky-cta-context</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.sticky-cta-text > h3</td>
-<td>*Add Task Order (step 1 of 5)*</td>
+<td>css=.sticky-cta-context</td>
+<td>*Step 1 of 5*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -588,13 +360,13 @@ Imported from: AT-AT CI - TO Step 2-->
 Imported from: AT-AT CI - TO Step 2-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.sticky-cta-text > h3</td>
+<td>css=.sticky-cta-context</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.sticky-cta-text > h3</td>
-<td>*Add Task Order (step 2 of 5)*</td>
+<td>css=.sticky-cta-context</td>
+<td>*Step 2 of 5*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -654,13 +426,13 @@ Imported from: AT-AT CI - TO Step 2-->
 <!--Imported from: AT-AT CI - TO Step 3-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.sticky-cta-text > h3</td>
+<td>css=.sticky-cta-context</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.sticky-cta-text > h3</td>
-<td>*Add Task Order (step 3 of 5)*</td>
+<td>css=.sticky-cta-context</td>
+<td>*Step 3 of 5*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -940,13 +712,13 @@ Imported from: AT-AT CI - TO Step 2-->
 </tr>
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.sticky-cta-text > h3</td>
+<td>css=.sticky-cta-context</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.sticky-cta-text > h3</td>
-<td>*Add Task Order (step 4 of 5)*</td>
+<td>css=.sticky-cta-context</td>
+<td>*Step 4 of 5*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
diff --git a/uitests/TO_Step_5.html b/uitests/TO_Step_5.html
index 4e932c50..7f56ad80 100644
--- a/uitests/TO_Step_5.html
+++ b/uitests/TO_Step_5.html
@@ -16,7 +16,7 @@
 <meta name="ghost-inspector-screenshotTarget" content="" />
 <meta name="ghost-inspector-screenshotExclusions" content="div.global-navigation, time" />
 <meta name="ghost-inspector-screenshotCompareEnabled" content="true" />
-<meta name="ghost-inspector-screenshotCompareThreshold" content="0.05" />
+<meta name="ghost-inspector-screenshotCompareThreshold" content="0.02" />
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
@@ -78,7 +78,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td>css=a[href="/portfolios/new"]</td>
 <td></td>
 </tr>
-<tr>
+<tr original-target="a[href="/portfolios/new"],xpath=//a[contains(text(), "Add New Portfolio")]">
 <td>click</td>
 <td>css=a[href="/portfolios/new"]</td>
 <td></td>
@@ -95,13 +95,33 @@ Imported from: AT-AT CI - TO Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=main.usa-section > h1</td>
+<td>css=.portfolio-header__name > h1</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=main.usa-section > h1</td>
-<td>*New Portfolio Form*</td>
+<td>css=.portfolio-header__name > h1</td>
+<td>*New Portfolio*</td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - TO Step 4
+Imported from: AT-AT CI - TO Step 3
+Imported from: AT-AT CI - TO Step 2
+Imported from: AT-AT CI - TO Step 1
+Imported from: AT-AT CI - New Portfolio-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.sticky-cta-text > h3</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.sticky-cta-text > h3</td>
+<td>*Create New Portfolio*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -135,232 +155,12 @@ Imported from: AT-AT CI - TO Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component</td>
+<td>css=fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
 <td></td>
 </tr>
-<tr>
-<td>type</td>
-<td>css=#defense_component</td>
-<td>Defense Logistics Agency</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 4
-Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#description</td>
-<td></td>
-</tr>
-<tr>
-<td>type</td>
-<td>css=#description</td>
-<td>Maintenance and monitoring of the energy grid</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 4
-Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#app_migration > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
+<tr original-target="fieldset.usa-input__choices > ul > li:nth-of-type(5) > label,xpath=//label[contains(text(), "Other")]">
 <td>click</td>
-<td>css=#app_migration > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 4
-Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#native_apps > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#native_apps > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 4
-Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(1) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 4
-Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 4
-Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 4
-Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(4) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(4) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 4
-Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 4
-Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 4
-Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 4
-Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=#team_experience > li:nth-of-type(5) > label</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#team_experience > li:nth-of-type(5) > label</td>
+<td>css=fieldset.usa-input__choices > ul > li:nth-of-type(5) > label</td>
 <td></td>
 </tr>
 <tr>
@@ -379,68 +179,28 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 </tr>
 <tr>
+<td>click</td>
+<td>css=input[type="submit"]</td>
+<td></td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - TO Step 4
+Imported from: AT-AT CI - TO Step 3
+Imported from: AT-AT CI - TO Step 2
+Imported from: AT-AT CI - TO Step 1
+Imported from: AT-AT CI - New Portfolio-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.empty-state > h3</td>
+<td></td>
+</tr>
+<tr>
 <td>assertText</td>
-<td>css=input[type="submit"]</td>
-<td>Save</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 4
-Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=input[type="submit"]</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=input[type="submit"]</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 4
-Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=.portfolio-header__name > h1</td>
-<td></td>
-</tr>
-<tr>
-<td>assertText</td>
-<td>css=.portfolio-header__name > h1</td>
-<td>*Tatooine Energy Maintenance Systems*</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 4
-Imported from: AT-AT CI - TO Step 3
-Imported from: AT-AT CI - TO Step 2
-Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=.empty-state h3</td>
-<td></td>
-</tr>
-<tr>
-<td>assertText</td>
-<td>css=.empty-state h3</td>
+<td>css=.empty-state > h3</td>
 <td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
@@ -511,13 +271,13 @@ Imported from: AT-AT CI - TO Step 2
 Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.sticky-cta-text > h3</td>
+<td>css=.sticky-cta-context</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.sticky-cta-text > h3</td>
-<td>*Add Task Order (step 1 of 5)*</td>
+<td>css=.sticky-cta-context</td>
+<td>*Step 1 of 5*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -619,13 +379,13 @@ Imported from: AT-AT CI - TO Step 3
 Imported from: AT-AT CI - TO Step 2-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.sticky-cta-text > h3</td>
+<td>css=.sticky-cta-context</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.sticky-cta-text > h3</td>
-<td>*Add Task Order (step 2 of 5)*</td>
+<td>css=.sticky-cta-context</td>
+<td>*Step 2 of 5*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -689,13 +449,13 @@ Imported from: AT-AT CI - TO Step 3-->
 Imported from: AT-AT CI - TO Step 3-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.sticky-cta-text > h3</td>
+<td>css=.sticky-cta-context</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.sticky-cta-text > h3</td>
-<td>*Add Task Order (step 3 of 5)*</td>
+<td>css=.sticky-cta-context</td>
+<td>*Step 3 of 5*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -993,13 +753,13 @@ Imported from: AT-AT CI - TO Step 3-->
 <!--Imported from: AT-AT CI - TO Step 4-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.sticky-cta-text > h3</td>
+<td>css=.sticky-cta-context</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.sticky-cta-text > h3</td>
-<td>*Add Task Order (step 4 of 5)*</td>
+<td>css=.sticky-cta-context</td>
+<td>*Step 4 of 5*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>

css=a[href="/portfolios/new"]
click	css=a[href="/portfolios/new"]
waitForElementPresent	css=main.usa-section > h1	css=.portfolio-header__name > h1
assertText	css=main.usa-section > h1	New Portfolio Form	css=.portfolio-header__name > h1	New Portfolio
waitForPageToLoad
waitForElementPresent	css=.sticky-cta-text > h3
assertText	css=.sticky-cta-text > h3	Create New Portfolio
waitForPageToLoad
waitForElementPresent	css=#defense_component	css=fieldset.usa-input__choices > ul > li:nth-of-type(5) > label
type	css=#defense_component	Defense Logistics Agency
waitForPageToLoad
waitForElementPresent	css=#description
type	css=#description	Maintenance and monitoring of the energy grid
waitForPageToLoad
waitForElementPresent	css=#app_migration > li:nth-of-type(3) > label
click	css=#app_migration > li:nth-of-type(3) > label
waitForPageToLoad
waitForElementPresent	css=#native_apps > li:nth-of-type(1) > label
click	css=#native_apps > li:nth-of-type(1) > label
waitForPageToLoad
waitForElementPresent	css=#portfolio-create > .usa-input:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(1) > label
click	css=#portfolio-create > .usa-input:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(1) > label
waitForPageToLoad
waitForElementPresent	css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label
click	css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label
waitForPageToLoad
waitForElementPresent	css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label
click	css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label
waitForPageToLoad
waitForElementPresent	css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(4) > label
click	css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(4) > label
waitForPageToLoad
waitForElementPresent	css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(5) > label
click	css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(6) > fieldset.usa-input__choices > ul > li:nth-of-type(5) > label
waitForPageToLoad
waitForElementPresent	css=#portfolio-create > .usa-input:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label
click	css=#portfolio-create > .usa-input:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(2) > label
waitForPageToLoad
waitForElementPresent	css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label
click	css=#portfolio-create > .usa-input.usa-input--success:nth-of-type(7) > fieldset.usa-input__choices > ul > li:nth-of-type(3) > label
waitForPageToLoad
waitForElementPresent	css=#team_experience > li:nth-of-type(5) > label
click	css=#team_experience > li:nth-of-type(5) > label	css=fieldset.usa-input__choices > ul > li:nth-of-type(5) > label

click	css=input[type="submit"]
waitForPageToLoad
waitForElementPresent	css=.empty-state > h3
assertText	css=input[type="submit"]	Save
waitForPageToLoad
waitForElementPresent	css=input[type="submit"]
click	css=input[type="submit"]
waitForPageToLoad
waitForElementPresent	css=.portfolio-header__name > h1
assertText	css=.portfolio-header__name > h1	Tatooine Energy Maintenance Systems
waitForPageToLoad
waitForElementPresent	css=.empty-state h3
assertText	css=.empty-state h3	css=.empty-state > h3	You don't have any Applications yet