diff --git a/uitests/Application_Settings.html b/uitests/Application_Settings.html
index 08ab153d..76557d2d 100644
--- a/uitests/Application_Settings.html
+++ b/uitests/Application_Settings.html
@@ -97,7 +97,8 @@ Imported from: AT-AT CI - Login Brandon-->
 <!--Imported from: AT-AT CI - New App Step 3
 Imported from: AT-AT CI - New App Step 2
 Imported from: AT-AT CI - New App Step 1
-Imported from: AT-AT CI - New Portfolio-->
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
 <tr>
 <td>open</td>
 <td>/login-dev</td>
@@ -111,6 +112,26 @@ Imported from: AT-AT CI - New Portfolio-->
 <!--Imported from: AT-AT CI - New App Step 3
 Imported from: AT-AT CI - New App Step 2
 Imported from: AT-AT CI - New App Step 1
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.about-cloud > h1</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.about-cloud > h1</td>
+<td>About Cloud Services</td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - New App Step 3
+Imported from: AT-AT CI - New App Step 2
+Imported from: AT-AT CI - New App Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
@@ -190,25 +211,6 @@ Imported from: AT-AT CI - New App Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New App Step 3
-Imported from: AT-AT CI - New App Step 2
-Imported from: AT-AT CI - New App Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
 <td>css=#description</td>
 <td></td>
 </tr>
@@ -475,13 +477,13 @@ Imported from: AT-AT CI - New App Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state__message</td>
+<td>css=.empty-state h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state__message</td>
-<td>*This portfolio doesn’t have any applications*</td>
+<td>css=.empty-state h3</td>
+<td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -493,12 +495,12 @@ Imported from: AT-AT CI - New App Step 2
 Imported from: AT-AT CI - New App Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=a.usa-button.usa-button-big</td>
+<td>css=a.usa-button.usa-button-primary</td>
 <td></td>
 </tr>
 <tr>
 <td>click</td>
-<td>css=a.usa-button.usa-button-big</td>
+<td>css=a.usa-button.usa-button-primary</td>
 <td></td>
 </tr>
 <tr>
@@ -937,22 +939,6 @@ Imported from: AT-AT CI - New App Step 2-->
 <!--Imported from: AT-AT CI - New App Step 3-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=[name=environment_roles-0-role] > option:nth-of-type(1)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=[name=environment_roles-0-role] > option:nth-of-type(1)</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New App Step 3-->
-<tr>
-<td>waitForElementPresent</td>
 <td>css=[name=environment_roles-1-role]</td>
 <td></td>
 </tr>
@@ -969,86 +955,6 @@ Imported from: AT-AT CI - New App Step 2-->
 <!--Imported from: AT-AT CI - New App Step 3-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=[name=environment_roles-1-role] > option:nth-of-type(2)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=[name=environment_roles-1-role] > option:nth-of-type(2)</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New App Step 3-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=[name=environment_roles-2-role]</td>
-<td></td>
-</tr>
-<tr>
-<td>type</td>
-<td>css=[name=environment_roles-2-role]</td>
-<td>Business Read-only</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New App Step 3-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=[name=environment_roles-2-role] > option:nth-of-type(3)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=[name=environment_roles-2-role] > option:nth-of-type(3)</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New App Step 3-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=[name=environment_roles-3-role]</td>
-<td></td>
-</tr>
-<tr>
-<td>type</td>
-<td>css=[name=environment_roles-3-role]</td>
-<td>Technical Read-only</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New App Step 3-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=[name=environment_roles-3-role] > option:nth-of-type(4)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=[name=environment_roles-3-role] > option:nth-of-type(4)</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New App Step 3-->
-<tr>
-<td>waitForElementPresent</td>
 <td>css=input[type="submit"]</td>
 <td></td>
 </tr>
diff --git a/uitests/Edit_Portfolio_Member.html b/uitests/Edit_Portfolio_Member.html
index b2f179e4..e5003462 100644
--- a/uitests/Edit_Portfolio_Member.html
+++ b/uitests/Edit_Portfolio_Member.html
@@ -96,7 +96,8 @@ Imported from: AT-AT CI - Login Brandon-->
 </tr>
 <!--Imported from: AT-AT CI - New Portfolio Member
 Imported from: AT-AT CI - Portfolio Settings
-Imported from: AT-AT CI - New Portfolio-->
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
 <tr>
 <td>open</td>
 <td>/login-dev</td>
@@ -109,6 +110,25 @@ Imported from: AT-AT CI - New Portfolio-->
 </tr>
 <!--Imported from: AT-AT CI - New Portfolio Member
 Imported from: AT-AT CI - Portfolio Settings
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.about-cloud > h1</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.about-cloud > h1</td>
+<td>About Cloud Services</td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - New Portfolio Member
+Imported from: AT-AT CI - Portfolio Settings
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
@@ -184,24 +204,6 @@ Imported from: AT-AT CI - Portfolio Settings
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New Portfolio Member
-Imported from: AT-AT CI - Portfolio Settings
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
 <td>css=#description</td>
 <td></td>
 </tr>
@@ -454,13 +456,13 @@ Imported from: AT-AT CI - Portfolio Settings
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state__message</td>
+<td>css=.empty-state h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state__message</td>
-<td>*This portfolio doesn’t have any applications*</td>
+<td>css=.empty-state h3</td>
+<td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
diff --git a/uitests/New_App_Step_2.html b/uitests/New_App_Step_2.html
index 0e751ace..16c2877a 100644
--- a/uitests/New_App_Step_2.html
+++ b/uitests/New_App_Step_2.html
@@ -32,7 +32,8 @@
 <td></td>
 </tr>
 <!--Imported from: AT-AT CI - New App Step 1
-Imported from: AT-AT CI - New Portfolio-->
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
 <tr>
 <td>open</td>
 <td>/login-dev</td>
@@ -44,6 +45,24 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 </tr>
 <!--Imported from: AT-AT CI - New App Step 1
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.about-cloud > h1</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.about-cloud > h1</td>
+<td>About Cloud Services</td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - New App Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
@@ -115,23 +134,6 @@ Imported from: AT-AT CI - New Portfolio-->
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New App Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
 <td>css=#description</td>
 <td></td>
 </tr>
@@ -370,13 +372,13 @@ Imported from: AT-AT CI - New Portfolio-->
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state__message</td>
+<td>css=.empty-state h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state__message</td>
-<td>*This portfolio doesn’t have any applications*</td>
+<td>css=.empty-state h3</td>
+<td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -386,12 +388,12 @@ Imported from: AT-AT CI - New Portfolio-->
 <!--Imported from: AT-AT CI - New App Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=a.usa-button.usa-button-big</td>
+<td>css=a.usa-button.usa-button-primary</td>
 <td></td>
 </tr>
 <tr>
 <td>click</td>
-<td>css=a.usa-button.usa-button-big</td>
+<td>css=a.usa-button.usa-button-primary</td>
 <td></td>
 </tr>
 <tr>
diff --git a/uitests/New_App_Step_2_-_Add_Env.html b/uitests/New_App_Step_2_-_Add_Env.html
index 4034713f..5a89c577 100644
--- a/uitests/New_App_Step_2_-_Add_Env.html
+++ b/uitests/New_App_Step_2_-_Add_Env.html
@@ -33,7 +33,8 @@
 </tr>
 <!--Imported from: AT-AT CI - New App Step 2
 Imported from: AT-AT CI - New App Step 1
-Imported from: AT-AT CI - New Portfolio-->
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
 <tr>
 <td>open</td>
 <td>/login-dev</td>
@@ -46,6 +47,25 @@ Imported from: AT-AT CI - New Portfolio-->
 </tr>
 <!--Imported from: AT-AT CI - New App Step 2
 Imported from: AT-AT CI - New App Step 1
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.about-cloud > h1</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.about-cloud > h1</td>
+<td>About Cloud Services</td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - New App Step 2
+Imported from: AT-AT CI - New App Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
@@ -121,24 +141,6 @@ Imported from: AT-AT CI - New App Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New App Step 2
-Imported from: AT-AT CI - New App Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
 <td>css=#description</td>
 <td></td>
 </tr>
@@ -391,13 +393,13 @@ Imported from: AT-AT CI - New App Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state__message</td>
+<td>css=.empty-state h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state__message</td>
-<td>*This portfolio doesn’t have any applications*</td>
+<td>css=.empty-state h3</td>
+<td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -408,12 +410,12 @@ Imported from: AT-AT CI - New Portfolio-->
 Imported from: AT-AT CI - New App Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=a.usa-button.usa-button-big</td>
+<td>css=a.usa-button.usa-button-primary</td>
 <td></td>
 </tr>
 <tr>
 <td>click</td>
-<td>css=a.usa-button.usa-button-big</td>
+<td>css=a.usa-button.usa-button-primary</td>
 <td></td>
 </tr>
 <tr>
diff --git a/uitests/New_Portfolio_Member.html b/uitests/New_Portfolio_Member.html
index 090ed9cc..13a426c2 100644
--- a/uitests/New_Portfolio_Member.html
+++ b/uitests/New_Portfolio_Member.html
@@ -91,7 +91,8 @@
 <td></td>
 </tr>
 <!--Imported from: AT-AT CI - Portfolio Settings
-Imported from: AT-AT CI - New Portfolio-->
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
 <tr>
 <td>open</td>
 <td>/login-dev</td>
@@ -103,6 +104,24 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 </tr>
 <!--Imported from: AT-AT CI - Portfolio Settings
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.about-cloud > h1</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.about-cloud > h1</td>
+<td>About Cloud Services</td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - Portfolio Settings
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
@@ -174,23 +193,6 @@ Imported from: AT-AT CI - New Portfolio-->
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - Portfolio Settings
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
 <td>css=#description</td>
 <td></td>
 </tr>
@@ -429,13 +431,13 @@ Imported from: AT-AT CI - New Portfolio-->
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state__message</td>
+<td>css=.empty-state h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state__message</td>
-<td>*This portfolio doesn’t have any applications*</td>
+<td>css=.empty-state h3</td>
+<td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
diff --git a/uitests/Portfolio_Settings.html b/uitests/Portfolio_Settings.html
index 89f85a79..d12bdffd 100644
--- a/uitests/Portfolio_Settings.html
+++ b/uitests/Portfolio_Settings.html
@@ -31,7 +31,8 @@
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - New Portfolio-->
+<!--Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
 <tr>
 <td>open</td>
 <td>/login-dev</td>
@@ -42,6 +43,23 @@
 <td></td>
 <td></td>
 </tr>
+<!--Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.about-cloud > h1</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.about-cloud > h1</td>
+<td>About Cloud Services</td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
 <!--Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
@@ -109,22 +127,6 @@
 <!--Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#defense_component > option:nth-of-type(14)</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=#description</td>
 <td></td>
 </tr>
@@ -349,13 +351,13 @@
 <!--Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state__message</td>
+<td>css=.empty-state h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state__message</td>
-<td>*This portfolio doesn’t have any applications*</td>
+<td>css=.empty-state h3</td>
+<td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
diff --git a/uitests/Remove_Portfolio_Member.html b/uitests/Remove_Portfolio_Member.html
index 47d5b49d..a6e3f87a 100644
--- a/uitests/Remove_Portfolio_Member.html
+++ b/uitests/Remove_Portfolio_Member.html
@@ -96,7 +96,8 @@ Imported from: AT-AT CI - Login Brandon-->
 </tr>
 <!--Imported from: AT-AT CI - New Portfolio Member
 Imported from: AT-AT CI - Portfolio Settings
-Imported from: AT-AT CI - New Portfolio-->
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
 <tr>
 <td>open</td>
 <td>/login-dev</td>
@@ -109,6 +110,25 @@ Imported from: AT-AT CI - New Portfolio-->
 </tr>
 <!--Imported from: AT-AT CI - New Portfolio Member
 Imported from: AT-AT CI - Portfolio Settings
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.about-cloud > h1</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.about-cloud > h1</td>
+<td>About Cloud Services</td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - New Portfolio Member
+Imported from: AT-AT CI - Portfolio Settings
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
@@ -184,24 +204,6 @@ Imported from: AT-AT CI - Portfolio Settings
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - New Portfolio Member
-Imported from: AT-AT CI - Portfolio Settings
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
 <td>css=#description</td>
 <td></td>
 </tr>
@@ -454,13 +456,13 @@ Imported from: AT-AT CI - Portfolio Settings
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state__message</td>
+<td>css=.empty-state h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state__message</td>
-<td>*This portfolio doesn’t have any applications*</td>
+<td>css=.empty-state h3</td>
+<td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
diff --git a/uitests/Revoke_App_Member_Invite.html b/uitests/Revoke_App_Member_Invite.html
index 1fd8dec6..df43cb2d 100644
--- a/uitests/Revoke_App_Member_Invite.html
+++ b/uitests/Revoke_App_Member_Invite.html
@@ -102,7 +102,8 @@ Imported from: AT-AT CI - Login Brandon-->
 Imported from: AT-AT CI - New App Step 3
 Imported from: AT-AT CI - New App Step 2
 Imported from: AT-AT CI - New App Step 1
-Imported from: AT-AT CI - New Portfolio-->
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
 <tr>
 <td>open</td>
 <td>/login-dev</td>
@@ -117,6 +118,27 @@ Imported from: AT-AT CI - New Portfolio-->
 Imported from: AT-AT CI - New App Step 3
 Imported from: AT-AT CI - New App Step 2
 Imported from: AT-AT CI - New App Step 1
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.about-cloud > h1</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.about-cloud > h1</td>
+<td>About Cloud Services</td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - Application Settings
+Imported from: AT-AT CI - New App Step 3
+Imported from: AT-AT CI - New App Step 2
+Imported from: AT-AT CI - New App Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
@@ -200,26 +222,6 @@ Imported from: AT-AT CI - New App Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - Application Settings
-Imported from: AT-AT CI - New App Step 3
-Imported from: AT-AT CI - New App Step 2
-Imported from: AT-AT CI - New App Step 1
-Imported from: AT-AT CI - New Portfolio-->
-<tr>
-<td>waitForElementPresent</td>
 <td>css=#description</td>
 <td></td>
 </tr>
@@ -500,13 +502,13 @@ Imported from: AT-AT CI - New App Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state__message</td>
+<td>css=.empty-state h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state__message</td>
-<td>*This portfolio doesn’t have any applications*</td>
+<td>css=.empty-state h3</td>
+<td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -519,12 +521,12 @@ Imported from: AT-AT CI - New App Step 2
 Imported from: AT-AT CI - New App Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=a.usa-button.usa-button-big</td>
+<td>css=a.usa-button.usa-button-primary</td>
 <td></td>
 </tr>
 <tr>
 <td>click</td>
-<td>css=a.usa-button.usa-button-big</td>
+<td>css=a.usa-button.usa-button-primary</td>
 <td></td>
 </tr>
 <tr>
@@ -990,23 +992,6 @@ Imported from: AT-AT CI - New App Step 3-->
 Imported from: AT-AT CI - New App Step 3-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=[name=environment_roles-0-role] > option:nth-of-type(1)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=[name=environment_roles-0-role] > option:nth-of-type(1)</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - Application Settings
-Imported from: AT-AT CI - New App Step 3-->
-<tr>
-<td>waitForElementPresent</td>
 <td>css=[name=environment_roles-1-role]</td>
 <td></td>
 </tr>
@@ -1024,91 +1009,6 @@ Imported from: AT-AT CI - New App Step 3-->
 Imported from: AT-AT CI - New App Step 3-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=[name=environment_roles-1-role] > option:nth-of-type(2)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=[name=environment_roles-1-role] > option:nth-of-type(2)</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - Application Settings
-Imported from: AT-AT CI - New App Step 3-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=[name=environment_roles-2-role]</td>
-<td></td>
-</tr>
-<tr>
-<td>type</td>
-<td>css=[name=environment_roles-2-role]</td>
-<td>Business Read-only</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - Application Settings
-Imported from: AT-AT CI - New App Step 3-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=[name=environment_roles-2-role] > option:nth-of-type(3)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=[name=environment_roles-2-role] > option:nth-of-type(3)</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - Application Settings
-Imported from: AT-AT CI - New App Step 3-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=[name=environment_roles-3-role]</td>
-<td></td>
-</tr>
-<tr>
-<td>type</td>
-<td>css=[name=environment_roles-3-role]</td>
-<td>Technical Read-only</td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - Application Settings
-Imported from: AT-AT CI - New App Step 3-->
-<tr>
-<td>waitForElementPresent</td>
-<td>css=[name=environment_roles-3-role] > option:nth-of-type(4)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=[name=environment_roles-3-role] > option:nth-of-type(4)</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - Application Settings
-Imported from: AT-AT CI - New App Step 3-->
-<tr>
-<td>waitForElementPresent</td>
 <td>css=input[type="submit"]</td>
 <td></td>
 </tr>
diff --git a/uitests/TO_Step_2.html b/uitests/TO_Step_2.html
index 9a91e6fb..30cd6c58 100644
--- a/uitests/TO_Step_2.html
+++ b/uitests/TO_Step_2.html
@@ -32,7 +32,8 @@
 <td></td>
 </tr>
 <!--Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
 <tr>
 <td>open</td>
 <td>/login-dev</td>
@@ -44,6 +45,24 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 </tr>
 <!--Imported from: AT-AT CI - TO Step 1
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.about-cloud > h1</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.about-cloud > h1</td>
+<td>About Cloud Services</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>
@@ -115,23 +134,6 @@ Imported from: AT-AT CI - New Portfolio-->
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#defense_component > option:nth-of-type(14)</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=#description</td>
 <td></td>
 </tr>
@@ -370,13 +372,13 @@ Imported from: AT-AT CI - New Portfolio-->
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state__message</td>
+<td>css=.empty-state h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state__message</td>
-<td>*This portfolio doesn’t have any applications*</td>
+<td>css=.empty-state h3</td>
+<td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -402,13 +404,13 @@ Imported from: AT-AT CI - New Portfolio-->
 <!--Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state__message</td>
+<td>css=.empty-state h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state__message</td>
-<td>*This portfolio doesn’t have any active or pending task orders.*</td>
+<td>css=.empty-state h3</td>
+<td>*Add approved task orders*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -418,12 +420,12 @@ Imported from: AT-AT CI - New Portfolio-->
 <!--Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.usa-button.usa-button-big</td>
+<td>css=.usa-button.usa-button-primary</td>
 <td></td>
 </tr>
 <tr>
 <td>click</td>
-<td>css=.usa-button.usa-button-big</td>
+<td>css=.usa-button.usa-button-primary</td>
 <td></td>
 </tr>
 <tr>
@@ -479,6 +481,18 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
+<!--Imported from: AT-AT CI - TO Step 1
+This is Ghost Inspector flow control. The test will wait until the file is uploaded, which in turn causes the button to be enabled (i.e., not disabled).-->
+<tr>
+<td>assertElementNotPresent</td>
+<td>css=input[type="submit"][disabled="disabled"]</td>
+<td></td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
 <!--Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
diff --git a/uitests/TO_Step_3.html b/uitests/TO_Step_3.html
index 501a7ca1..346d68b3 100644
--- a/uitests/TO_Step_3.html
+++ b/uitests/TO_Step_3.html
@@ -33,7 +33,8 @@
 </tr>
 <!--Imported from: AT-AT CI - TO Step 2
 Imported from: AT-AT CI - TO Step 1
-Imported from: AT-AT CI - New Portfolio-->
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
 <tr>
 <td>open</td>
 <td>/login-dev</td>
@@ -46,6 +47,25 @@ Imported from: AT-AT CI - New Portfolio-->
 </tr>
 <!--Imported from: AT-AT CI - TO Step 2
 Imported from: AT-AT CI - TO Step 1
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.about-cloud > h1</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.about-cloud > h1</td>
+<td>About Cloud Services</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>
@@ -121,24 +141,6 @@ Imported from: AT-AT CI - TO Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#defense_component > option:nth-of-type(14)</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=#description</td>
 <td></td>
 </tr>
@@ -391,13 +393,13 @@ Imported from: AT-AT CI - TO Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state__message</td>
+<td>css=.empty-state h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state__message</td>
-<td>*This portfolio doesn’t have any applications*</td>
+<td>css=.empty-state h3</td>
+<td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -425,13 +427,13 @@ Imported from: AT-AT CI - TO Step 1-->
 Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state__message</td>
+<td>css=.empty-state h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state__message</td>
-<td>*This portfolio doesn’t have any active or pending task orders.*</td>
+<td>css=.empty-state h3</td>
+<td>*Add approved task orders*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -442,12 +444,12 @@ Imported from: AT-AT CI - TO Step 1-->
 Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.usa-button.usa-button-big</td>
+<td>css=.usa-button.usa-button-primary</td>
 <td></td>
 </tr>
 <tr>
 <td>click</td>
-<td>css=.usa-button.usa-button-big</td>
+<td>css=.usa-button.usa-button-primary</td>
 <td></td>
 </tr>
 <tr>
@@ -507,6 +509,19 @@ Imported from: AT-AT CI - TO Step 1-->
 <td></td>
 </tr>
 <!--Imported from: AT-AT CI - TO Step 2
+Imported from: AT-AT CI - TO Step 1
+This is Ghost Inspector flow control. The test will wait until the file is uploaded, which in turn causes the button to be enabled (i.e., not disabled).-->
+<tr>
+<td>assertElementNotPresent</td>
+<td>css=input[type="submit"][disabled="disabled"]</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-->
 <tr>
 <td>waitForElementPresent</td>
@@ -664,21 +679,6 @@ Imported from: AT-AT CI - TO Step 1-->
 </tr>
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#clins-0-jedi_clin_type > option:nth-of-type(2)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#clins-0-jedi_clin_type > option:nth-of-type(2)</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>waitForElementPresent</td>
 <td>css=#percent-obligated</td>
 <td></td>
 </tr>
diff --git a/uitests/TO_Step_3_-_Add_CLIN.html b/uitests/TO_Step_3_-_Add_CLIN.html
index 4b1bcbde..d7ec07cf 100644
--- a/uitests/TO_Step_3_-_Add_CLIN.html
+++ b/uitests/TO_Step_3_-_Add_CLIN.html
@@ -34,7 +34,8 @@
 <!--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-->
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
 <tr>
 <td>open</td>
 <td>/login-dev</td>
@@ -48,6 +49,26 @@ Imported from: AT-AT CI - New Portfolio-->
 <!--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
+Imported from: AT-AT CI - login-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.about-cloud > h1</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.about-cloud > h1</td>
+<td>About Cloud Services</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>
@@ -127,25 +148,6 @@ Imported from: AT-AT CI - TO Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#defense_component > option:nth-of-type(14)</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=#description</td>
 <td></td>
 </tr>
@@ -412,13 +414,13 @@ Imported from: AT-AT CI - TO Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state__message</td>
+<td>css=.empty-state h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state__message</td>
-<td>*This portfolio doesn’t have any applications*</td>
+<td>css=.empty-state h3</td>
+<td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -448,13 +450,13 @@ Imported from: AT-AT CI - TO Step 2
 Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state__message</td>
+<td>css=.empty-state h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state__message</td>
-<td>*This portfolio doesn’t have any active or pending task orders.*</td>
+<td>css=.empty-state h3</td>
+<td>*Add approved task orders*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -466,12 +468,12 @@ Imported from: AT-AT CI - TO Step 2
 Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.usa-button.usa-button-big</td>
+<td>css=.usa-button.usa-button-primary</td>
 <td></td>
 </tr>
 <tr>
 <td>click</td>
-<td>css=.usa-button.usa-button-big</td>
+<td>css=.usa-button.usa-button-primary</td>
 <td></td>
 </tr>
 <tr>
@@ -535,6 +537,20 @@ Imported from: AT-AT CI - TO Step 1-->
 </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
+This is Ghost Inspector flow control. The test will wait until the file is uploaded, which in turn causes the button to be enabled (i.e., not disabled).-->
+<tr>
+<td>assertElementNotPresent</td>
+<td>css=input[type="submit"][disabled="disabled"]</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-->
 <tr>
 <td>waitForElementPresent</td>
@@ -702,22 +718,6 @@ Imported from: AT-AT CI - TO Step 2-->
 <!--Imported from: AT-AT CI - TO Step 3-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#clins-0-jedi_clin_type > option:nth-of-type(2)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#clins-0-jedi_clin_type > option:nth-of-type(2)</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3-->
-<tr>
-<td>waitForElementPresent</td>
 <td>css=#percent-obligated</td>
 <td></td>
 </tr>
diff --git a/uitests/TO_Step_4.html b/uitests/TO_Step_4.html
index 5ac0bec3..1ea441eb 100644
--- a/uitests/TO_Step_4.html
+++ b/uitests/TO_Step_4.html
@@ -34,7 +34,8 @@
 <!--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-->
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
 <tr>
 <td>open</td>
 <td>/login-dev</td>
@@ -48,6 +49,26 @@ Imported from: AT-AT CI - New Portfolio-->
 <!--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
+Imported from: AT-AT CI - login-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.about-cloud > h1</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.about-cloud > h1</td>
+<td>About Cloud Services</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>
@@ -127,25 +148,6 @@ Imported from: AT-AT CI - TO Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#defense_component > option:nth-of-type(14)</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=#description</td>
 <td></td>
 </tr>
@@ -412,13 +414,13 @@ Imported from: AT-AT CI - TO Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state__message</td>
+<td>css=.empty-state h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state__message</td>
-<td>*This portfolio doesn’t have any applications*</td>
+<td>css=.empty-state h3</td>
+<td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -448,13 +450,13 @@ Imported from: AT-AT CI - TO Step 2
 Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state__message</td>
+<td>css=.empty-state h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state__message</td>
-<td>*This portfolio doesn’t have any active or pending task orders.*</td>
+<td>css=.empty-state h3</td>
+<td>*Add approved task orders*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -466,12 +468,12 @@ Imported from: AT-AT CI - TO Step 2
 Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.usa-button.usa-button-big</td>
+<td>css=.usa-button.usa-button-primary</td>
 <td></td>
 </tr>
 <tr>
 <td>click</td>
-<td>css=.usa-button.usa-button-big</td>
+<td>css=.usa-button.usa-button-primary</td>
 <td></td>
 </tr>
 <tr>
@@ -535,6 +537,20 @@ Imported from: AT-AT CI - TO Step 1-->
 </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
+This is Ghost Inspector flow control. The test will wait until the file is uploaded, which in turn causes the button to be enabled (i.e., not disabled).-->
+<tr>
+<td>assertElementNotPresent</td>
+<td>css=input[type="submit"][disabled="disabled"]</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-->
 <tr>
 <td>waitForElementPresent</td>
@@ -702,22 +718,6 @@ Imported from: AT-AT CI - TO Step 2-->
 <!--Imported from: AT-AT CI - TO Step 3-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#clins-0-jedi_clin_type > option:nth-of-type(2)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#clins-0-jedi_clin_type > option:nth-of-type(2)</td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - TO Step 3-->
-<tr>
-<td>waitForElementPresent</td>
 <td>css=#percent-obligated</td>
 <td></td>
 </tr>
diff --git a/uitests/TO_Step_5.html b/uitests/TO_Step_5.html
index 56713fcd..c52df676 100644
--- a/uitests/TO_Step_5.html
+++ b/uitests/TO_Step_5.html
@@ -35,7 +35,8 @@
 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-->
+Imported from: AT-AT CI - New Portfolio
+Imported from: AT-AT CI - login-->
 <tr>
 <td>open</td>
 <td>/login-dev</td>
@@ -50,6 +51,27 @@ Imported from: AT-AT CI - New Portfolio-->
 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
+Imported from: AT-AT CI - login-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.about-cloud > h1</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=.about-cloud > h1</td>
+<td>About Cloud Services</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>
@@ -133,26 +155,6 @@ Imported from: AT-AT CI - TO Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#defense_component > option:nth-of-type(14)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#defense_component > option:nth-of-type(14)</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=#description</td>
 <td></td>
 </tr>
@@ -433,13 +435,13 @@ Imported from: AT-AT CI - TO Step 1
 Imported from: AT-AT CI - New Portfolio-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state__message</td>
+<td>css=.empty-state h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state__message</td>
-<td>*This portfolio doesn’t have any applications*</td>
+<td>css=.empty-state h3</td>
+<td>*You don't have any Applications yet*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -471,13 +473,13 @@ Imported from: AT-AT CI - TO Step 2
 Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state__message</td>
+<td>css=.empty-state h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state__message</td>
-<td>*This portfolio doesn’t have any active or pending task orders.*</td>
+<td>css=.empty-state h3</td>
+<td>*Add approved task orders*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -490,12 +492,12 @@ Imported from: AT-AT CI - TO Step 2
 Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.usa-button.usa-button-big</td>
+<td>css=.usa-button.usa-button-primary</td>
 <td></td>
 </tr>
 <tr>
 <td>click</td>
-<td>css=.usa-button.usa-button-big</td>
+<td>css=.usa-button.usa-button-primary</td>
 <td></td>
 </tr>
 <tr>
@@ -563,6 +565,21 @@ Imported from: AT-AT CI - TO Step 1-->
 <!--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
+This is Ghost Inspector flow control. The test will wait until the file is uploaded, which in turn causes the button to be enabled (i.e., not disabled).-->
+<tr>
+<td>assertElementNotPresent</td>
+<td>css=input[type="submit"][disabled="disabled"]</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-->
 <tr>
 <td>waitForElementPresent</td>
@@ -740,23 +757,6 @@ Imported from: AT-AT CI - TO Step 3-->
 Imported from: AT-AT CI - TO Step 3-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=#clins-0-jedi_clin_type > option:nth-of-type(2)</td>
-<td></td>
-</tr>
-<tr>
-<td>click</td>
-<td>css=#clins-0-jedi_clin_type > option:nth-of-type(2)</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-->
-<tr>
-<td>waitForElementPresent</td>
 <td>css=#percent-obligated</td>
 <td></td>
 </tr>