diff --git a/apps/ui-tests-app/css/zindex.xml b/apps/ui-tests-app/css/zindex.xml
index 2ec43223f..9224d3bf4 100644
--- a/apps/ui-tests-app/css/zindex.xml
+++ b/apps/ui-tests-app/css/zindex.xml
@@ -1,34 +1,34 @@
 <Page>
-  <GridLayout automationText="zIndex" columns="*,*" rows="*, *">
+  <GridLayout automationText="zIndex" columns="*,*" rows="auto, *">
     <AbsoluteLayout style="background-color: green;">
-      <Button text="button 1" style="height: 100; width: 100; z-index: 999; background-color: red;" />
-      <Button text="button 2" left="20" top="70" style="height: 100; width: 100; z-index:1; background-color: yellow;"/>
-      <Button text="button 3" left="60" top="130" style="height: 100; width: 100; z-index:0; background-color: blue; color: black;"/>
-      <Button text="button 4" left="90" top="190" style="height: 100; width: 100; z-index:-1; background-color: orange;"/>
+      <Button text="button 1" style="height: 55; width: 110; z-index: 999; background-color: red;" />
+      <Button text="button 2" left="10" top="35" style="height: 55; width: 110; z-index:1; background-color: yellow;"/>
+      <Button text="button 3" left="20" top="70" style="height: 55; width: 110; z-index:0; background-color: blue; color: black;"/>
+      <Button text="button 4" left="30" top="105" style="height: 55; width: 110; z-index:-1; background-color: orange;"/>
     </AbsoluteLayout>
     <AbsoluteLayout style="background-color: black;" col="1">
-      <Label text="label 1" style="height: 100; width: 100; z-index: 999; background-color: red;" />
-      <Label text="label 2" left="20" top="70" style="height: 100; width: 100; z-index:1; background-color: yellow;"/>
-      <Label text="label 3" left="60" top="130" style="height: 100; width: 100; z-index:0; background-color: blue; color: black;"/>
-      <Label text="label 4" left="90" top="190" style="height: 100; width: 100; z-index:-1; background-color: orange;"/>
+      <Label text="label 1" style="height: 50; width: 110; z-index: 999; background-color: red;" />
+      <Label text="label 2" left="10" top="35" style="height: 50; width: 110; z-index:1; padding-top:10; background-color: yellow;"/>
+      <Label text="label 3" left="20" top="70" style="height: 50; width: 110; z-index:0; padding-top:10; background-color: blue; color: black;"/>
+      <Label text="label 4" left="30" top="105" style="height: 50; width: 110; z-index:-1; padding-top:10; background-color: orange;"/>
     </AbsoluteLayout>
     <AbsoluteLayout style="background-color: brown;" row="1">
-      <TextField text="TextField" style="height: 100; width: 100; z-index: 999; background-color: red;" />
-      <TextView text="TextView" left="20" top="70" style="height: 100; width: 100; z-index:1; background-color: yellow;"/>
-      <Image src="~/ui-tests-app/image-view/gravatar.png" left="60" top="130" style="height: 100; width: 100; z-index:0; background-color: blue; color: black;"/>
-      <TimePicker hour="5" minute="30" minHour="3" maxHour="7" left="90" top="190" style="z-index:-1; background-color: orange; width: 100;"/>
+      <TextField text="TextField" style="height: 60; width: 100; z-index: 999;  background-color: red;" />
+      <TextView text="TextView" left="10" top="30" style="height: 70; width: 100; padding-top:40; z-index:1; background-color: yellow;"/>
+      <Image src="~/ui-tests-app/ui-tests-app/image-view/gravatar.png" left="30" top="70" style="height: 60; width: 100; z-index:0; background-color: blue; color: black;"/>
+      <TimePicker hour="5" minute="30" minHour="3" maxHour="7" top="90" style="z-index:-1; background-color: orange; width: auto;"/>
     </AbsoluteLayout>
-    <AbsoluteLayout row="1" col="1" style="background-color: grey;">
+    <AbsoluteLayout row="1" col="1" style="background-color: red;"> 
       <StackLayout style="background-color: green; z-index: 999;">
-        <TextField text="stacklayout1" style="height: 100; width: 100;"/>
+        <TextField text="stacklayout1" style="height: 60; width: 110;"/> 
       </StackLayout>
-      <StackLayout left="20" top="70" style="z-index: 1; background-color: yellow">
-        <TextField text="stacklayout2" style="height: 100; width: 100;"/>
+      <StackLayout left="10" top="40" style="z-index: 1; background-color: yellow">
+        <TextField text="stacklayout2" style="height: 60; width: 110;"/>
       </StackLayout>
-      <WrapLayout left="60" top="130" style="z-index: 0; background-color: blue">
-        <TextField text="wraplayout" style="height: 100; width: 100;"/>
+      <WrapLayout left="30" top="80" style="z-index: 0; background-color: blue">
+        <TextField text="wraplayout" style="height: 60; width: 110;"/>
       </WrapLayout>
-      <AbsoluteLayout left="90" top="190" style="height: 100; width: 100; z-index: -1; background-color: orange;">
+      <AbsoluteLayout left="50" top="100" style="height: 60; width: 110; z-index: -1; background-color: orange;">
         <Label text="absolutelayout" top="40"/>
       </AbsoluteLayout>
     </AbsoluteLayout>