diff --git a/e2e/safe-area/app/home/home-page.xml b/e2e/safe-area/app/home/home-page.xml
index 5ccb8bcc2..a0d3fe467 100644
--- a/e2e/safe-area/app/home/home-page.xml
+++ b/e2e/safe-area/app/home/home-page.xml
@@ -5,10 +5,10 @@
     </ActionBar>
 
     <StackLayout>
+        <Button text="Component Examples" tap="onNavigate" route="component/component-page"></Button>
         <Button text="GridLayout Examples" tap="onNavigate" route="gridlayout/gridlayout-page"></Button>
         <Button text="ScrollView Examples" tap="onNavigate" route="scrollview/scrollview-page"></Button>
         <Button text="ListView Examples" tap="onNavigate" route="listview/listview-page" />
-        <Button text="Component Examples" tap="onNavigate" route="component/component-page"></Button>
         <Button text="WrapLayout Examples" tap="onNavigate" route="wraplayout/wraplayout-page"></Button>
     </StackLayout>
 </Page>
diff --git a/e2e/safe-area/app/wraplayout/action-bar/wraplayout-page.xml b/e2e/safe-area/app/wraplayout/action-bar/hwrap-page.xml
similarity index 53%
rename from e2e/safe-area/app/wraplayout/action-bar/wraplayout-page.xml
rename to e2e/safe-area/app/wraplayout/action-bar/hwrap-page.xml
index 0bc64ddd0..b571d4cd3 100644
--- a/e2e/safe-area/app/wraplayout/action-bar/wraplayout-page.xml
+++ b/e2e/safe-area/app/wraplayout/action-bar/hwrap-page.xml
@@ -1,5 +1,5 @@
-<Page xmlns="http://schemas.nativescript.org/tns.xsd" 
-    xmlns:fragments="wraplayout/fragments">
+<Page xmlns="http://schemas.nativescript.org/tns.xsd"
+    xmlns:fragments="wraplayout/fragments" backgroundColor="LightGreen">
 
     <ActionBar>
         <Label text="Action Bar"></Label>
diff --git a/e2e/safe-area/app/wraplayout/action-bar/vwrap-page.xml b/e2e/safe-area/app/wraplayout/action-bar/vwrap-page.xml
new file mode 100644
index 000000000..9697ae08a
--- /dev/null
+++ b/e2e/safe-area/app/wraplayout/action-bar/vwrap-page.xml
@@ -0,0 +1,10 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd"
+    xmlns:fragments="wraplayout/fragments" backgroundColor="LightGreen">
+
+    <ActionBar>
+        <Label text="Action Bar"></Label>
+    </ActionBar>
+
+    <fragments:vwrap-fragment></fragments:vwrap-fragment>
+
+</Page>
diff --git a/e2e/safe-area/app/wraplayout/fragments/hwrap-fragment.xml b/e2e/safe-area/app/wraplayout/fragments/hwrap-fragment.xml
index cb3ea16e2..3139c8c18 100644
--- a/e2e/safe-area/app/wraplayout/fragments/hwrap-fragment.xml
+++ b/e2e/safe-area/app/wraplayout/fragments/hwrap-fragment.xml
@@ -1,6 +1,4 @@
 <WrapLayout orientation="horizontal" backgroundColor="LightGreen">
-    <Label text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" height="100%" backgroundColor="LightPink"></Label>
-    <Label text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightGray"></Label>
-    <!-- <Label text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightYellow"></Label> -->
-    <!-- <Label text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" backgroundColor="LightCyan"></Label> -->
+    <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" height="100%" backgroundColor="LightPink"></Button>
+    <Button text="H" backgroundColor="Pink"></Button>
 </WrapLayout>
diff --git a/e2e/safe-area/app/wraplayout/fragments/vwrap-fragment.xml b/e2e/safe-area/app/wraplayout/fragments/vwrap-fragment.xml
new file mode 100644
index 000000000..5c608403e
--- /dev/null
+++ b/e2e/safe-area/app/wraplayout/fragments/vwrap-fragment.xml
@@ -0,0 +1,4 @@
+<WrapLayout orientation="vertical" backgroundColor="LightGreen">
+    <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet" height="100%" backgroundColor="LightPink"></Button>
+    <Button text="V" backgroundColor="Pink"></Button>
+</WrapLayout>
diff --git a/e2e/safe-area/app/wraplayout/no-action-bar/wraplayout-page.xml b/e2e/safe-area/app/wraplayout/no-action-bar/hwrap-page.xml
similarity index 60%
rename from e2e/safe-area/app/wraplayout/no-action-bar/wraplayout-page.xml
rename to e2e/safe-area/app/wraplayout/no-action-bar/hwrap-page.xml
index 468532ab0..8512501d9 100644
--- a/e2e/safe-area/app/wraplayout/no-action-bar/wraplayout-page.xml
+++ b/e2e/safe-area/app/wraplayout/no-action-bar/hwrap-page.xml
@@ -1,5 +1,5 @@
-<Page xmlns="http://schemas.nativescript.org/tns.xsd" 
-    xmlns:fragments="wraplayout/fragments" actionBarHidden="true">
+<Page xmlns="http://schemas.nativescript.org/tns.xsd"
+    xmlns:fragments="wraplayout/fragments" actionBarHidden="true" backgroundColor="LightGreen">
 
     <fragments:hwrap-fragment></fragments:hwrap-fragment>
 
diff --git a/e2e/safe-area/app/wraplayout/no-action-bar/vwrap-page.xml b/e2e/safe-area/app/wraplayout/no-action-bar/vwrap-page.xml
new file mode 100644
index 000000000..06e3ad0c2
--- /dev/null
+++ b/e2e/safe-area/app/wraplayout/no-action-bar/vwrap-page.xml
@@ -0,0 +1,6 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd"
+    xmlns:fragments="wraplayout/fragments" actionBarHidden="true" backgroundColor="LightGreen">
+
+    <fragments:vwrap-fragment></fragments:vwrap-fragment>
+
+</Page>
diff --git a/e2e/safe-area/app/wraplayout/wraplayout-page.xml b/e2e/safe-area/app/wraplayout/wraplayout-page.xml
index 155d3c3b3..ae422fb08 100644
--- a/e2e/safe-area/app/wraplayout/wraplayout-page.xml
+++ b/e2e/safe-area/app/wraplayout/wraplayout-page.xml
@@ -7,11 +7,13 @@
     <StackLayout horizontalAlignment="center">
         <StackLayout>
             <Label text="Pages w/ ActionBar"></Label>
-            <Button text="HWrap" tap="onNavigate" route="wraplayout/action-bar/wraplayout-page"></Button>
+            <Button text="HWrap" tap="onNavigate" route="wraplayout/action-bar/hwrap-page"></Button>
+            <Button text="VWrap" tap="onNavigate" route="wraplayout/action-bar/vwrap-page"></Button>
         </StackLayout>
         <StackLayout>
             <Label text="Pages w/o ActionBar"></Label>
-            <Button text="HWrap" tap="onNavigate" route="wraplayout/no-action-bar/wraplayout-page"></Button>
+            <Button text="HWrap" tap="onNavigate" route="wraplayout/no-action-bar/hwrap-page"></Button>
+            <Button text="VWrap" tap="onNavigate" route="wraplayout/no-action-bar/vwrap-page"></Button>
         </StackLayout>
     </StackLayout>