diff --git a/apps/ui-tests-app/css/background.xml b/apps/ui-tests-app/css/background.xml
index 438f69fa4..bf216f8f0 100644
--- a/apps/ui-tests-app/css/background.xml
+++ b/apps/ui-tests-app/css/background.xml
@@ -2,42 +2,42 @@
   <GridLayout rows="240, *">
     <GridLayout width="290" id="test-element" />
     <WrapLayout row="1">
-      <Button width="50" height="50" text="r" tap="resetTap"/>
+      <Button width="40" height="40" text="r" tap="resetTap"/>
 
       <!-- Background and Border -->      
-      <Button width="50" height="50" text="1" tap="applyTap" tag="margin: 20; background-color: lightgreen;"/>
-      <Button width="50" height="50" text="2.1" tap="applyTap" tag="margin: 20; background-color: lightgreen; border-color: lightpink; border-radius: 20; border-width: 40;"/>
-      <Button width="50" height="50" text="2.2" tap="applyTap" tag="margin: 20; background-color: lightgreen; border-color: lightpink; border-radius: 40; border-width: 40;"/>
-      <Button width="50" height="50" text="2.3" tap="applyTap" tag="margin: 20; background-color: lightgreen; border-color: lightpink; border-radius: 40; border-width: 20;"/>
+      <Button width="40" height="40" text="1" tap="applyTap" tag="margin: 20; background-color: lightgreen;"/>
+      <Button width="40" height="40" text="21" tap="applyTap" tag="margin: 20; background-color: lightgreen; border-color: lightpink; border-radius: 20; border-width: 40;"/>
+      <Button width="40" height="40" text="22" tap="applyTap" tag="margin: 20; background-color: lightgreen; border-color: lightpink; border-radius: 40; border-width: 40;"/>
+      <Button width="40" height="40" text="23" tap="applyTap" tag="margin: 20; background-color: lightgreen; border-color: lightpink; border-radius: 40; border-width: 20;"/>
 
       <!-- Repeat -->
-      <Button width="50" height="50" text="3.1" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png');"/>
-      <Button width="50" height="50" text="3.2" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:repeat-y;"/>
-      <Button width="50" height="50" text="3.3" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:repeat-x;"/>
+      <Button width="40" height="40" text="31" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png');"/>
+      <Button width="40" height="40" text="32" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:repeat-y;"/>
+      <Button width="40" height="40" text="33" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:repeat-x;"/>
 
       <!-- Position -->
-      <Button width="50" height="50" text="4.1" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat;"/>
-      <Button width="50" height="50" text="4.2" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: right top;"/>
-      <Button width="50" height="50" text="4.3" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: center center;"/>
-      <Button width="50" height="50" text="4.4" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: left bottom;"/>
-      <Button width="50" height="50" text="4.5" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: 20% 80%;"/>
-      <Button width="50" height="50" text="4.6" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: 20 80;"/>
-      <Button width="50" height="50" text="4.7" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: -10 20;"/>
-      <Button width="50" height="50" text="4.8" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: 10 -20;"/>
-      <Button width="50" height="50" text="4.9" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: -10 -20;"/>
-      <Button width="50" height="50" text="4.10" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: center;"/>
-      <Button width="50" height="50" text="4.11" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: left;"/>
-      <Button width="50" height="50" text="4.12" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: bottom;"/>
+      <Button width="40" height="40" text="41" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat;"/>
+      <Button width="40" height="40" text="42" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: right top;"/>
+      <Button width="40" height="40" text="43" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: center center;"/>
+      <Button width="40" height="40" text="44" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: left bottom;"/>
+      <Button width="40" height="40" text="45" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: 20% 80%;"/>
+      <Button width="40" height="40" text="46" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: 20 80;"/>
+      <Button width="40" height="40" text="47" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: -10 20;"/>
+      <Button width="40" height="40" text="48" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: 10 -20;"/>
+      <Button width="40" height="40" text="49" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: -10 -20;"/>
+      <Button width="40" height="40" text="50" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: center;"/>
+      <Button width="40" height="40" text="51" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: left;"/>
+      <Button width="40" height="40" text="52" tap="applyTap" tag="margin: 20; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: bottom;"/>
       
       <!-- Size -->
-      <Button width="50" height="50" text="5.1" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: center center; background-size: 100px 100px;"/>
-      <Button width="50" height="50" text="5.2" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: center center; background-size: 100% 100%;"/>
-      <Button width="50" height="50" text="5.3" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: center center; background-size: cover;"/>
-      <Button width="50" height="50" text="5.4" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: center center; background-size: contain;"/>
+      <Button width="40" height="40" text="61" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: center center; background-size: 100px 100px;"/>
+      <Button width="40" height="40" text="62" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: center center; background-size: 100% 100%;"/>
+      <Button width="40" height="40" text="63" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: center center; background-size: cover;"/>
+      <Button width="40" height="40" text="64" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:no-repeat; background-position: center center; background-size: contain;"/>
 
       <!-- All -->
-      <Button width="50" height="50" text="6.1" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:repeat-x; background-position: 20% 80%; background-size: 25% 50%; border-radius: 20; border-width: 4; border-color: lightpink;"/>
-      <Button width="50" height="50" text="6.2" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:repeat-y; background-position: 80 20; background-size: 50 25; border-radius: 20; border-width: 4; border-color: lightpink; opacity: 0.5;"/>
+      <Button width="40" height="40" text="71" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:repeat-x; background-position: 20% 80%; background-size: 25% 50%; border-radius: 20; border-width: 4; border-color: lightpink;"/>
+      <Button width="40" height="40" text="72" tap="applyTap" tag="margin: 20; background-color: lightgreen; background-image: url('~/pages/test2.png'); background-repeat:repeat-y; background-position: 80 20; background-size: 50 25; border-radius: 20; border-width: 4; border-color: lightpink; opacity: 0.5;"/>
     </WrapLayout>
   </GridLayout>
 </Page>
\ No newline at end of file
diff --git a/apps/ui-tests-app/html-view/html-view.ts b/apps/ui-tests-app/html-view/html-view.ts
index c0549a9f2..fd54dab07 100644
--- a/apps/ui-tests-app/html-view/html-view.ts
+++ b/apps/ui-tests-app/html-view/html-view.ts
@@ -1,5 +1,4 @@
 export function pageLoaded(args) {
     var page = args.object;
-
     page.bindingContext = { html: "one<br>two" };
 }
\ No newline at end of file
diff --git a/apps/ui-tests-app/mainPage.ts b/apps/ui-tests-app/mainPage.ts
index 8e0e5fdde..6936c363d 100644
--- a/apps/ui-tests-app/mainPage.ts
+++ b/apps/ui-tests-app/mainPage.ts
@@ -32,15 +32,10 @@ export function selectExample() {
     }
 }
 
-examples.set("actColor", "action-bar/color");
-examples.set("actBG", "action-bar/background");
-examples.set("actStyle", "action-bar/all");
-examples.set("actSystemIcons", "action-bar/system-icons");
-
 examples.set("basics", "bindings/basics");
 examples.set("xmlbasics", "bindings/xmlbasics");
 
-examples.set("background", "css/background");
+
 examples.set("radius", "css/radius");
 examples.set("styles", "css/styles");
 
@@ -51,21 +46,7 @@ examples.set("fontlbl", "font/label");
 examples.set("fontfield", "font/text-field");
 examples.set("fontview", "font/text-view");
 
-examples.set("htmlview", "html-view/html-view");
 
-examples.set("roundbtn", "image-view/rounded-buttons");
-examples.set("roundimg", "image-view/rounded-images");
-
-examples.set("absolute", "layouts/absolute");
-examples.set("dock", "layouts/dock");
-examples.set("grid", "layouts/grid");
-examples.set("myview", "layouts/myview");
-examples.set("stack", "layouts/stack");
-examples.set("wrap", "layouts/wrap");
-
-examples.set("modalview", "modal-view/modal-view");
-
-examples.set("nordic", "nordic/nordic");
 
 examples.set("console", "pages/console");
 examples.set("gestures", "pages/gestures");
@@ -77,24 +58,23 @@ examples.set("listview_binding", "pages/listview_binding");
 
 examples.set("switch", "pages/switchandprogress"); // TODO: Update this test page.
 
-examples.set("segStyle", "segmented-bar/all");
-
-examples.set("tabColor", "tab-view/color");
-examples.set("tabBG", "tab-view/background");
-examples.set("tabTabsBG", "tab-view/tabsBackground");
-examples.set("tabSelected", "tab-view/selected");
-examples.set("tabStyle", "tab-view/all");
-
 examples.set("textfield", "text-field/text-field");
 
-examples.set("webview", "web-view/web-view");
-examples.set("webtest", "web-view/web-view-test");
-
 examples.set("decoration", "css/text-decoration");
 examples.set("whitespace", "css/white-space");
 examples.set("transform", "css/text-transform");
 
-// Layouts
+// ---
+
+examples.set("actColor", "action-bar/color");
+examples.set("actBG", "action-bar/background");
+examples.set("actStyle", "action-bar/all");
+examples.set("actIcons", "action-bar/system-icons");
+
+examples.set("background", "css/background");
+
+examples.set("htmlview", "html-view/html-view");
+
 examples.set("absolute", "layouts/absolute");
 examples.set("dock", "layouts/dock");
 examples.set("grid", "layouts/grid");
@@ -108,3 +88,20 @@ examples.set("pgrid", "layouts-percent/grid");
 examples.set("pmyview", "layouts-percent/myview");
 examples.set("pstack", "layouts-percent/stack");
 examples.set("pwrap", "layouts-percent/wrap");
+
+examples.set("modalview", "modal-view/modal-view");
+examples.set("nordic", "nordic/nordic");
+
+examples.set("roundbtn", "image-view/rounded-buttons");
+examples.set("roundimg", "image-view/rounded-images");
+
+examples.set("segStyle", "segmented-bar/all");
+
+examples.set("tabColor", "tab-view/color");
+examples.set("tabBG", "tab-view/background");
+examples.set("tabTabsBG", "tab-view/tabsBackground");
+examples.set("tabSelected", "tab-view/selected");
+examples.set("tabStyle", "tab-view/all");
+
+examples.set("webview", "web-view/web-view");
+examples.set("webtest", "web-view/web-view-test");