From: dongsug.song <dongsug.song@samsung.com>
Date: Mon, 9 Aug 2021 03:00:16 +0000 (+0900)
Subject: [NUI] sync with https://github.com/nui-dali/NUITizenGallery
X-Git-Tag: accepted/tizen/unified/20231205.024657~1621
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6205ebe2b69aea3c87691ffe4620d6b17357c458;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

[NUI] sync with https://github.com/nui-dali/NUITizenGallery
---

diff --git a/test/NUITizenGallery/Examples/AbsoluteLayout/AbsoluteLayout.cs b/test/NUITizenGallery/Examples/AbsoluteLayoutTest/AbsoluteLayoutTest.cs
similarity index 84%
rename from test/NUITizenGallery/Examples/AbsoluteLayout/AbsoluteLayout.cs
rename to test/NUITizenGallery/Examples/AbsoluteLayoutTest/AbsoluteLayoutTest.cs
index 95f0c3d..394f74f 100644
--- a/test/NUITizenGallery/Examples/AbsoluteLayout/AbsoluteLayout.cs
+++ b/test/NUITizenGallery/Examples/AbsoluteLayoutTest/AbsoluteLayoutTest.cs
@@ -21,24 +21,20 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    internal class AbsoluteLayout : IExample
+    internal class AbsoluteLayoutTest : IExample
     {
         Window window;
-        AbsoluteLayoutPage page;
 
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
             window = NUIApplication.GetDefaultWindow();
-
-            page = new AbsoluteLayoutPage();
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new AbsoluteLayoutTestPage());
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/AbsoluteLayoutTest/AbsoluteLayoutTestPage.xaml b/test/NUITizenGallery/Examples/AbsoluteLayoutTest/AbsoluteLayoutTestPage.xaml
new file mode 100644
index 0000000..70bef50
--- /dev/null
+++ b/test/NUITizenGallery/Examples/AbsoluteLayoutTest/AbsoluteLayoutTestPage.xaml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.AbsoluteLayoutTestPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="AbsoluteLayoutTestPage"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+            <TextLabel Text="Stylish Header" PointSize="12" Position2D="73,130"/>
+            <View BackgroundColor="#FF0000" Position2D="32,108" Size2D="400,5"/>
+            <View BackgroundColor="#00FF00" Position2D="32,120" Size2D="400,5"/>
+            <View BackgroundColor="#0000FF" Position2D="42,100" Size2D="5,100"/>
+            <View BackgroundColor="#FF00FF" Position2D="54,100" Size2D="5,100"/>
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/AbsoluteLayout/AbsoluteLayout.xaml.cs b/test/NUITizenGallery/Examples/AbsoluteLayoutTest/AbsoluteLayoutTestPage.xaml.cs
similarity index 88%
rename from test/NUITizenGallery/Examples/AbsoluteLayout/AbsoluteLayout.xaml.cs
rename to test/NUITizenGallery/Examples/AbsoluteLayoutTest/AbsoluteLayoutTestPage.xaml.cs
index 1a01c17..ff22e82 100644
--- a/test/NUITizenGallery/Examples/AbsoluteLayout/AbsoluteLayout.xaml.cs
+++ b/test/NUITizenGallery/Examples/AbsoluteLayoutTest/AbsoluteLayoutTestPage.xaml.cs
@@ -20,9 +20,9 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class AbsoluteLayoutPage : View
+    public partial class AbsoluteLayoutTestPage : ContentPage
     {
-        public AbsoluteLayoutPage()
+        public AbsoluteLayoutTestPage()
         {
             InitializeComponent();
         }
diff --git a/test/NUITizenGallery/Examples/ActivityIndicatorTest/ActivityIndicatorTest.cs b/test/NUITizenGallery/Examples/ActivityIndicatorTest/ActivityIndicatorTest.cs
new file mode 100644
index 0000000..be0ae8c
--- /dev/null
+++ b/test/NUITizenGallery/Examples/ActivityIndicatorTest/ActivityIndicatorTest.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class ActivityIndicatorTest : IExample
+    {
+        Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new ActivityIndicatorTestPage());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/ActivityIndicatorTest/ActivityIndicatorTestPage.xaml b/test/NUITizenGallery/Examples/ActivityIndicatorTest/ActivityIndicatorTestPage.xaml
new file mode 100644
index 0000000..42a113f
--- /dev/null
+++ b/test/NUITizenGallery/Examples/ActivityIndicatorTest/ActivityIndicatorTestPage.xaml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.ActivityIndicatorTestPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="ActivityIndicatorTestPage"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <Loading x:Name="Spinner" Size2D="100, 100" Position2D="10, 10"/>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/ActivityIndicator/ActivityIndicator.xaml.cs b/test/NUITizenGallery/Examples/ActivityIndicatorTest/ActivityIndicatorTestPage.xaml.cs
similarity index 88%
rename from test/NUITizenGallery/Examples/ActivityIndicator/ActivityIndicator.xaml.cs
rename to test/NUITizenGallery/Examples/ActivityIndicatorTest/ActivityIndicatorTestPage.xaml.cs
index a07e15f..9d6c55d 100644
--- a/test/NUITizenGallery/Examples/ActivityIndicator/ActivityIndicator.xaml.cs
+++ b/test/NUITizenGallery/Examples/ActivityIndicatorTest/ActivityIndicatorTestPage.xaml.cs
@@ -15,12 +15,13 @@
  *
  */
 using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class ActivityIndicatorPage : View
+    public partial class ActivityIndicatorTestPage : ContentPage
     {
-        public ActivityIndicatorPage()
+        public ActivityIndicatorTestPage()
         {
             InitializeComponent();
 
diff --git a/test/NUITizenGallery/Examples/AlertDialogTest/AlertDialogTest.cs b/test/NUITizenGallery/Examples/AlertDialogTest/AlertDialogTest.cs
index 39780fd..12fec7c 100644
--- a/test/NUITizenGallery/Examples/AlertDialogTest/AlertDialogTest.cs
+++ b/test/NUITizenGallery/Examples/AlertDialogTest/AlertDialogTest.cs
@@ -24,7 +24,6 @@ namespace NUITizenGallery
     {
         Window window;
         Navigator navigator;
-        AlertDialogTestPage page;
         int pageCount = 0;
 
         public void Activate()
@@ -35,9 +34,7 @@ namespace NUITizenGallery
             navigator = window.GetDefaultNavigator();
 
             pageCount = navigator.PageCount;
-
-            page = new AlertDialogTestPage();
-            navigator.Push(page);
+            navigator.Push(new AlertDialogTestPage());
         }
 
         public void Deactivate()
diff --git a/test/NUITizenGallery/res/layout/AlertDialogTestPage.xaml b/test/NUITizenGallery/Examples/AlertDialogTest/AlertDialogTestPage.xaml
similarity index 74%
rename from test/NUITizenGallery/res/layout/AlertDialogTestPage.xaml
rename to test/NUITizenGallery/Examples/AlertDialogTest/AlertDialogTestPage.xaml
index d04fe78..822b196 100644
--- a/test/NUITizenGallery/res/layout/AlertDialogTestPage.xaml
+++ b/test/NUITizenGallery/Examples/AlertDialogTest/AlertDialogTestPage.xaml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<comp:ContentPage x:Class="NUITizenGallery.AlertDialogTestPage"
+<ContentPage x:Class="NUITizenGallery.AlertDialogTestPage"
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:nui="clr-namespace:Tizen.NUI;assembly=Tizen.NUI"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
   HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
 
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
     <ContentPage.AppBar>
-        <AppBar x:Name="appBar"
-                    Title="AlertDialogTestPage"/>
+        <AppBar x:Name="appBar" Title="AlertDialogTestPage"/>
     </ContentPage.AppBar>
 
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
     <ContentPage.Content>
-        <View x:Name="content"
-                WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
+        <View x:Name="ContentView"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                 HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
             <View.Layout>
                 <LinearLayout LinearOrientation="Vertical" CellPadding="0,20"/>
@@ -39,4 +37,4 @@
         </View>
     </ContentPage.Content>
 
-</comp:ContentPage>
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/AnimationTest1/AnimationTest1.cs b/test/NUITizenGallery/Examples/AnimationTest/AnimationTest1.cs
similarity index 86%
rename from test/NUITizenGallery/Examples/AnimationTest1/AnimationTest1.cs
rename to test/NUITizenGallery/Examples/AnimationTest/AnimationTest1.cs
index 5289ad7..6d43f1b 100755
--- a/test/NUITizenGallery/Examples/AnimationTest1/AnimationTest1.cs
+++ b/test/NUITizenGallery/Examples/AnimationTest/AnimationTest1.cs
@@ -17,27 +17,25 @@
 
 using System;
 using Tizen.NUI;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
     internal class AnimationTest1 : IExample
     {
         private Window window;
-        private AnimationTest1Page page;
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
 
             window = NUIApplication.GetDefaultWindow();
-            page = new AnimationTest1Page();
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new AnimationTest1Page());
         }
 
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
\ No newline at end of file
diff --git a/test/NUITizenGallery/Examples/AnimationTest/AnimationTest1Page.xaml b/test/NUITizenGallery/Examples/AnimationTest/AnimationTest1Page.xaml
new file mode 100755
index 0000000..a6033ee
--- /dev/null
+++ b/test/NUITizenGallery/Examples/AnimationTest/AnimationTest1Page.xaml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.AnimationTest1Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="AnimationTest1Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" CellPadding="10,10" LinearAlignment="Top"/>
+            </View.Layout>
+
+            <View x:Name="imgView"
+             WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+             HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+             Weight="0.3">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterHorizontal" CellPadding="10,10"/>
+                </View.Layout>
+
+                <ImageView x:Name="imageView" ResourceUrl="*Resource*/images/a.jpg" />
+            </View>
+
+            <View x:Name="btnView"
+             WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+             HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+             Weight="0.7">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterHorizontal" CellPadding="10,10" />
+                </View.Layout>
+
+                <Button x:Name="image1Btn" Text="Start Animation" Size2D="680,100"/>
+                <Button x:Name="image2Btn" Text="Stop Animation"  Size2D="680,100"/>
+                <TextLabel x:Name="desc1"  Text="" PointSize="15" TextColor="Black"/>
+            </View>
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/AnimationTest1/AnimationTest1.xaml.cs b/test/NUITizenGallery/Examples/AnimationTest/AnimationTest1Page.xaml.cs
similarity index 96%
rename from test/NUITizenGallery/Examples/AnimationTest1/AnimationTest1.xaml.cs
rename to test/NUITizenGallery/Examples/AnimationTest/AnimationTest1Page.xaml.cs
index 2809eb2..b5f3a8c 100755
--- a/test/NUITizenGallery/Examples/AnimationTest1/AnimationTest1.xaml.cs
+++ b/test/NUITizenGallery/Examples/AnimationTest/AnimationTest1Page.xaml.cs
@@ -21,7 +21,7 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class AnimationTest1Page : View
+    public partial class AnimationTest1Page : ContentPage
     {
         private Animation animation;
 
diff --git a/test/NUITizenGallery/Examples/AnimationTest2/AnimationTest2.cs b/test/NUITizenGallery/Examples/AnimationTest/AnimationTest2.cs
similarity index 86%
rename from test/NUITizenGallery/Examples/AnimationTest2/AnimationTest2.cs
rename to test/NUITizenGallery/Examples/AnimationTest/AnimationTest2.cs
index be49d7a..ed0ca85 100755
--- a/test/NUITizenGallery/Examples/AnimationTest2/AnimationTest2.cs
+++ b/test/NUITizenGallery/Examples/AnimationTest/AnimationTest2.cs
@@ -17,27 +17,25 @@
 
 using System;
 using Tizen.NUI;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
     internal class AnimationTest2 : IExample
     {
         private Window window;
-        private AnimationTest2Page page;
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
 
             window = NUIApplication.GetDefaultWindow();
-            page = new AnimationTest2Page();
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new AnimationTest2Page());
         }
 
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
\ No newline at end of file
diff --git a/test/NUITizenGallery/Examples/AnimationTest/AnimationTest2Page.xaml b/test/NUITizenGallery/Examples/AnimationTest/AnimationTest2Page.xaml
new file mode 100755
index 0000000..434fab2
--- /dev/null
+++ b/test/NUITizenGallery/Examples/AnimationTest/AnimationTest2Page.xaml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.AnimationTest2Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="AnimationTest2Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" CellPadding="10,10" LinearAlignment="Top"/>
+            </View.Layout>
+
+            <View x:Name="imgView"
+             WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+             HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+             Weight="0.3">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterHorizontal" CellPadding="10,10"/>
+                </View.Layout>
+
+                <ImageView x:Name="imageView" ResourceUrl="*Resource*/images/a.jpg" />
+            </View>
+
+            <View x:Name="btnView"
+             WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+             HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+             Weight="0.7">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterHorizontal" CellPadding="10,10" />
+                </View.Layout>
+
+                <Button x:Name="image1Btn" Text="Start Animation" Size2D="680,100"/>
+                <Button x:Name="image2Btn" Text="Stop Animation"  Size2D="680,100"/>
+                <TextLabel x:Name="desc1"  Text="" PointSize="15" TextColor="Black"/>
+            </View>
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/AnimationTest2/AnimationTest2.xaml.cs b/test/NUITizenGallery/Examples/AnimationTest/AnimationTest2Page.xaml.cs
similarity index 95%
rename from test/NUITizenGallery/Examples/AnimationTest2/AnimationTest2.xaml.cs
rename to test/NUITizenGallery/Examples/AnimationTest/AnimationTest2Page.xaml.cs
index a74f954..d297304 100755
--- a/test/NUITizenGallery/Examples/AnimationTest2/AnimationTest2.xaml.cs
+++ b/test/NUITizenGallery/Examples/AnimationTest/AnimationTest2Page.xaml.cs
@@ -21,7 +21,7 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class AnimationTest2Page : View
+    public partial class AnimationTest2Page : ContentPage
     {
         private Animation animation;
         private float position = 50.0f;
diff --git a/test/NUITizenGallery/Examples/AnimationTest3/AnimationTest3.cs b/test/NUITizenGallery/Examples/AnimationTest/AnimationTest3.cs
similarity index 86%
rename from test/NUITizenGallery/Examples/AnimationTest3/AnimationTest3.cs
rename to test/NUITizenGallery/Examples/AnimationTest/AnimationTest3.cs
index aab90db..270b008 100755
--- a/test/NUITizenGallery/Examples/AnimationTest3/AnimationTest3.cs
+++ b/test/NUITizenGallery/Examples/AnimationTest/AnimationTest3.cs
@@ -17,27 +17,25 @@
 
 using System;
 using Tizen.NUI;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
     internal class AnimationTest3 : IExample
     {
         private Window window;
-        private AnimationTest3Page page;
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
 
             window = NUIApplication.GetDefaultWindow();
-            page = new AnimationTest3Page();
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new AnimationTest3Page());
         }
 
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
\ No newline at end of file
diff --git a/test/NUITizenGallery/Examples/AnimationTest/AnimationTest3Page.xaml b/test/NUITizenGallery/Examples/AnimationTest/AnimationTest3Page.xaml
new file mode 100755
index 0000000..0b4d1ad
--- /dev/null
+++ b/test/NUITizenGallery/Examples/AnimationTest/AnimationTest3Page.xaml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.AnimationTest3Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="AnimationTest3Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" CellPadding="10,10" LinearAlignment="Top"/>
+            </View.Layout>
+
+            <View x:Name="imgView"
+             WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+             HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+             Weight="0.3">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterHorizontal" CellPadding="10,10"/>
+                </View.Layout>
+
+                <ImageView x:Name="imageView" ResourceUrl="*Resource*/images/a.jpg" />
+            </View>
+
+            <View x:Name="btnView"
+             WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+             HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+             Weight="0.7">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterHorizontal" CellPadding="10,10" />
+                </View.Layout>
+
+                <Button x:Name="image1Btn" Text="Start Animation" Size2D="680,100"/>
+                <Button x:Name="image2Btn" Text="Stop Animation"  Size2D="680,100"/>
+                <TextLabel x:Name="desc1"  Text="" PointSize="15" TextColor="Black"/>
+            </View>
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/AnimationTest3/AnimationTest3.xaml.cs b/test/NUITizenGallery/Examples/AnimationTest/AnimationTest3Page.xaml.cs
similarity index 97%
rename from test/NUITizenGallery/Examples/AnimationTest3/AnimationTest3.xaml.cs
rename to test/NUITizenGallery/Examples/AnimationTest/AnimationTest3Page.xaml.cs
index 9dc9dad..50cb9d9 100755
--- a/test/NUITizenGallery/Examples/AnimationTest3/AnimationTest3.xaml.cs
+++ b/test/NUITizenGallery/Examples/AnimationTest/AnimationTest3Page.xaml.cs
@@ -21,7 +21,7 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class AnimationTest3Page : View
+    public partial class AnimationTest3Page : ContentPage
     {
         private Animation animation;
 
diff --git a/test/NUITizenGallery/Examples/BackgroundColorTest1/BackGroundColorTest1.cs b/test/NUITizenGallery/Examples/BackgroundColorTest/BackGroundColorTest1.cs
similarity index 86%
rename from test/NUITizenGallery/Examples/BackgroundColorTest1/BackGroundColorTest1.cs
rename to test/NUITizenGallery/Examples/BackgroundColorTest/BackGroundColorTest1.cs
index c95861c..12ff305 100644
--- a/test/NUITizenGallery/Examples/BackgroundColorTest1/BackGroundColorTest1.cs
+++ b/test/NUITizenGallery/Examples/BackgroundColorTest/BackGroundColorTest1.cs
@@ -16,27 +16,25 @@
  */
 using System;
 using Tizen.NUI;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
     internal class BackgroundColorTest1 : IExample
     {
         Window window;
-        BackgroundColorTest1Page page;
+
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
 
             window = NUIApplication.GetDefaultWindow();
-            page = new BackgroundColorTest1Page();
-
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new BackgroundColorTest1Page());
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/BackgroundColorTest2/BackGroundColorTest2.cs b/test/NUITizenGallery/Examples/BackgroundColorTest/BackGroundColorTest2.cs
similarity index 86%
rename from test/NUITizenGallery/Examples/BackgroundColorTest2/BackGroundColorTest2.cs
rename to test/NUITizenGallery/Examples/BackgroundColorTest/BackGroundColorTest2.cs
index 02ba99f..8ab7d6c 100644
--- a/test/NUITizenGallery/Examples/BackgroundColorTest2/BackGroundColorTest2.cs
+++ b/test/NUITizenGallery/Examples/BackgroundColorTest/BackGroundColorTest2.cs
@@ -16,27 +16,25 @@
  */
 using System;
 using Tizen.NUI;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
     internal class BackgroundColorTest2 : IExample
     {
         Window window;
-        BackgroundColorTest2Page page;
+
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
 
             window = NUIApplication.GetDefaultWindow();
-            page = new BackgroundColorTest2Page();
-
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new BackgroundColorTest2Page());
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/BackgroundColorTest3/BackGroundColorTest3.cs b/test/NUITizenGallery/Examples/BackgroundColorTest/BackGroundColorTest3.cs
similarity index 86%
rename from test/NUITizenGallery/Examples/BackgroundColorTest3/BackGroundColorTest3.cs
rename to test/NUITizenGallery/Examples/BackgroundColorTest/BackGroundColorTest3.cs
index 6eeeea2..880cc42 100644
--- a/test/NUITizenGallery/Examples/BackgroundColorTest3/BackGroundColorTest3.cs
+++ b/test/NUITizenGallery/Examples/BackgroundColorTest/BackGroundColorTest3.cs
@@ -16,27 +16,25 @@
  */
 using System;
 using Tizen.NUI;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
     internal class BackgroundColorTest3 : IExample
     {
         Window window;
-        BackgroundColorTest3Page page;
+
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
 
             window = NUIApplication.GetDefaultWindow();
-            page = new BackgroundColorTest3Page();
-
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new BackgroundColorTest3Page());
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/BackgroundColorTest4/BackGroundColorTest4.cs b/test/NUITizenGallery/Examples/BackgroundColorTest/BackGroundColorTest4.cs
similarity index 86%
rename from test/NUITizenGallery/Examples/BackgroundColorTest4/BackGroundColorTest4.cs
rename to test/NUITizenGallery/Examples/BackgroundColorTest/BackGroundColorTest4.cs
index 2d8c5e1..8f9031a 100644
--- a/test/NUITizenGallery/Examples/BackgroundColorTest4/BackGroundColorTest4.cs
+++ b/test/NUITizenGallery/Examples/BackgroundColorTest/BackGroundColorTest4.cs
@@ -16,27 +16,25 @@
  */
 using System;
 using Tizen.NUI;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
     internal class BackgroundColorTest4 : IExample
     {
         Window window;
-        BackgroundColorTest4Page page;
+
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
 
             window = NUIApplication.GetDefaultWindow();
-            page = new BackgroundColorTest4Page();
-
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new BackgroundColorTest4Page());
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/BackgroundColorTest5/BackGroundColorTest5.cs b/test/NUITizenGallery/Examples/BackgroundColorTest/BackGroundColorTest5.cs
similarity index 86%
rename from test/NUITizenGallery/Examples/BackgroundColorTest5/BackGroundColorTest5.cs
rename to test/NUITizenGallery/Examples/BackgroundColorTest/BackGroundColorTest5.cs
index 5fddddc..7753a30 100644
--- a/test/NUITizenGallery/Examples/BackgroundColorTest5/BackGroundColorTest5.cs
+++ b/test/NUITizenGallery/Examples/BackgroundColorTest/BackGroundColorTest5.cs
@@ -16,27 +16,25 @@
  */
 using System;
 using Tizen.NUI;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
     internal class BackgroundColorTest5 : IExample
     {
         Window window;
-        BackgroundColorTest5Page page;
+
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
 
             window = NUIApplication.GetDefaultWindow();
-            page = new BackgroundColorTest5Page();
-
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new BackgroundColorTest5Page());
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest1Page.xaml b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest1Page.xaml
new file mode 100644
index 0000000..a24202b
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest1Page.xaml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.BackgroundColorTest1Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="BackgroundColorTest1Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top"/>
+            </View.Layout>
+
+            <View x:Name="mainView"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  BackgroundColor="#00ffff"
+                  Opacity="0.9"
+                  Weight="1.0">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10"/>
+                </View.Layout>
+
+                <Button x:Name="button1"
+                            WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                            PointSize="8"
+                            Text="Change BackgroundColor"
+                            TextColor="White"
+                            BackgroundColor="Black"/>
+
+                <Button x:Name="button2"
+                            WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                            PointSize="8"
+                            Text="Button1 (Red)"
+                            TextColor="White"
+                            BackgroundColor="Red"/>
+
+                <Button x:Name="button3"
+                            WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                            PointSize="8"
+                            Text="Button2 (Blue/0.5)"
+                            TextColor="White"
+                            BackgroundColor = "Blue"
+                            Opacity="0.5"/>
+
+                <Button x:Name="button4"
+                            WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                            PointSize="8"
+                            Text="Button3 (0,0,1,.5)"
+                            TextColor="White"
+                            BackgroundColor="0,0,1,.5"
+                            Opacity="0.4"/>
+
+                <TextLabel WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                           PointSize="8"
+                           Text="Label1 (Silver)"
+                           BackgroundColor="#C0C0C0"/>
+
+                <TextLabel WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                           PointSize="8"
+                           Text="Label2 (Pink/0.5)"
+                           BackgroundColor="#FF66FF"
+                           Opacity="0.4"/>
+
+                <TextField WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                           PointSize="8"
+                           Text="This is a Entry with very looooooooooooong looooooooooooooong text,  (Background color : Color.Lime)"
+                           BackgroundColor="#00FF00"
+                           Weight="1.0"/>
+
+                <TextField WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                           PointSize="8"
+                           Text="Formatted entry (Background color : Color.Maroon)"
+                           BackgroundColor="#800000"
+                           Weight="1.0"/>
+
+                <Progress WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                          MinValue="0.0"
+                          MaxValue="1.0"
+                          BufferColor="#FF66FF"
+                          CurrentValue="0.5"
+                          Weight="1.0"/>
+
+                <Slider WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                        MinValue="0"
+                        MaxValue="1.0"
+                        BgTrackColor="#800080"
+                        Weight="1.0"/>
+
+            </View>
+
+            <View x:Name="loadingView"
+                  BackgroundColor="Blue"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+                <Loading x:Name="loading"
+                         PositionUsesPivotPoint="True"
+                         ParentOrigin="Center"
+                         PivotPoint="Center"
+                         Size2D="50,50"/>
+
+            </View>
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/BackgroundColorTest1/BackgroundColorTest1Page.xaml.cs b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest1Page.xaml.cs
similarity index 97%
rename from test/NUITizenGallery/Examples/BackgroundColorTest1/BackgroundColorTest1Page.xaml.cs
rename to test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest1Page.xaml.cs
index 836c43c..6b15cbf 100644
--- a/test/NUITizenGallery/Examples/BackgroundColorTest1/BackgroundColorTest1Page.xaml.cs
+++ b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest1Page.xaml.cs
@@ -21,7 +21,7 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class BackgroundColorTest1Page : View
+    public partial class BackgroundColorTest1Page : ContentPage
     {
         public BackgroundColorTest1Page()
         {
diff --git a/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest2Page.xaml b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest2Page.xaml
new file mode 100644
index 0000000..8c51e51
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest2Page.xaml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.BackgroundColorTest2Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="BackgroundColorTest2Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          BackgroundColor="Yellow"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Begin" CellPadding="10,0"/>
+            </View.Layout>
+
+            <View x:Name="layout1"
+                   WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                   BackgroundColor="Red"
+                   Weight="1.0"
+                   Opacity="0.5">
+
+                <Button x:Name="button1"
+                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                        PointSize="6"
+                        Text="Change Layout 1 Background Color"
+                        TextColor="White"
+                        BackgroundColor="Black"/>
+
+            </View>
+
+            <View x:Name="layout2"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  BackgroundColor="Green"
+                  Weight="1.0"
+                  Opacity="0.5">
+
+                <Button x:Name="button2"
+                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                        PointSize="6"
+                        Text="Change Layout 2 Background Color &amp; Opacity"
+                        TextColor="White"
+                        BackgroundColor="#800000"/>
+
+            </View>
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/BackgroundColorTest2/BackgroundColorTest2Page.xaml.cs b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest2Page.xaml.cs
similarity index 97%
rename from test/NUITizenGallery/Examples/BackgroundColorTest2/BackgroundColorTest2Page.xaml.cs
rename to test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest2Page.xaml.cs
index c0d1779..291e1c1 100644
--- a/test/NUITizenGallery/Examples/BackgroundColorTest2/BackgroundColorTest2Page.xaml.cs
+++ b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest2Page.xaml.cs
@@ -21,7 +21,7 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class BackgroundColorTest2Page : View
+    public partial class BackgroundColorTest2Page : ContentPage
     {
         public BackgroundColorTest2Page()
         {
diff --git a/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest3Page.xaml b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest3Page.xaml
new file mode 100644
index 0000000..e3e11fd
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest3Page.xaml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.BackgroundColorTest3Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="BackgroundColorTest3Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+          ParentOrigin="Center"
+          PivotPoint="Center"
+          PositionUsesPivotPoint="true">
+
+            <Button x:Name="button1"
+                    BackgroundColor="Black"
+                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                    PointSize="6"
+                    Text="Change Page Background Color"
+                    TextColor="White"/>
+
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/BackgroundColorTest3/BackgroundColorTest3Page.xaml.cs b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest3Page.xaml.cs
similarity index 97%
rename from test/NUITizenGallery/Examples/BackgroundColorTest3/BackgroundColorTest3Page.xaml.cs
rename to test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest3Page.xaml.cs
index dc5084c..c6de8e7 100644
--- a/test/NUITizenGallery/Examples/BackgroundColorTest3/BackgroundColorTest3Page.xaml.cs
+++ b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest3Page.xaml.cs
@@ -21,7 +21,7 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class BackgroundColorTest3Page : View
+    public partial class BackgroundColorTest3Page : ContentPage
     {
         public BackgroundColorTest3Page()
         {
diff --git a/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest4Page.xaml b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest4Page.xaml
new file mode 100644
index 0000000..9fb5ac4
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest4Page.xaml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.BackgroundColorTest4Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="BackgroundColorTest4Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10"/>
+            </View.Layout>
+
+            <View
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+              BackgroundColor="Green"
+              Weight="0.1"/>
+
+            <View x:Name="mainView"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+              BackgroundColor="White"
+              Weight="0.9">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10"/>
+                </View.Layout>
+
+                <TextLabel x:Name="label"
+                           WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                           PointSize="6"
+                           Text="This is a sample label"
+                           VerticalAlignment="Center"/>
+
+                <Button x:Name="btnRedLabel"
+                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                        PointSize="6"
+                        Text="Set label background color to red"
+                        TextColor="White" />
+
+                <Button x:Name="btnDefaultLabel"
+                           WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                            PointSize="6"
+                            Text="Set label background color to default"
+                            TextColor="White"/>
+
+                <Button x:Name="button"
+                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                        PointSize="6"
+                        Text="This is a sample button"
+                        TextColor="White"/>
+
+                <Button x:Name="btnBlueButton"
+                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                        PointSize="6"
+                        Text="Set button background color to blue"
+                        TextColor="White"/>
+
+                <Button x:Name="btnDefaultButton"
+                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                        PointSize="6"
+                        Text="Set button background color to default"
+                        TextColor="White"/>
+
+            </View>
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/BackgroundColorTest4/BackgroundColorTest4Page.xaml.cs b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest4Page.xaml.cs
similarity index 98%
rename from test/NUITizenGallery/Examples/BackgroundColorTest4/BackgroundColorTest4Page.xaml.cs
rename to test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest4Page.xaml.cs
index 37165ab..9f3b4e1 100644
--- a/test/NUITizenGallery/Examples/BackgroundColorTest4/BackgroundColorTest4Page.xaml.cs
+++ b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest4Page.xaml.cs
@@ -21,7 +21,7 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class BackgroundColorTest4Page : View
+    public partial class BackgroundColorTest4Page : ContentPage
     {
         private Color btnDefaultBackgroundColor;
         public BackgroundColorTest4Page()
diff --git a/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest5Page.xaml b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest5Page.xaml
new file mode 100644
index 0000000..d60d492
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest5Page.xaml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.BackgroundColorTest5Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="BackgroundColorTest5Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center"/>
+            </View.Layout>
+
+            <View x:Name="mainView"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  BackgroundColor="#00ffff"
+                  Opacity="0.9"
+                  Weight="1.0">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10"/>
+                </View.Layout>
+
+                <Button x:Name="button1"
+                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                        PointSize="8"
+                        Text="Change BackgroundColor"/>
+
+                <TextLabel x:Name="label"
+                           WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                           PointSize="8"
+                           Text="This is label"/>
+
+                <TextField x:Name="textField"
+                           WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                           PointSize="8"
+                           Text="This is Entry"/>
+
+                <Progress x:Name="progress"
+                          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                          MinValue="0.0"
+                          MaxValue="1.0"
+                          CurrentValue="0.5"
+                          BufferColor="#FF66FF"
+                          Weight="1.0"/>
+
+                <Slider x:Name="slider"
+                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                        MinValue="0"
+                        MaxValue="1.0"
+                        BgTrackColor="#800080"
+                        Weight="1.0"/>
+
+            </View>
+
+            <View x:Name="loadingView"
+                  BackgroundColor="Yellow"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+                <Loading x:Name="loading"
+                         PositionUsesPivotPoint="True"
+                         ParentOrigin="Center"
+                         PivotPoint="Center"
+                         Size2D="50,50"/>
+
+            </View>
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/BackgroundColorTest5/BackgroundColorTest5Page.xaml.cs b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest5Page.xaml.cs
similarity index 97%
rename from test/NUITizenGallery/Examples/BackgroundColorTest5/BackgroundColorTest5Page.xaml.cs
rename to test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest5Page.xaml.cs
index 261ea82..3dfa171 100644
--- a/test/NUITizenGallery/Examples/BackgroundColorTest5/BackgroundColorTest5Page.xaml.cs
+++ b/test/NUITizenGallery/Examples/BackgroundColorTest/BackgroundColorTest5Page.xaml.cs
@@ -21,7 +21,7 @@ using System.Linq;
 
 namespace NUITizenGallery
 {
-    public partial class BackgroundColorTest5Page : View
+    public partial class BackgroundColorTest5Page : ContentPage
     {
         private int setColorCount = 1;
         public BackgroundColorTest5Page()
diff --git a/test/NUITizenGallery/Examples/BackgroundTest/BackgroundTest.cs b/test/NUITizenGallery/Examples/BackgroundTest/BackgroundTest.cs
index e28adef..0d6422a 100644
--- a/test/NUITizenGallery/Examples/BackgroundTest/BackgroundTest.cs
+++ b/test/NUITizenGallery/Examples/BackgroundTest/BackgroundTest.cs
@@ -24,21 +24,17 @@ namespace NUITizenGallery
     internal class BackgroundTest : IExample
     {
         Window window;
-        BackgroundTestPage page;
 
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
             window = NUIApplication.GetDefaultWindow();
-
-            page = new BackgroundTestPage();
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new BackgroundTestPage());
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/BackgroundTest/BackgroundTestPage.xaml b/test/NUITizenGallery/Examples/BackgroundTest/BackgroundTestPage.xaml
new file mode 100644
index 0000000..5ef13c7
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BackgroundTest/BackgroundTestPage.xaml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.BackgroundTestPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="BackgroundTestPage"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="BackgroundView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+          PositionUsesPivotPoint="True"
+          ParentOrigin="Center"
+          PivotPoint="Center">
+
+            <Button Text="Change Background" x:Name="ChangeBackgroundButton"
+                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/BackgroundTest/BackgroundTest.xaml.cs b/test/NUITizenGallery/Examples/BackgroundTest/BackgroundTestPage.xaml.cs
similarity index 93%
rename from test/NUITizenGallery/Examples/BackgroundTest/BackgroundTest.xaml.cs
rename to test/NUITizenGallery/Examples/BackgroundTest/BackgroundTestPage.xaml.cs
index 0a2efc7..8bb1ac3 100644
--- a/test/NUITizenGallery/Examples/BackgroundTest/BackgroundTest.xaml.cs
+++ b/test/NUITizenGallery/Examples/BackgroundTest/BackgroundTestPage.xaml.cs
@@ -19,12 +19,12 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class BackgroundTestPage : View
+    public partial class BackgroundTestPage : ContentPage
     {
         private readonly string ResourcePath = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "/images/";
-        private int CurrentImage = 0;   
+        private int CurrentImage = 0;
         private string[] BackgroundsArray = { "bg_0.png", "bg_1.png" };
-        
+
         public BackgroundTestPage()
         {
             InitializeComponent();
diff --git a/test/NUITizenGallery/Examples/BindingTest1/Behaviors/VisibilitySetter.cs b/test/NUITizenGallery/Examples/BindingTest/Behaviors/VisibilitySetter.cs
similarity index 100%
rename from test/NUITizenGallery/Examples/BindingTest1/Behaviors/VisibilitySetter.cs
rename to test/NUITizenGallery/Examples/BindingTest/Behaviors/VisibilitySetter.cs
diff --git a/test/NUITizenGallery/Examples/BindingTest/BindingTest1.cs b/test/NUITizenGallery/Examples/BindingTest/BindingTest1.cs
new file mode 100644
index 0000000..3d51dde
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BindingTest/BindingTest1.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class BindingTest1 : IExample
+    {
+        Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new BindingTest1Page());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/BindingTest/BindingTest1Page.xaml b/test/NUITizenGallery/Examples/BindingTest/BindingTest1Page.xaml
new file mode 100644
index 0000000..58aadac
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BindingTest/BindingTest1Page.xaml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.BindingTest1Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:vm="clr-namespace:NUITizenGallery.ViewModels"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  xmlns:behaviors="clr-namespace:NUITizenGallery.Behaviors"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="BindingTest1Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <!-- Bind SourceData to BindingContext of this View. -->
+            <View.BindingContext>
+                <vm:BindingTest1ViewModel x:Name="context"/>
+            </View.BindingContext>
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" CellPadding="10,10"/>
+            </View.Layout>
+
+            <View BindingContext="{Binding Source={x:Reference context}}"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  HeightSpecification="150"
+                  BackgroundColor="Red"
+                  behaviors:VisibilitySetter.IsVisible="{Binding IsBoxVisible}"/>
+
+            <View BindingContext="{Binding Source={x:Reference context}}"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  HeightSpecification="150"
+                  BackgroundColor="Blue"
+                  behaviors:VisibilitySetter.IsVisible="{Binding IsBoxVisible}"/>
+
+            <Button BindingContext="{Binding Source={x:Reference context}}"
+                    Command="{Binding ChangeVisibility}"
+                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                    Text="Visibility"/>
+
+        </View>
+    </ContentPage.Content>e
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/BindingTest1/BindingTest1Page.xaml.cs b/test/NUITizenGallery/Examples/BindingTest/BindingTest1Page.xaml.cs
similarity index 95%
rename from test/NUITizenGallery/Examples/BindingTest1/BindingTest1Page.xaml.cs
rename to test/NUITizenGallery/Examples/BindingTest/BindingTest1Page.xaml.cs
index 0746248..f720730 100644
--- a/test/NUITizenGallery/Examples/BindingTest1/BindingTest1Page.xaml.cs
+++ b/test/NUITizenGallery/Examples/BindingTest/BindingTest1Page.xaml.cs
@@ -16,10 +16,11 @@
  */
 using Tizen.NUI;
 using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class BindingTest1Page : View
+    public partial class BindingTest1Page : ContentPage
     {
         public BindingTest1Page()
         {
diff --git a/test/NUITizenGallery/Examples/BindingTest2/BindingTest2.cs b/test/NUITizenGallery/Examples/BindingTest/BindingTest2.cs
similarity index 86%
rename from test/NUITizenGallery/Examples/BindingTest2/BindingTest2.cs
rename to test/NUITizenGallery/Examples/BindingTest/BindingTest2.cs
index aecd410..2e76147 100644
--- a/test/NUITizenGallery/Examples/BindingTest2/BindingTest2.cs
+++ b/test/NUITizenGallery/Examples/BindingTest/BindingTest2.cs
@@ -16,27 +16,25 @@
  */
 using System;
 using Tizen.NUI;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
     internal class BindingTest2 : IExample
     {
         Window window;
-        private BindingTest2Page page;
+
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
 
             window = NUIApplication.GetDefaultWindow();
-            page = new BindingTest2Page();
-
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new BindingTest2Page());
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/BindingTest/BindingTest2Page.xaml b/test/NUITizenGallery/Examples/BindingTest/BindingTest2Page.xaml
new file mode 100644
index 0000000..3fab027
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BindingTest/BindingTest2Page.xaml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.BindingTest2Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:vm="clr-namespace:NUITizenGallery.ViewModels"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="AnimationTest1Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <!-- Bind SourceData to BindingContext of this View. -->
+            <View.BindingContext>
+                <vm:BindingTest2ViewModel x:Name="context"/>
+            </View.BindingContext>
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" CellPadding="10,10" LinearAlignment="CenterHorizontal"/>
+            </View.Layout>
+
+            <TextLabel BindingContext="{Binding Source={x:Reference context}"
+                       WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                       HorizontalAlignment="Center"
+                       MultiLine="True"
+                       Text="{Binding BoxSizeText}"/>
+
+            <Slider BindingContext="{Binding Source={x:Reference context}}"
+                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                    MinValue="0"
+                    MaxValue="300"
+                    CurrentValue="{Binding BoxSize}"/>
+
+            <View BindingContext="{Binding Source={x:Reference context}}"
+                  BackgroundColor="Red"
+                  SizeWidth="{Binding BoxSize}"
+                  SizeHeight="{Binding BoxSize}"/>
+
+            <View BindingContext="{Binding Source={x:Reference context}}"
+                  BackgroundColor="Blue"
+                  SizeWidth="{Binding BoxSize}"
+                  SizeHeight="{Binding BoxSize}"/>
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/BindingTest2/BindingTest2Page.xaml.cs b/test/NUITizenGallery/Examples/BindingTest/BindingTest2Page.xaml.cs
similarity index 95%
rename from test/NUITizenGallery/Examples/BindingTest2/BindingTest2Page.xaml.cs
rename to test/NUITizenGallery/Examples/BindingTest/BindingTest2Page.xaml.cs
index cac9c06..ac863b1 100644
--- a/test/NUITizenGallery/Examples/BindingTest2/BindingTest2Page.xaml.cs
+++ b/test/NUITizenGallery/Examples/BindingTest/BindingTest2Page.xaml.cs
@@ -16,10 +16,11 @@
  */
 using Tizen.NUI;
 using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class BindingTest2Page : View
+    public partial class BindingTest2Page : ContentPage
     {
         public BindingTest2Page()
         {
diff --git a/test/NUITizenGallery/Examples/BindingTest1/ViewModels/BindingTest1ViewModel.cs b/test/NUITizenGallery/Examples/BindingTest/ViewModels/BindingTest1ViewModel.cs
similarity index 95%
rename from test/NUITizenGallery/Examples/BindingTest1/ViewModels/BindingTest1ViewModel.cs
rename to test/NUITizenGallery/Examples/BindingTest/ViewModels/BindingTest1ViewModel.cs
index 1253a8a..7db3e35 100644
--- a/test/NUITizenGallery/Examples/BindingTest1/ViewModels/BindingTest1ViewModel.cs
+++ b/test/NUITizenGallery/Examples/BindingTest/ViewModels/BindingTest1ViewModel.cs
@@ -34,9 +34,9 @@ namespace NUITizenGallery.ViewModels
             ChangeVisibility = new Command(() => { IsBoxVisible = !IsBoxVisible; });
         }
 
-        public bool IsBoxVisible 
-        { 
-            get => isBoxVisible; 
+        public bool IsBoxVisible
+        {
+            get => isBoxVisible;
             set
             {
                 if (isBoxVisible != value)
@@ -50,7 +50,7 @@ namespace NUITizenGallery.ViewModels
         private void ExecuteChangeVisibility()
         {
             Tizen.Log.Debug("TEST", $"{IsBoxVisible}");
- 
+
         }
 
 
diff --git a/test/NUITizenGallery/Examples/BindingTest2/ViewModels/BindingTest2ViewModel.cs b/test/NUITizenGallery/Examples/BindingTest/ViewModels/BindingTest2ViewModel.cs
similarity index 92%
rename from test/NUITizenGallery/Examples/BindingTest2/ViewModels/BindingTest2ViewModel.cs
rename to test/NUITizenGallery/Examples/BindingTest/ViewModels/BindingTest2ViewModel.cs
index aba4f6b..46409cb 100644
--- a/test/NUITizenGallery/Examples/BindingTest2/ViewModels/BindingTest2ViewModel.cs
+++ b/test/NUITizenGallery/Examples/BindingTest/ViewModels/BindingTest2ViewModel.cs
@@ -31,8 +31,8 @@ namespace NUITizenGallery.ViewModels
             BoxSize = 100;
         }
 
-        public int BoxSize 
-        { 
+        public int BoxSize
+        {
             get => boxSize;
             set
             {
@@ -42,12 +42,12 @@ namespace NUITizenGallery.ViewModels
                     BoxSizeText = $"Width: {(float)boxSize:F3}\nHeight: {(float)boxSize:F3}";
                     RaisePropertyChanged();
                 }
-            } 
+            }
         }
 
-        public string BoxSizeText 
-        { 
-            get => boxSizeText; 
+        public string BoxSizeText
+        {
+            get => boxSizeText;
             set
             {
                 boxSizeText = value;
diff --git a/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest1.cs b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest1.cs
new file mode 100644
index 0000000..fbe4c9d
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest1.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class BoxViewTest1 : IExample
+    {
+        private Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new BoxViewTest1Page());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest1Page.xaml b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest1Page.xaml
new file mode 100644
index 0000000..d10b942
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest1Page.xaml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.BoxViewTest1Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="BoxViewTest1Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
+            </View.Layout>
+
+            <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  SizeHeight="80"
+                  BackgroundColor="1,0,0,1"
+                  />
+
+            <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  SizeHeight="80"
+                  BackgroundColor="0,1,0,1"
+                  />
+
+            <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  SizeHeight="80"
+                  BackgroundColor="0,0,1,1"
+                  />
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/BoxViewTest2/BoxViewTest2.xaml.cs b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest1Page.xaml.cs
similarity index 94%
rename from test/NUITizenGallery/Examples/BoxViewTest2/BoxViewTest2.xaml.cs
rename to test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest1Page.xaml.cs
index 763f3fb..62defee 100644
--- a/test/NUITizenGallery/Examples/BoxViewTest2/BoxViewTest2.xaml.cs
+++ b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest1Page.xaml.cs
@@ -16,12 +16,13 @@
  */
 using Tizen.NUI;
 using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class BoxViewTest2 : View
+    public partial class BoxViewTest1Page : ContentPage
     {
-        public BoxViewTest2()
+        public BoxViewTest1Page()
         {
             InitializeComponent();
         }
diff --git a/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest2.cs b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest2.cs
new file mode 100644
index 0000000..d11e482
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest2.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class BoxViewTest2 : IExample
+    {
+        private Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new BoxViewTest2Page());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest2Page.xaml b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest2Page.xaml
new file mode 100644
index 0000000..4fa10b5
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest2Page.xaml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.BoxViewTest2Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="BoxViewTest2Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top"/>
+            </View.Layout>
+
+            <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10"/>
+                </View.Layout>
+
+                <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      SizeHeight="80"
+                      BackgroundColor="1,0,0,1"/>
+
+                <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      SizeHeight="80"
+                      BackgroundColor="0,1,0,1"/>
+
+                <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      SizeHeight="80"
+                      BackgroundColor="0,0,1,1"/>
+
+            </View>
+
+            <View Weight="1.0">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Bottom" CellPadding="10,10" />
+                </View.Layout>
+
+                <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      SizeHeight="800"
+                      SizeWidth="80"
+                      BackgroundColor="1,0,0,1"/>
+
+                <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      SizeHeight="800"
+                      SizeWidth="80"
+                      BackgroundColor="0,1,0,1"/>
+
+                <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      SizeHeight="800"
+                      SizeWidth="80"
+                      BackgroundColor="0,0,1,1"/>
+
+            </View>
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest2Page.xaml.cs b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest2Page.xaml.cs
new file mode 100644
index 0000000..3a88f6e
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest2Page.xaml.cs
@@ -0,0 +1,75 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    public partial class BoxViewTest2Page : ContentPage
+    {
+        public BoxViewTest2Page()
+        {
+            InitializeComponent();
+        }
+
+        protected override void Dispose(DisposeTypes type)
+        {
+            if (Disposed)
+            {
+                return;
+            }
+
+            if (type == DisposeTypes.Explicit)
+            {
+                RemoveAllChildren(true);
+            }
+
+            base.Dispose(type);
+        }
+
+        private void RemoveAllChildren(bool dispose = false)
+        {
+            RecursiveRemoveChildren(this, dispose);
+        }
+
+        private void RecursiveRemoveChildren(View parent, bool dispose)
+        {
+            if (parent == null)
+            {
+                return;
+            }
+
+            int maxChild = (int)parent.ChildCount;
+            for (int i = maxChild - 1; i >= 0; --i)
+            {
+                View child = parent.GetChildAt((uint)i);
+                if (child == null)
+                {
+                    continue;
+                }
+
+                RecursiveRemoveChildren(child, dispose);
+                parent.Remove(child);
+                if (dispose)
+                {
+                    child.Dispose();
+                }
+            }
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest3.cs b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest3.cs
new file mode 100644
index 0000000..2b0a74f
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest3.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class BoxViewTest3 : IExample
+    {
+        private Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new BoxViewTest3Page());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest3Page.xaml b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest3Page.xaml
new file mode 100644
index 0000000..17b21c1
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest3Page.xaml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.BoxViewTest3Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="BoxViewTest3Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10"/>
+            </View.Layout>
+
+            <TextLabel Text="Normal colors"/>
+
+            <View x:Name="colorBox"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  SizeHeight="80"/>
+
+            <TextLabel Text="Pre-multiplied alpha colors" />
+
+            <View x:Name="preColorBox"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  SizeHeight="80"/>
+
+            <TextLabel Text="R"/>
+
+            <nui:Slider x:Name="red"
+                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                        CurrentValue="176.0"
+                        MinValue="0.0"
+                        MaxValue="255.0"/>
+
+            <TextLabel Text="G"/>
+
+            <nui:Slider x:Name="green"
+                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                        CurrentValue="255.0"
+                        MinValue="0.0"
+                        MaxValue="255.0"/>
+
+            <TextLabel Text="B"/>
+
+            <nui:Slider x:Name="blue"
+                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                        CurrentValue="35.0"
+                        MinValue="0.0"
+                        MaxValue="255.0"/>
+
+            <TextLabel Text="A"/>
+
+            <nui:Slider x:Name="alpha"
+                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                        CurrentValue="255.0"
+                        MinValue="0.0"
+                        MaxValue="255.0"/>
+
+            <TextLabel x:Name="output"/>
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/BoxViewTest3/BoxViewTest3.xaml.cs b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest3Page.xaml.cs
similarity index 97%
rename from test/NUITizenGallery/Examples/BoxViewTest3/BoxViewTest3.xaml.cs
rename to test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest3Page.xaml.cs
index b968840..9a0ab8d 100644
--- a/test/NUITizenGallery/Examples/BoxViewTest3/BoxViewTest3.xaml.cs
+++ b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest3Page.xaml.cs
@@ -21,9 +21,9 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class BoxViewTest3 : View
+    public partial class BoxViewTest3Page : ContentPage
     {
-        public BoxViewTest3()
+        public BoxViewTest3Page()
         {
             InitializeComponent();
             Subscribe();
diff --git a/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest4.cs b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest4.cs
new file mode 100644
index 0000000..4282ca0
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest4.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class BoxViewTest4 : IExample
+    {
+        private Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new BoxViewTest4Page());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest4Page.xaml b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest4Page.xaml
new file mode 100644
index 0000000..ee2ac20
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest4Page.xaml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.BoxViewTest4Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="BoxViewTest4Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterVertical" CellPadding="10,10" />
+            </View.Layout>
+
+            <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+                <View.Layout>
+                    <LinearLayout LinearAlignment="Center"/>
+                </View.Layout>
+
+                <View x:Name="box"
+                  BackgroundColor="1,0,0,1"
+                  Size2D="200,200"/>
+
+            </View>
+
+            <TextLabel x:Name="label"
+                       Text="+++ Scale : "/>
+
+            <Button x:Name="button1"
+                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                        Text="Box Scale++"/>
+
+            <Button x:Name="button2"
+                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                        Text="Box Scale--"/>
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/BoxViewTest4/BoxViewTest4.xaml.cs b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest4Page.xaml.cs
similarity index 96%
rename from test/NUITizenGallery/Examples/BoxViewTest4/BoxViewTest4.xaml.cs
rename to test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest4Page.xaml.cs
index 834bf06..f591446 100644
--- a/test/NUITizenGallery/Examples/BoxViewTest4/BoxViewTest4.xaml.cs
+++ b/test/NUITizenGallery/Examples/BoxViewTest/BoxViewTest4Page.xaml.cs
@@ -20,9 +20,9 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class BoxViewTest4 : View
+    public partial class BoxViewTest4Page : ContentPage
     {
-        public BoxViewTest4()
+        public BoxViewTest4Page()
         {
             InitializeComponent();
             Subscribe();
diff --git a/test/NUITizenGallery/Examples/BoxViewTest1/BoViewTest1Example.cs b/test/NUITizenGallery/Examples/BoxViewTest1/BoViewTest1Example.cs
deleted file mode 100644
index e196ffc..0000000
--- a/test/NUITizenGallery/Examples/BoxViewTest1/BoViewTest1Example.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using Tizen.NUI;
-
-namespace NUITizenGallery
-{
-    internal class BoxViewTest1Example : IExample
-    {
-        private Window window;
-        private BoxViewTest1 page;
-
-        public void Activate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
-            window = NUIApplication.GetDefaultWindow();
-            page = new BoxViewTest1();
-
-            window.Add(page);
-        }
-        public void Deactivate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/BoxViewTest2/BoViewTest2Example.cs b/test/NUITizenGallery/Examples/BoxViewTest2/BoViewTest2Example.cs
deleted file mode 100644
index a6698d3..0000000
--- a/test/NUITizenGallery/Examples/BoxViewTest2/BoViewTest2Example.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using Tizen.NUI;
-
-namespace NUITizenGallery
-{
-    internal class BoxViewTest2Example : IExample
-    {
-        private Window window;
-        private BoxViewTest2 page;
-
-        public void Activate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
-            window = NUIApplication.GetDefaultWindow();
-            page = new BoxViewTest2();
-
-            window.Add(page);
-        }
-        public void Deactivate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/BoxViewTest3/BoViewTest3Example.cs b/test/NUITizenGallery/Examples/BoxViewTest3/BoViewTest3Example.cs
deleted file mode 100644
index 5dcbfcf..0000000
--- a/test/NUITizenGallery/Examples/BoxViewTest3/BoViewTest3Example.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using Tizen.NUI;
-
-namespace NUITizenGallery
-{
-    internal class BoxViewTest3Example : IExample
-    {
-        private Window window;
-        private BoxViewTest3 page;
-
-        public void Activate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
-            window = NUIApplication.GetDefaultWindow();
-            page = new BoxViewTest3();
-
-            window.Add(page);
-        }
-        public void Deactivate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/BoxViewTest4/BoViewTest4.cs b/test/NUITizenGallery/Examples/BoxViewTest4/BoViewTest4.cs
deleted file mode 100644
index 2fa7062..0000000
--- a/test/NUITizenGallery/Examples/BoxViewTest4/BoViewTest4.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using Tizen.NUI;
-
-namespace NUITizenGallery
-{
-    internal class BoxViewTest4Example : IExample
-    {
-        private Window window;
-        private BoxViewTest4 page;
-
-        public void Activate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
-            window = NUIApplication.GetDefaultWindow();
-            page = new BoxViewTest4();
-
-            window.Add(page);
-        }
-        public void Deactivate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/BrushBackgroundTest/BrushBackgroundTest.cs b/test/NUITizenGallery/Examples/BrushTest/BrushBackgroundTest.cs
similarity index 86%
rename from test/NUITizenGallery/Examples/BrushBackgroundTest/BrushBackgroundTest.cs
rename to test/NUITizenGallery/Examples/BrushTest/BrushBackgroundTest.cs
index 37da55f..251bef3 100644
--- a/test/NUITizenGallery/Examples/BrushBackgroundTest/BrushBackgroundTest.cs
+++ b/test/NUITizenGallery/Examples/BrushTest/BrushBackgroundTest.cs
@@ -16,27 +16,25 @@
  */
 using System;
 using Tizen.NUI;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
     internal class BrushBackgroundTest : IExample
     {
         Window window;
-        BrushBackgroundTestPage page;
+
 
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
             window = NUIApplication.GetDefaultWindow();
-
-            page = new BrushBackgroundTestPage();
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new BrushBackgroundTestPage());
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/BrushTest/BrushBackgroundTestPage.xaml b/test/NUITizenGallery/Examples/BrushTest/BrushBackgroundTestPage.xaml
new file mode 100644
index 0000000..743deb0
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BrushTest/BrushBackgroundTestPage.xaml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.BrushBackgroundTestPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="BrushBackgroundTestPage"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+            <View.Layout>
+              <LinearLayout LinearOrientation="Vertical" CellPadding="10,10"/>
+            </View.Layout>
+
+            <Button x:Name="ButtonSolid" Text="Set solid color" WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+            <Button x:Name="ButtonGradientLinear" Text="Set linear gradient" WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+            <Button x:Name="ButtonGradientRadial" Text="Set radial gradient" WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+       </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/BrushBackgroundTest/BrushBackgroundTest.xaml.cs b/test/NUITizenGallery/Examples/BrushTest/BrushBackgroundTestPage.xaml.cs
similarity index 90%
rename from test/NUITizenGallery/Examples/BrushBackgroundTest/BrushBackgroundTest.xaml.cs
rename to test/NUITizenGallery/Examples/BrushTest/BrushBackgroundTestPage.xaml.cs
index 183e749..57de506 100644
--- a/test/NUITizenGallery/Examples/BrushBackgroundTest/BrushBackgroundTest.xaml.cs
+++ b/test/NUITizenGallery/Examples/BrushTest/BrushBackgroundTestPage.xaml.cs
@@ -20,7 +20,7 @@ using Tizen.NUI;
 
 namespace NUITizenGallery
 {
-    public partial class BrushBackgroundTestPage : View
+    public partial class BrushBackgroundTestPage : ContentPage
     {
         public BrushBackgroundTestPage()
         {
@@ -33,7 +33,7 @@ namespace NUITizenGallery
 
         public void OnClickedSolid(object sender, ClickedEventArgs args)
         {
-            BackgroundColor = Color.Red;
+            ContentView.BackgroundColor = Color.Red;
         }
 
         public void OnClickedLinear(object sender, ClickedEventArgs args)
@@ -48,7 +48,7 @@ namespace NUITizenGallery
             linearGradient.EndPosition = new Vector2(0.3f, 0.3f);
             linearGradient.Origin = Visual.AlignType.TopBegin;
 
-            Background = linearGradient.OutputVisualMap;
+            ContentView.Background = linearGradient.OutputVisualMap;
         }
 
         public void OnClickedRadial(object sender, ClickedEventArgs args)
@@ -63,7 +63,7 @@ namespace NUITizenGallery
             radialGradient.StopColor = stopColor;
             radialGradient.Origin = Visual.AlignType.TopBegin;
 
-            Background = radialGradient.OutputVisualMap;
+            ContentView.Background = radialGradient.OutputVisualMap;
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/BrushBorderTest/BrushBorderTest.cs b/test/NUITizenGallery/Examples/BrushTest/BrushBorderTest.cs
similarity index 87%
rename from test/NUITizenGallery/Examples/BrushBorderTest/BrushBorderTest.cs
rename to test/NUITizenGallery/Examples/BrushTest/BrushBorderTest.cs
index 34f8cb9..d7f2ad4 100644
--- a/test/NUITizenGallery/Examples/BrushBorderTest/BrushBorderTest.cs
+++ b/test/NUITizenGallery/Examples/BrushTest/BrushBorderTest.cs
@@ -24,21 +24,17 @@ namespace NUITizenGallery
     internal class BrushBorderTest : IExample
     {
         Window window;
-        BrushBorderTestPage page;
 
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
             window = NUIApplication.GetDefaultWindow();
-
-            page = new BrushBorderTestPage();
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new BrushBorderTestPage());
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/BrushTest/BrushBorderTestPage.xaml b/test/NUITizenGallery/Examples/BrushTest/BrushBorderTestPage.xaml
new file mode 100644
index 0000000..4c72d0e
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BrushTest/BrushBorderTestPage.xaml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.BrushBorderTestPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="BrushBorderTestPage"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+            <View.Layout>
+              <LinearLayout LinearOrientation="Vertical" CellPadding="0,10" LinearAlignment="Center"/>
+            </View.Layout>
+
+            <Button x:Name="ButtonSolid" Text="Set solid color" WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+            <Button x:Name="ButtonGradientLinear" Text="Set linear gradient" WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+            <Button x:Name="ButtonGradientRadial" Text="Set radial gradient" WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+
+            <VisualView x:Name="ViewTest1" Size2D="500,120" BackgroundColor="#0000FF"/>
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/BrushBorderTest/BrushBorderTest.xaml.cs b/test/NUITizenGallery/Examples/BrushTest/BrushBorderTestPage.xaml.cs
similarity index 97%
rename from test/NUITizenGallery/Examples/BrushBorderTest/BrushBorderTest.xaml.cs
rename to test/NUITizenGallery/Examples/BrushTest/BrushBorderTestPage.xaml.cs
index 17b2513..1f26752 100644
--- a/test/NUITizenGallery/Examples/BrushBorderTest/BrushBorderTest.xaml.cs
+++ b/test/NUITizenGallery/Examples/BrushTest/BrushBorderTestPage.xaml.cs
@@ -20,7 +20,7 @@ using Tizen.NUI;
 
 namespace NUITizenGallery
 {
-    public partial class BrushBorderTestPage : View
+    public partial class BrushBorderTestPage : ContentPage
     {
         private VisualView FrameView;
         private TextVisual FrameText;
@@ -33,7 +33,7 @@ namespace NUITizenGallery
         private readonly string LinearGradientId = "_linearGradientVisual";
         private readonly string RadialGradientId = "_radialGradientVisual";
 
-        
+
         public BrushBorderTestPage()
         {
             InitializeComponent();
@@ -79,10 +79,10 @@ namespace NUITizenGallery
             FrameView.AddVisual(BorderId, FrameBorder);
             FrameView.AddVisual(TextId, FrameText);
 
-            this.Add(FrameView);
+            ContentView.Add(FrameView);
         }
 
-        public void OnClickedSolid(object sender, ClickedEventArgs args) 
+        public void OnClickedSolid(object sender, ClickedEventArgs args)
         {
             ViewTest1.BackgroundColor = Color.Red;
 
@@ -92,7 +92,7 @@ namespace NUITizenGallery
             FrameView.AddVisual(TextId, FrameText);
         }
 
-        public void OnClickedLinear(object sender, ClickedEventArgs args) 
+        public void OnClickedLinear(object sender, ClickedEventArgs args)
         {
             ViewTest1.Background = LinearGradient.OutputVisualMap;
             FrameView.RemoveAll();
@@ -102,7 +102,7 @@ namespace NUITizenGallery
             FrameView.AddVisual(TextId, FrameText);
         }
 
-        public void OnClickedRadial(object sender, ClickedEventArgs args) 
+        public void OnClickedRadial(object sender, ClickedEventArgs args)
         {
             ViewTest1.Background = RadialGradient.OutputVisualMap;
             FrameView.RemoveAll();
diff --git a/test/NUITizenGallery/Examples/BrushComponentsTest/BrushComponentsTest.cs b/test/NUITizenGallery/Examples/BrushTest/BrushComponentsTest.cs
similarity index 86%
rename from test/NUITizenGallery/Examples/BrushComponentsTest/BrushComponentsTest.cs
rename to test/NUITizenGallery/Examples/BrushTest/BrushComponentsTest.cs
index 783f549..0c99806 100644
--- a/test/NUITizenGallery/Examples/BrushComponentsTest/BrushComponentsTest.cs
+++ b/test/NUITizenGallery/Examples/BrushTest/BrushComponentsTest.cs
@@ -24,21 +24,17 @@ namespace NUITizenGallery
     internal class BrushComponentsTest : IExample
     {
         Window window;
-        BrushComponentsTestPage page;
 
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
             window = NUIApplication.GetDefaultWindow();
-
-            page = new BrushComponentsTestPage();
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new BrushComponentsTestPage());
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/BrushTest/BrushComponentsTestPage.xaml b/test/NUITizenGallery/Examples/BrushTest/BrushComponentsTestPage.xaml
new file mode 100644
index 0000000..aa8260e
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BrushTest/BrushComponentsTestPage.xaml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.BrushComponentsTestPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="BrushComponentsTestPage"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" CellPadding="10,10" Padding="10,10,10,10"/>
+            </View.Layout>
+
+            <Button x:Name="ButtonSolid" Text="Set solid color" WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+            <Button x:Name="ButtonGradientLinear" Text="Set linear gradient"  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+            <Button x:Name="ButtonGradientRadial" Text="Set radial gradient"  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+
+            <View x:Name="ViewTest1" Size2D="500,120"  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+            <View x:Name="ViewTest2" Size2D="500,120"  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+            <View x:Name="ViewTest3" Size2D="500,120"  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/BrushComponentsTest/BrushComponentsTest.xaml.cs b/test/NUITizenGallery/Examples/BrushTest/BrushComponentsTestPage.xaml.cs
similarity index 88%
rename from test/NUITizenGallery/Examples/BrushComponentsTest/BrushComponentsTest.xaml.cs
rename to test/NUITizenGallery/Examples/BrushTest/BrushComponentsTestPage.xaml.cs
index ded8816..778644e 100644
--- a/test/NUITizenGallery/Examples/BrushComponentsTest/BrushComponentsTest.xaml.cs
+++ b/test/NUITizenGallery/Examples/BrushTest/BrushComponentsTestPage.xaml.cs
@@ -20,31 +20,25 @@ using Tizen.NUI;
 
 namespace NUITizenGallery
 {
-    public partial class BrushComponentsTestPage : View
+    public partial class BrushComponentsTestPage : ContentPage
     {
         public BrushComponentsTestPage()
         {
             InitializeComponent();
 
-            LinearLayout pageLayout = new LinearLayout();
-            pageLayout.LinearOrientation = LinearLayout.Orientation.Vertical;
-            pageLayout.CellPadding = new Size2D(10, 10);
-            pageLayout.Padding = new Extents(10, 10, 10, 10);
-            this.Layout = pageLayout;
-
             ButtonSolid.Clicked += OnClickedSolid;
             ButtonGradientLinear.Clicked += OnClickedLinear;
             ButtonGradientRadial.Clicked += OnClickedRadial;
         }
 
-        public void OnClickedSolid(object sender, ClickedEventArgs args) 
+        public void OnClickedSolid(object sender, ClickedEventArgs args)
         {
             ViewTest1.BackgroundColor = Color.Red;
             ViewTest2.BackgroundColor = Color.Red;
             ViewTest3.BackgroundColor = Color.Red;
         }
 
-        public void OnClickedLinear(object sender, ClickedEventArgs args) 
+        public void OnClickedLinear(object sender, ClickedEventArgs args)
         {
             PropertyArray stopColor = new PropertyArray();
             stopColor.Add(new PropertyValue(new Vector4(255.0f, 0.0f, 0.0f, 255.0f) / 255.0f));
@@ -61,7 +55,7 @@ namespace NUITizenGallery
             ViewTest3.Background = linearGradient.OutputVisualMap;
         }
 
-        public void OnClickedRadial(object sender, ClickedEventArgs args) 
+        public void OnClickedRadial(object sender, ClickedEventArgs args)
         {
             PropertyArray stopColor = new PropertyArray();
             stopColor.Add(new PropertyValue(new Vector4(255.0f, 0.0f, 0.0f, 255.0f) / 255.0f));
diff --git a/test/NUITizenGallery/Examples/BrushImageTest/BrushImageTest.cs b/test/NUITizenGallery/Examples/BrushTest/BrushImageTest.cs
similarity index 88%
rename from test/NUITizenGallery/Examples/BrushImageTest/BrushImageTest.cs
rename to test/NUITizenGallery/Examples/BrushTest/BrushImageTest.cs
index 4dcbe18..4c051b2 100644
--- a/test/NUITizenGallery/Examples/BrushImageTest/BrushImageTest.cs
+++ b/test/NUITizenGallery/Examples/BrushTest/BrushImageTest.cs
@@ -24,21 +24,17 @@ namespace NUITizenGallery
     internal class BrushImageTest : IExample
     {
         Window window;
-        BrushImageTestPage page;
 
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
             window = NUIApplication.GetDefaultWindow();
-
-            page = new BrushImageTestPage();
-            window.GetDefaultNavigator().Push(page);
+            window.GetDefaultNavigator().Push(new BrushImageTestPage());
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
             window.GetDefaultNavigator().Pop();
-            page = null;
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/BrushTest/BrushImageTestPage.xaml b/test/NUITizenGallery/Examples/BrushTest/BrushImageTestPage.xaml
new file mode 100644
index 0000000..1dbedbf
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BrushTest/BrushImageTestPage.xaml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.BrushImageTestPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+  <ContentPage.AppBar>
+    <AppBar x:Name="appBar" Title="BrushImageTest" />
+  </ContentPage.AppBar>
+
+  <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
+            </View.Layout>
+
+            <Button x:Name="ButtonSolid" Text="Set solid color"  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+            <Button x:Name="ButtonGradientLinear" Text="Set linear gradient"  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+            <Button x:Name="ButtonGradientRadial" Text="Set radial gradient"  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+
+            <ImageView x:Name="Image1" WidthSpecification="{Static LayoutParamPolicies.WrapContent}" HeightSpecification="{Static LayoutParamPolicies.WrapContent}"/>
+            <ImageView x:Name="Image2" WidthSpecification="{Static LayoutParamPolicies.WrapContent}" HeightSpecification="{Static LayoutParamPolicies.WrapContent}"/>
+        </View>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/BrushImageTest/BrushImageTest.xaml.cs b/test/NUITizenGallery/Examples/BrushTest/BrushImageTestPage.xaml.cs
similarity index 100%
rename from test/NUITizenGallery/Examples/BrushImageTest/BrushImageTest.xaml.cs
rename to test/NUITizenGallery/Examples/BrushTest/BrushImageTestPage.xaml.cs
diff --git a/test/NUITizenGallery/Examples/BrushViewerTest/BrushViewerTest.cs b/test/NUITizenGallery/Examples/BrushTest/BrushViewerTest.cs
similarity index 87%
rename from test/NUITizenGallery/Examples/BrushViewerTest/BrushViewerTest.cs
rename to test/NUITizenGallery/Examples/BrushTest/BrushViewerTest.cs
index 2d57d3a..7b850a9 100644
--- a/test/NUITizenGallery/Examples/BrushViewerTest/BrushViewerTest.cs
+++ b/test/NUITizenGallery/Examples/BrushTest/BrushViewerTest.cs
@@ -24,21 +24,17 @@ namespace NUITizenGallery
     internal class BrushViewerTest : IExample
     {
         Window window;
-        BrushViewerTestPage page;
 
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
             window = NUIApplication.GetDefaultWindow();
-
-            page = new BrushViewerTestPage();
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new BrushViewerTestPage());
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/BrushTest/BrushViewerTestPage.xaml b/test/NUITizenGallery/Examples/BrushTest/BrushViewerTestPage.xaml
new file mode 100644
index 0000000..6e6725d
--- /dev/null
+++ b/test/NUITizenGallery/Examples/BrushTest/BrushViewerTestPage.xaml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.BrushViewerTestPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="BrushViewerTestPage"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" CellPadding="10,10" Padding="10,10,10,10"/>
+            </View.Layout>
+
+            <Button x:Name="ButtonSolid" Text="Set solid color" WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+            <Button x:Name="ButtonGradientLinear" Text="Set linear gradient" WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+            <Button x:Name="ButtonGradientRadial" Text="Set radial gradient" WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+            <VisualView x:Name="BrushViewer"
+                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                        HeightSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/BrushViewerTest/BrushViewerTest.xaml.cs b/test/NUITizenGallery/Examples/BrushTest/BrushViewerTestPage.xaml.cs
similarity index 89%
rename from test/NUITizenGallery/Examples/BrushViewerTest/BrushViewerTest.xaml.cs
rename to test/NUITizenGallery/Examples/BrushTest/BrushViewerTestPage.xaml.cs
index b132c11..4f27682 100644
--- a/test/NUITizenGallery/Examples/BrushViewerTest/BrushViewerTest.xaml.cs
+++ b/test/NUITizenGallery/Examples/BrushTest/BrushViewerTestPage.xaml.cs
@@ -20,18 +20,12 @@ using Tizen.NUI;
 
 namespace NUITizenGallery
 {
-    public partial class BrushViewerTestPage : View
+    public partial class BrushViewerTestPage : ContentPage
     {
         public BrushViewerTestPage()
         {
             InitializeComponent();
 
-            LinearLayout pageLayout = new LinearLayout();
-            pageLayout.LinearOrientation = LinearLayout.Orientation.Vertical;
-            pageLayout.CellPadding = new Size2D(10, 10);
-            pageLayout.Padding = new Extents(10, 10, 10, 10);
-            this.Layout = pageLayout;
-
             ButtonSolid.Clicked += OnClickedSolid;
             ButtonGradientLinear.Clicked += OnClickedLinear;
             ButtonGradientRadial.Clicked += OnClickedRadial;
diff --git a/test/NUITizenGallery/Examples/ButtontTest1/ButtonTest1.cs b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest1.cs
similarity index 52%
rename from test/NUITizenGallery/Examples/ButtontTest1/ButtonTest1.cs
rename to test/NUITizenGallery/Examples/ButtonTest/ButtonTest1.cs
index 3de8822..4a6286e 100644
--- a/test/NUITizenGallery/Examples/ButtontTest1/ButtonTest1.cs
+++ b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest1.cs
@@ -1,31 +1,25 @@
 using System;
 using Tizen.NUI;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
     internal class ButtonTest1 : IExample
     {
         private Window window;
-        private ButtonTest1Page page;
+
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
 
             window = NUIApplication.GetDefaultWindow();
-            page = new ButtonTest1Page();
-            page.PositionUsesPivotPoint = true;
-            page.ParentOrigin = ParentOrigin.Center;
-            page.PivotPoint = PivotPoint.Center;
-            page.HeightResizePolicy = ResizePolicyType.FillToParent;
-            page.WidthResizePolicy = ResizePolicyType.FillToParent;
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new ButtonTest1Page());
         }
 
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
\ No newline at end of file
diff --git a/test/NUITizenGallery/Examples/ButtonTest/ButtonTest1Page.xaml b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest1Page.xaml
new file mode 100644
index 0000000..5649aa1
--- /dev/null
+++ b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest1Page.xaml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.ButtonTest1Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="ButtonTest1Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="20,20" Padding="20,20,20,20"/>
+            </View.Layout>
+
+            <Button x:Name="button1"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      BackgroundColor="#52c7d9"
+                      PointSize="10"
+                      Text="Text Button"
+                      TextColor="#ffffff"
+                      Weight="0.12"/>
+
+            <Button x:Name="button2"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      BackgroundColor="#52c7d9"
+                      PointSize="10"
+                      TextColor="#ffffff"
+                      Weight="0.12">
+                <Button.Icon>
+                    <ImageView x:Name="imageview1" Size2D="60,60" />
+                </Button.Icon>
+            </Button>
+
+            <Button x:Name="button3"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      BackgroundColor="#52c7d9"
+                      PointSize="10"
+                      Text="Image and Text Button"
+                      TextColor="#ffffff"
+                      Weight="0.12">
+                <Button.Icon>
+                    <ImageView x:Name="imageview2" Size2D="60,60" />
+                </Button.Icon>
+            </Button>
+
+            <Button x:Name="button4"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      BackgroundColor="#ffffff"
+                      PointSize="10"
+                      Text="Color Change"
+                      TextColor="#52c7d9"
+                      Weight="0.12">
+                <Button.Icon>
+                    <ImageView x:Name="imageview3" Size2D="60,60" />
+                </Button.Icon>
+            </Button>
+
+            <Button x:Name="button5"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      BackgroundColor="#52c7d9"
+                      PointSize="10"
+                      Text="Text Toggle"
+                      TextColor="#ffffff"
+                      Weight="0.12">
+                <Button.Icon>
+                    <ImageView x:Name="imageview4" Size2D="60,60" />
+                </Button.Icon>
+            </Button>
+
+            <Button x:Name="button6"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      BackgroundColor="#52c7d9"
+                      PointSize="10"
+                      Text="Image Toggle"
+                      TextColor="#ffffff"
+                      Weight="0.12">
+                <Button.Icon>
+                    <ImageView x:Name="imageview5" Size2D="60,60" />
+                </Button.Icon>
+            </Button>
+
+            <Button x:Name="button7"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      BackgroundColor="#52c7d9"
+                      PointSize="10"
+                      IsEnabled="False"
+                      Text="Disabled button"
+                      TextColor="#ffffff"
+                      Weight="0.12"/>
+
+            <Button x:Name="button8"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      BackgroundColor="#52c7d9"
+                      PointSize="10"
+                      Text="Disabled toggle"
+                      TextColor="#ffffff"
+                      Weight="0.12"/>
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/ButtontTest1/ButtonTest1.xaml.cs b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest1Page.xaml.cs
similarity index 92%
rename from test/NUITizenGallery/Examples/ButtontTest1/ButtonTest1.xaml.cs
rename to test/NUITizenGallery/Examples/ButtonTest/ButtonTest1Page.xaml.cs
index 2346b75..ed974e6 100644
--- a/test/NUITizenGallery/Examples/ButtontTest1/ButtonTest1.xaml.cs
+++ b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest1Page.xaml.cs
@@ -5,7 +5,7 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class ButtonTest1Page : View
+    public partial class ButtonTest1Page : ContentPage
     {
         string ImageURL = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "images/";
         Color[] button4Colors = { Color.White, Color.Black, Color.Red, Color.Magenta, Color.Green, Color.Yellow };
@@ -14,7 +14,6 @@ namespace NUITizenGallery
         public ButtonTest1Page()
         {
             InitializeComponent();
-            rootView.Padding = new Extents(50, 50, 50, 50);
             imageview1.ResourceUrl = ImageURL + "NUITizenGallery.png";
             imageview2.ResourceUrl = ImageURL + "NUITizenGallery.png";
             imageview3.ResourceUrl = ImageURL + "NUITizenGallery.png";
diff --git a/test/NUITizenGallery/Examples/ButtonTest2/ButtonTest2.cs b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest2.cs
similarity index 86%
rename from test/NUITizenGallery/Examples/ButtonTest2/ButtonTest2.cs
rename to test/NUITizenGallery/Examples/ButtonTest/ButtonTest2.cs
index 91da0de..441d198 100644
--- a/test/NUITizenGallery/Examples/ButtonTest2/ButtonTest2.cs
+++ b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest2.cs
@@ -16,27 +16,26 @@
  */
 using System;
 using Tizen.NUI;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
     internal class ButtonTest2 : IExample
     {
         private Window window;
-        private ButtonTest2Page page;
+
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
 
             window = NUIApplication.GetDefaultWindow();
-            page = new ButtonTest2Page();
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new ButtonTest2Page());
 
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/ButtonTest/ButtonTest2Page.xaml b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest2Page.xaml
new file mode 100644
index 0000000..1908a9c
--- /dev/null
+++ b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest2Page.xaml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.ButtonTest2Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="ButtonTest2Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="20,20" Padding="20,20,20,20"/>
+            </View.Layout>
+
+            <Button x:Name="coloredButton"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      BackgroundColor="Transparent"
+                      Text="Color change"
+                      TextColor="Color.Blue"
+                      Opacity="0.5"
+                      PointSize="8">
+
+                <Button.Icon>
+                    <ImageView x:Name="imageview1" Size2D="60,60" />
+                </Button.Icon>
+
+            </Button>
+
+            <Button x:Name="button2"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      IsEnabled="False"
+                      PointSize="8"
+                      Text="Disabled button"/>
+
+            <Button x:Name="button3"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      PointSize="8"
+                      Text="Disabled toggle"/>
+
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/ButtonTest2/ButtonTest2Page.xaml.cs b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest2Page.xaml.cs
similarity index 96%
rename from test/NUITizenGallery/Examples/ButtonTest2/ButtonTest2Page.xaml.cs
rename to test/NUITizenGallery/Examples/ButtonTest/ButtonTest2Page.xaml.cs
index bdfe376..21a27a1 100644
--- a/test/NUITizenGallery/Examples/ButtonTest2/ButtonTest2Page.xaml.cs
+++ b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest2Page.xaml.cs
@@ -20,7 +20,7 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class ButtonTest2Page : View
+    public partial class ButtonTest2Page : ContentPage
     {
         private readonly string ImageURL = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "images/";
         private readonly Color[] button1Colors = {
@@ -41,7 +41,6 @@ namespace NUITizenGallery
         public ButtonTest2Page()
         {
             InitializeComponent();
-            rootView.Padding = new Extents(50, 50, 50, 50);
             imageview1.ResourceUrl = ImageURL + "NUITizenGallery.png";
             coloredButton.Clicked += OnColoredButtonClicked;
             button3.Clicked += OnButton3Clicked;
diff --git a/test/NUITizenGallery/Examples/ButtonTest5/ButtonTest5.cs b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest5.cs
similarity index 52%
rename from test/NUITizenGallery/Examples/ButtonTest5/ButtonTest5.cs
rename to test/NUITizenGallery/Examples/ButtonTest/ButtonTest5.cs
index 8706174..bb9641c 100644
--- a/test/NUITizenGallery/Examples/ButtonTest5/ButtonTest5.cs
+++ b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest5.cs
@@ -1,31 +1,25 @@
 using System;
 using Tizen.NUI;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
     internal class ButtonTest5 : IExample
     {
         private Window window;
-        private ButtonTest5Page page;
+
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
 
             window = NUIApplication.GetDefaultWindow();
-            page = new ButtonTest5Page();
-            page.PositionUsesPivotPoint = true;
-            page.ParentOrigin = ParentOrigin.Center;
-            page.PivotPoint = PivotPoint.Center;
-            page.HeightResizePolicy = ResizePolicyType.FillToParent;
-            page.WidthResizePolicy = ResizePolicyType.FillToParent;
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new ButtonTest5Page());
 
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/ButtonTest/ButtonTest5Page.xaml b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest5Page.xaml
new file mode 100644
index 0000000..c025e83
--- /dev/null
+++ b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest5Page.xaml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.ButtonTest5Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="ButtonTest5Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="20,20" Padding="20,20,20,20"/>
+            </View.Layout>
+
+            <TextLabel x:Name="text1"
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                         HeightSpecification="{Static LayoutParamPolicies.WrapContent}"
+                         PointSize="8"
+                         Text="Button Size: 70" />
+
+            <Slider x:Name="slider1"
+                      MinValue="0"
+                      MaxValue="200"
+                      CurrentValue="70"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      TrackThickness="5"
+                      BgTrackColor="#b1b1b1"
+                      SlidedTrackColor="#3db9cc" />
+
+            <TextLabel x:Name="text2"
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                         HeightSpecification="{Static LayoutParamPolicies.WrapContent}"
+                         PointSize="8"
+                         Text="Button Font Size: 5" />
+
+            <Slider x:Name="slider2"
+                      MinValue="0"
+                      MaxValue="30"
+                      CurrentValue="5"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      TrackThickness="5"
+                      BgTrackColor="#b1b1b1"
+                      SlidedTrackColor="#3db9cc" />
+
+            <TextLabel x:Name="text3"
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                         HeightSpecification="{Static LayoutParamPolicies.WrapContent}"
+                         PointSize="8"
+                         Text="Button Opaticy: 1.0" />
+
+            <Slider x:Name="slider3"
+                      MinValue="0"
+                      MaxValue="1"
+                      CurrentValue="1"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      TrackThickness="5"
+                      BgTrackColor="#b1b1b1"
+                      SlidedTrackColor="#3db9cc" />
+
+            <Button x:Name="button1"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      SizeHeight="70"
+                      BackgroundColor="#0000ff"
+                      Text="Button1"
+                      PointSize="5"
+                      Opacity="1" />
+
+            <Button x:Name="button2"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      SizeHeight="70"
+                      BackgroundColor="#0000ff"
+                      PointSize="5"
+                      Opacity="1"
+                      Text="Button2" />
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/ButtonTest5/ButtonTest5.xaml.cs b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest5Page.xaml.cs
similarity index 92%
rename from test/NUITizenGallery/Examples/ButtonTest5/ButtonTest5.xaml.cs
rename to test/NUITizenGallery/Examples/ButtonTest/ButtonTest5Page.xaml.cs
index 771bba0..c59669a 100644
--- a/test/NUITizenGallery/Examples/ButtonTest5/ButtonTest5.xaml.cs
+++ b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest5Page.xaml.cs
@@ -1,15 +1,15 @@
 using Tizen.NUI;
 using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class ButtonTest5Page : View
+    public partial class ButtonTest5Page : ContentPage
     {
         bool opacityToggle = false;
         public ButtonTest5Page()
         {
             InitializeComponent();
-            rootView.Padding = new Extents(50, 50, 50, 50);
 
             slider1.ValueChanged += (o, e) =>
             {
@@ -38,7 +38,7 @@ namespace NUITizenGallery
                 if (opacityToggle)
                 {
                     slider3.CurrentValue = 0.5f;
-                } 
+                }
                 else
                 {
                     slider3.CurrentValue = 1.0f;
diff --git a/test/NUITizenGallery/Examples/ButtonTest6/ButtonTest6.cs b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest6.cs
similarity index 52%
rename from test/NUITizenGallery/Examples/ButtonTest6/ButtonTest6.cs
rename to test/NUITizenGallery/Examples/ButtonTest/ButtonTest6.cs
index 055ea28..be337f6 100644
--- a/test/NUITizenGallery/Examples/ButtonTest6/ButtonTest6.cs
+++ b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest6.cs
@@ -1,31 +1,24 @@
 using System;
 using Tizen.NUI;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
     internal class ButtonTest6 : IExample
     {
         private Window window;
-        private ButtonTest6Page page;
+
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
 
             window = NUIApplication.GetDefaultWindow();
-            page = new ButtonTest6Page();
-            page.PositionUsesPivotPoint = true;
-            page.ParentOrigin = ParentOrigin.Center;
-            page.PivotPoint = PivotPoint.Center;
-            page.HeightResizePolicy = ResizePolicyType.FillToParent;
-            page.WidthResizePolicy = ResizePolicyType.FillToParent;
-            window.Add(page);
-
+            window.GetDefaultNavigator().Push(new ButtonTest6Page());
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/ButtonTest/ButtonTest6Page.xaml b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest6Page.xaml
new file mode 100644
index 0000000..dd43acc
--- /dev/null
+++ b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest6Page.xaml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.ButtonTest6Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="ButtonTest6Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="60,60"/>
+            </View.Layout>
+
+            <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+                <Button x:Name="button1"
+                          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                          SizeHeight="70"
+                          BackgroundColor="#3db9cc"
+                          PointSize="5"
+                          Opacity="1"
+                          Text="BackgroundColor"/>
+            </View>
+
+            <View Weight="1.0">
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Center" CellPadding="30,30"/>
+                </View.Layout>
+
+                <TextLabel x:Name="redText"
+                             HorizontalAlignment="Center"
+                             SizeWidth="100"
+                             SizeHeight="180"
+                             PointSize="8"
+                             BackgroundColor="Red"
+                             Text="RED" />
+                <TextLabel x:Name="greenText"
+                             HorizontalAlignment="Center"
+                             SizeWidth="100"
+                             SizeHeight="180"
+                             PointSize="8"
+                             BackgroundColor="Green"
+                             Text="GREEN" />
+                <TextLabel x:Name="grayText"
+                             HorizontalAlignment="Center"
+                             SizeWidth="100"
+                             SizeHeight="180"
+                             PointSize="8"
+                             BackgroundColor="#8C8C8C"
+                             Text="GRAY" />
+              </View>
+        </View>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/ButtonTest6/ButtonTest6.xaml.cs b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest6Page.xaml.cs
similarity index 100%
rename from test/NUITizenGallery/Examples/ButtonTest6/ButtonTest6.xaml.cs
rename to test/NUITizenGallery/Examples/ButtonTest/ButtonTest6Page.xaml.cs
diff --git a/test/NUITizenGallery/Examples/ButtonTest7/ButtonTest7.cs b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest7.cs
similarity index 52%
rename from test/NUITizenGallery/Examples/ButtonTest7/ButtonTest7.cs
rename to test/NUITizenGallery/Examples/ButtonTest/ButtonTest7.cs
index b1e09f8..2e25cda 100644
--- a/test/NUITizenGallery/Examples/ButtonTest7/ButtonTest7.cs
+++ b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest7.cs
@@ -1,31 +1,25 @@
 using System;
 using Tizen.NUI;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
     internal class ButtonTest7 : IExample
     {
         private Window window;
-        private ButtonTest7Page page;
+
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
 
             window = NUIApplication.GetDefaultWindow();
-            page = new ButtonTest7Page();
-            page.PositionUsesPivotPoint = true;
-            page.ParentOrigin = ParentOrigin.Center;
-            page.PivotPoint = PivotPoint.Center;
-            page.HeightResizePolicy = ResizePolicyType.FillToParent;
-            page.WidthResizePolicy = ResizePolicyType.FillToParent;
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new ButtonTest7Page());
 
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/ButtonTest/ButtonTest7Page.xaml b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest7Page.xaml
new file mode 100644
index 0000000..ecd1216
--- /dev/null
+++ b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest7Page.xaml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.ButtonTest7Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="ButtonTest7Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="30,30"/>
+            </View.Layout>
+
+            <TextLabel x:Name="text1"
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                         HeightSpecification="{Static LayoutParamPolicies.WrapContent}"
+                         PointSize="8"
+                         Text="Button Press and release event trigger test" />
+
+            <Button x:Name="button1"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      SizeHeight="70"
+                      BackgroundColor="#3db9cc"
+                      PointSize="5"
+                      Opacity="1"
+                      Text="Click me"/>
+
+            <TextLabel x:Name="text2"
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                         HeightSpecification="{Static LayoutParamPolicies.WrapContent}"
+                         PointSize="8"
+                         Text="Normal" />
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/ButtonTest7/ButtonTest7.xaml.cs b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest7Page.xaml.cs
similarity index 82%
rename from test/NUITizenGallery/Examples/ButtonTest7/ButtonTest7.xaml.cs
rename to test/NUITizenGallery/Examples/ButtonTest/ButtonTest7Page.xaml.cs
index 2bb50e9..6cf14c1 100644
--- a/test/NUITizenGallery/Examples/ButtonTest7/ButtonTest7.xaml.cs
+++ b/test/NUITizenGallery/Examples/ButtonTest/ButtonTest7Page.xaml.cs
@@ -1,9 +1,10 @@
 
 using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class ButtonTest7Page : View
+    public partial class ButtonTest7Page : ContentPage
     {
         public ButtonTest7Page()
         {
@@ -15,7 +16,7 @@ namespace NUITizenGallery
                 }
                 if (e.CurrentState == ControlState.Pressed) {
                     text2.Text = "Pressed";
-                }   
+                }
             };
 
         }
diff --git a/test/NUITizenGallery/Examples/CarouselTest/CarouselPageTest1.cs b/test/NUITizenGallery/Examples/CarouselTest/CarouselPageTest1.cs
new file mode 100644
index 0000000..14060da
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CarouselTest/CarouselPageTest1.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class CarouselPageTest1 : IExample
+    {
+        private Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new CarouselPageTest1Page());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/CarouselTest/CarouselPageTest1Page.xaml b/test/NUITizenGallery/Examples/CarouselTest/CarouselPageTest1Page.xaml
new file mode 100644
index 0000000..2d217ef
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CarouselTest/CarouselPageTest1Page.xaml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.CarouselPageTest1Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="AnimationTest1Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="10,10" />
+            </View.Layout>
+
+            <ScrollableBase x:Name="Scroller" SnapToPage="true" ScrollingDirection="Horizontal" BackgroundColor="Yellow" SizeWidth="600">
+
+                <ScrollableBase.Layout>
+                  <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Top" CellPadding="5,5" />
+                </ScrollableBase.Layout>
+
+              <View x:Name="Page1"
+                      Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }"
+                      HeightSpecification="500">
+
+                  <View.Layout>
+                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="5,5" />
+                  </View.Layout> -->
+
+                  <TextLabel Text="Page 0"
+                             WidthSpecification="{Static LayoutParamPolicies.WrapContent}"
+                             HeightSpecification="{Static LayoutParamPolicies.WrapContent}"
+                             HorizontalAlignment="Center"/>
+                  <View Size2D="400,400" BackgroundColor="Red"/>
+              </View>
+
+              <View x:Name="Page2"
+                      Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }"
+                      HeightSpecification="500">
+
+                <View.Layout>
+                  <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="5,5" />
+                </View.Layout> -->
+
+                <TextLabel Text="Page 0"
+                           WidthSpecification="{Static LayoutParamPolicies.WrapContent}"
+                           HeightSpecification="{Static LayoutParamPolicies.WrapContent}"
+                           HorizontalAlignment="Center"/>
+                <View Size2D="400,400" BackgroundColor="Green"/>
+              </View>
+
+              <View x:Name="Page3"
+                      Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }"
+                      HeightSpecification="500">
+
+                <View.Layout>
+                  <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="5,5" />
+                </View.Layout> -->
+
+                <TextLabel Text="Page 0"
+                           WidthSpecification="{Static LayoutParamPolicies.WrapContent}"
+                           HeightSpecification="{Static LayoutParamPolicies.WrapContent}"
+                           HorizontalAlignment="Center"/>
+                <View Size2D="400,400" BackgroundColor="Blue"/>
+              </View>
+            </ScrollableBase>
+
+            <Pagination x:Name="Index" Size2D="250,50"/>
+        </View>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CarouselPageTest1/CarouselPageTest1.xaml.cs b/test/NUITizenGallery/Examples/CarouselTest/CarouselPageTest1Page.xaml.cs
similarity index 100%
rename from test/NUITizenGallery/Examples/CarouselPageTest1/CarouselPageTest1.xaml.cs
rename to test/NUITizenGallery/Examples/CarouselTest/CarouselPageTest1Page.xaml.cs
diff --git a/test/NUITizenGallery/Examples/CarouselTest/CarouselViewFocusTest.cs b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewFocusTest.cs
new file mode 100644
index 0000000..f261e0b
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewFocusTest.cs
@@ -0,0 +1,39 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class CarouselViewFocusTest : IExample
+    {
+        Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new CarouselViewFocusTestPage());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/CarouselTest/CarouselViewFocusTestPage.xaml b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewFocusTestPage.xaml
new file mode 100644
index 0000000..d9c35b2
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewFocusTestPage.xaml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.CarouselViewFocusTestPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="CarouselViewFocusTestPage"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <ScrollableBase x:Name="Scroller"
+                          ScrollingDirection="Horizontal"
+                          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">>
+            <ScrollableBase.Layout>
+              <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Center" CellPadding="120,0"/>
+            </ScrollableBase.Layout>
+        </ScrollableBase>
+
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CollectionViewFocusTest/CollectionViewFocusTest.xaml.cs b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewFocusTestPage.xaml.cs
similarity index 78%
rename from test/NUITizenGallery/Examples/CollectionViewFocusTest/CollectionViewFocusTest.xaml.cs
rename to test/NUITizenGallery/Examples/CarouselTest/CarouselViewFocusTestPage.xaml.cs
index 0a96672..fe2a321 100644
--- a/test/NUITizenGallery/Examples/CollectionViewFocusTest/CollectionViewFocusTest.xaml.cs
+++ b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewFocusTestPage.xaml.cs
@@ -15,38 +15,39 @@
  *
  */
 using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
 using System.IO;
 
 
 namespace NUITizenGallery
 {
-    public partial class CollectionViewFocusTestPage : View
+    public partial class CarouselViewFocusTestPage : ContentPage
     {
         private readonly static string ResourcePath = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "/images/";
         private readonly static string PostersPath = ResourcePath + "posters/";
         private int FocusedItem = -1;
-        private CollectionViewItem[] items;
+        private CarouselViewItem[] items;
         private readonly string TestDescription = "A great example of colour scheme that extends from a film to its marketing. Yellow emanates from this heartwarming Sundance hit, seen on Paul Dano��s t-shirt and the lovably rubbish VW campervan, here flooding the negative space of both trailer and poster.";
 
-        public CollectionViewFocusTestPage()
+        public CarouselViewFocusTestPage()
         {
             InitializeComponent();
 
             string[] files = Directory.GetFiles(PostersPath);
-            items = new CollectionViewItem[files.Length];
+            items = new CarouselViewItem[files.Length];
 
             int i = 0;
 
             foreach (string f in files)
             {
-                items[i] = new CollectionViewItem(i, f, Path.GetFileNameWithoutExtension(f), TestDescription);
-                items[i].CollectionViewItemClicked += OnItemClicked;
+                items[i] = new CarouselViewItem(i, f, Path.GetFileNameWithoutExtension(f), TestDescription);
+                items[i].CarouselViewItemClicked += OnItemClicked;
                 Scroller.Add(items[i++]);
             }
         }
-        public void OnItemClicked(object sender, CollectionViewItemClickedEventArgs args)
+        public void OnItemClicked(object sender, CarouselViewItemClickedEventArgs args)
         {
-            if (FocusedItem == -1) 
+            if (FocusedItem == -1)
             {
                 items[args.ClickedItemId].SetFocused();
                 FocusedItem = args.ClickedItemId;
diff --git a/test/NUITizenGallery/Examples/CarouselTest/CarouselViewItem.xaml b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewItem.xaml
new file mode 100644
index 0000000..ab3dc73
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewItem.xaml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<View x:Class="NUITizenGallery.CarouselViewItem"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  Size2D="340, 900">
+
+    <View x:Name="ItemBackground"
+            BackgroundColor="#ff0000" Size2D="300, 700">
+        <View.Layout>
+          <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center"/>
+        </View.Layout>
+
+        <ImageView x:Name="ItemPoster" Size2D="300, 438"/>
+        <TextLabel x:Name="ItemTitle"  Size2D="300, 50" BackgroundColor="#5c5c5c" Opacity="0.7" TextColor="#ffffff"/>
+        <TextLabel x:Name="ItemDescription" Size2D="300, 150" BackgroundColor="#5c5c5c" Opacity="0.7"/>
+    </View>
+</View>
diff --git a/test/NUITizenGallery/Examples/CollectionViewFocusTest/CollectionViewItem.xaml.cs b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewItem.xaml.cs
similarity index 85%
rename from test/NUITizenGallery/Examples/CollectionViewFocusTest/CollectionViewItem.xaml.cs
rename to test/NUITizenGallery/Examples/CarouselTest/CarouselViewItem.xaml.cs
index 5fb4434..c53b0ce 100644
--- a/test/NUITizenGallery/Examples/CollectionViewFocusTest/CollectionViewItem.xaml.cs
+++ b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewItem.xaml.cs
@@ -20,23 +20,23 @@ using System;
 
 namespace NUITizenGallery
 {
-    public partial class CollectionViewItemClickedEventArgs : EventArgs
+    public partial class CarouselViewItemClickedEventArgs : EventArgs
     {
         public int ClickedItemId = -1;
-        public CollectionViewItemClickedEventArgs(int id)
+        public CarouselViewItemClickedEventArgs(int id)
         {
             ClickedItemId = id;
         }
     }
 
-    public partial class CollectionViewItem : View
+    public partial class CarouselViewItem : View
     {
         private int ItemId = -1;
-        public event EventHandler<CollectionViewItemClickedEventArgs> CollectionViewItemClicked;
+        public event EventHandler<CarouselViewItemClickedEventArgs> CarouselViewItemClicked;
 
         private Animation animation;
 
-        public CollectionViewItem(int id, string poster, string name, string description)
+        public CarouselViewItem(int id, string poster, string name, string description)
         {
             ItemId = id;
             InitializeComponent();
@@ -53,7 +53,7 @@ namespace NUITizenGallery
         public bool OnTouchEvent(object sender, TouchEventArgs args)
         {
             if (args.Touch.GetState(0) == Tizen.NUI.PointStateType.Finished) {
-                CollectionViewItemClicked.Invoke(this, new CollectionViewItemClickedEventArgs(ItemId));
+                CarouselViewItemClicked.Invoke(this, new CarouselViewItemClickedEventArgs(ItemId));
             }
 
             return false;
diff --git a/test/NUITizenGallery/Examples/CarouselViewTest1/CarouselViewTest1.cs b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest1.cs
similarity index 87%
rename from test/NUITizenGallery/Examples/CarouselViewTest1/CarouselViewTest1.cs
rename to test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest1.cs
index 9ce1eee..890d8b5 100644
--- a/test/NUITizenGallery/Examples/CarouselViewTest1/CarouselViewTest1.cs
+++ b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest1.cs
@@ -23,22 +23,18 @@ namespace NUITizenGallery
     internal class CarouselViewTest1 : IExample
     {
         private Window window;
-        private CarouselViewTest1Page page;
 
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
 
             window = NUIApplication.GetDefaultWindow();
-            page = new CarouselViewTest1Page();
-
-            window.GetDefaultNavigator().Push(page);
+            window.GetDefaultNavigator().Push(new CarouselViewTest1Page());
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
             window.GetDefaultNavigator().Pop();
-            page = null;
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest1Page.xaml b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest1Page.xaml
new file mode 100644
index 0000000..fb355dd
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest1Page.xaml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.CarouselViewTest1Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="CarouselViewTest1Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
+            </View.Layout>
+
+            <View x:Name="VerticalBox"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              HeightSpecification="80">
+
+                <View.Layout>
+                  <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Top" CellPadding="5,5" />
+                </View.Layout>
+
+                <Button x:Name="Default" Text="Default"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  WidthSpecification="190"/>
+                <Button x:Name="Always" Text="Always"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  WidthSpecification="190"/>
+                <Button x:Name="Never" Text="Never"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  WidthSpecification="190"/>
+                <TextLabel x:Name="ScrollStatus"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  WidthSpecification="150"/>
+            </View>
+
+            <TextLabel MultiLine="True"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              HeightSpecification="80"
+              Text="Horizontal Scrollbar Visibility Test"/>
+
+            <ScrollableBase x:Name="Scroller"
+              SnapToPage="true"
+              ScrollingDirection="Horizontal"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+                <ScrollableBase.Layout>
+                  <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Top" CellPadding="5,5" />
+                </ScrollableBase.Layout>
+
+                <View x:Name="Page1"
+                  Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  BackgroundColor="#ff0000"/>
+                <View x:Name="Page2"
+                  Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  BackgroundColor="#00ff00"/>
+                <View x:Name="Page3"
+                  Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  BackgroundColor="#0000ff"/>
+            </ScrollableBase>
+
+            <Pagination x:Name="Index" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="50"/>
+        </View>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CarouselViewTest1/CarouselViewTest1.xaml.cs b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest1Page.xaml.cs
similarity index 100%
rename from test/NUITizenGallery/Examples/CarouselViewTest1/CarouselViewTest1.xaml.cs
rename to test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest1Page.xaml.cs
diff --git a/test/NUITizenGallery/Examples/CarouselViewTest2/CarouselViewTest2.cs b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest2.cs
similarity index 87%
rename from test/NUITizenGallery/Examples/CarouselViewTest2/CarouselViewTest2.cs
rename to test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest2.cs
index 4132024..76f7179 100644
--- a/test/NUITizenGallery/Examples/CarouselViewTest2/CarouselViewTest2.cs
+++ b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest2.cs
@@ -23,22 +23,18 @@ namespace NUITizenGallery
     internal class CarouselViewTest2 : IExample
     {
         private Window window;
-        private CarouselViewTest2Page page;
 
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
 
             window = NUIApplication.GetDefaultWindow();
-            page = new CarouselViewTest2Page();
-
-            window.GetDefaultNavigator().Push(page);
+            window.GetDefaultNavigator().Push(new CarouselViewTest2Page());
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
             window.GetDefaultNavigator().Pop();
-            page = null;
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest2Page.xaml b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest2Page.xaml
new file mode 100644
index 0000000..3f2e826
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest2Page.xaml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.CarouselViewTest2Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="CarouselViewTest2Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
+            </View.Layout>
+
+            <View x:Name="VerticalBox"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              HeightSpecification="80">
+
+                <View.Layout>
+                  <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Top" CellPadding="5,5" />
+                </View.Layout>
+
+                <Button x:Name="Default" Text="Default"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  WidthSpecification="190"/>
+                <Button x:Name="Always" Text="Always"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  WidthSpecification="190"/>
+                <Button x:Name="Never" Text="Never"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  WidthSpecification="190"/>
+                <TextLabel x:Name="ScrollStatus"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  WidthSpecification="150"/>
+            </View>
+
+            <TextLabel MultiLine="True"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              HeightSpecification="80"
+              Text="Vertical Scrollbar Visibility Test"/>
+
+            <ScrollableBase x:Name="Scroller"
+              SnapToPage="true"
+              ScrollingDirection="Vertical"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+                <ScrollableBase.Layout>
+                  <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="5,5" />
+                </ScrollableBase.Layout>
+
+                <View x:Name="Page1" Size2D="720, 900" BackgroundColor="#ff0000"/>
+                <View x:Name="Page2" Size2D="720, 900" BackgroundColor="#00ff00"/>
+                <View x:Name="Page3" Size2D="720, 900" BackgroundColor="#0000ff"/>
+            </ScrollableBase>
+
+            <Pagination x:Name="Index" Size2D="720,50" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" />
+        </View>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CarouselViewTest2/CarouselViewTest2.xaml.cs b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest2Page.xaml.cs
similarity index 100%
rename from test/NUITizenGallery/Examples/CarouselViewTest2/CarouselViewTest2.xaml.cs
rename to test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest2Page.xaml.cs
diff --git a/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest4.cs b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest4.cs
new file mode 100644
index 0000000..9ceae41
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest4.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class CarouselViewTest4 : IExample
+    {
+        private Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new CarouselViewTest4Page());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest4Page.xaml b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest4Page.xaml
new file mode 100644
index 0000000..12aaef9
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest4Page.xaml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.CarouselViewTest4Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="CarouselViewTest4Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
+            </View.Layout>
+
+            <View>
+                <View.Layout>
+                  <LinearLayout LinearOrientation="Horizontal" CellPadding="10,10" LinearAlignment="Center"/>
+                </View.Layout>
+                <Button x:Name="SetPage0Button" Text="0" Size2D="50, 50"/>
+                <Button x:Name="SetPage1Button" Text="1" Size2D="50, 50"/>
+                <Button x:Name="SetPage2Button" Text="2" Size2D="50, 50"/>
+                <Button x:Name="SetPage3Button" Text="3" Size2D="50, 50"/>
+                <Button x:Name="SetPage4Button" Text="4" Size2D="50, 50"/>
+                <Button x:Name="SetPage5Button" Text="5" Size2D="50, 50"/>
+            </View>
+
+            <ScrollableBase x:Name="Scroller"
+              SnapToPage="true"
+              ScrollingDirection="Horizontal"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+                <ScrollableBase.Layout>
+                  <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Center"/>
+                </ScrollableBase.Layout>
+
+                <View x:Name="Page0"
+                  Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  BackgroundColor="#ff0000">
+                    <TextLabel Text="Page 0" MultiLine="True" Size2D="720, 100"/>
+                </View>
+                <View x:Name="Page1"
+                  Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  BackgroundColor="#00ff00">
+                    <TextLabel Text="Page 1" MultiLine="True" Size2D="720, 100"/>
+                </View>
+                <View x:Name="Page2"
+                  Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  BackgroundColor="#0000ff">
+                    <TextLabel Text="Page 2" MultiLine="True" Size2D="720, 100"/>
+                </View>
+                <View x:Name="Page3"
+                  Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  BackgroundColor="#ff0000">
+                    <TextLabel Text="Page 3" MultiLine="True" Size2D="720, 100"/>
+                </View>
+                <View x:Name="Page4"
+                  Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  BackgroundColor="#00ff00">
+                    <TextLabel Text="Page 4" MultiLine="True" Size2D="720, 100"/>
+                </View>
+                <View x:Name="Page5"
+                  Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  BackgroundColor="#0000ff">
+                    <TextLabel Text="Page 5" MultiLine="True" Size2D="720, 100"/>
+                </View>
+            </ScrollableBase>
+        </View>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CarouselViewTest4/CarouselViewTest4.xaml.cs b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest4Page.xaml.cs
similarity index 98%
rename from test/NUITizenGallery/Examples/CarouselViewTest4/CarouselViewTest4.xaml.cs
rename to test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest4Page.xaml.cs
index d480850..e88de56 100644
--- a/test/NUITizenGallery/Examples/CarouselViewTest4/CarouselViewTest4.xaml.cs
+++ b/test/NUITizenGallery/Examples/CarouselTest/CarouselViewTest4Page.xaml.cs
@@ -39,7 +39,7 @@ namespace NUITizenGallery
             buttons[4] = SetPage4Button;
             buttons[5] = SetPage5Button;
 
-            for (int i = 0; i < PageCount; ++i) 
+            for (int i = 0; i < PageCount; ++i)
             {
                 buttons[i].Clicked += OnButtonClicked;
             }
diff --git a/test/NUITizenGallery/Examples/CheckBoxTest/CheckBoxTest.cs b/test/NUITizenGallery/Examples/CheckBoxTest/CheckBoxTest.cs
index de077b4..ff66f9d 100755
--- a/test/NUITizenGallery/Examples/CheckBoxTest/CheckBoxTest.cs
+++ b/test/NUITizenGallery/Examples/CheckBoxTest/CheckBoxTest.cs
@@ -17,24 +17,27 @@
 
 using System;
 using Tizen.NUI;
+using Tizen.NUI.Components;
+
 
 namespace NUITizenGallery
 {
     internal class CheckBoxTest : IExample
     {
         private Window window;
-        private CheckBoxTestPage page;
+
         public void Activate()
         {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
             window = NUIApplication.GetDefaultWindow();
-            page = new CheckBoxTestPage();
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new CheckBoxTestPage());
         }
 
         public void Deactivate()
         {
-            page.Unparent();
-            page.Dispose();
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/CheckBoxTest/CheckBoxTestPage.xaml b/test/NUITizenGallery/Examples/CheckBoxTest/CheckBoxTestPage.xaml
new file mode 100755
index 0000000..96d0363
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CheckBoxTest/CheckBoxTestPage.xaml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.CheckBoxTestPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="CheckBoxTestPage"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" CellPadding="10,10" LinearAlignment="Top"/>
+            </View.Layout>
+
+            <View x:Name="btnView"
+                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                    HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Vertical" CellPadding="100,100" LinearAlignment="CenterVertical" />
+                </View.Layout>
+
+                <CheckBox x:Name="checkBox1" Text="False"/>
+                <CheckBox x:Name="checkBox2" Text="Colored CheckBox" IsSelected="true" />
+            </View>
+        </View>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CheckBoxTest/CheckBoxTest.xaml.cs b/test/NUITizenGallery/Examples/CheckBoxTest/CheckBoxTestPage.xaml.cs
similarity index 97%
rename from test/NUITizenGallery/Examples/CheckBoxTest/CheckBoxTest.xaml.cs
rename to test/NUITizenGallery/Examples/CheckBoxTest/CheckBoxTestPage.xaml.cs
index b8077ce..86f6e49 100755
--- a/test/NUITizenGallery/Examples/CheckBoxTest/CheckBoxTest.xaml.cs
+++ b/test/NUITizenGallery/Examples/CheckBoxTest/CheckBoxTestPage.xaml.cs
@@ -21,7 +21,7 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class CheckBoxTestPage : View
+    public partial class CheckBoxTestPage : ContentPage
     {
         private readonly string ResourcePath = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "/images/";
 
diff --git a/test/NUITizenGallery/Examples/CollectionViewFocusTest/CollectionViewFocusTest.cs b/test/NUITizenGallery/Examples/CollectionViewFocusTest/CollectionViewFocusTest.cs
deleted file mode 100644
index 2e22009..0000000
--- a/test/NUITizenGallery/Examples/CollectionViewFocusTest/CollectionViewFocusTest.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using Tizen.NUI;
-
-namespace NUITizenGallery
-{
-    internal class CollectionViewFocusTest : IExample
-    {
-        Window window;
-        CollectionViewFocusTestPage page;
-
-        public void Activate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-            window = NUIApplication.GetDefaultWindow();
-
-            page = new CollectionViewFocusTestPage();
-            window.Add(page);
-        }
-        public void Deactivate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewCustomItem.xaml b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewCustomItem.xaml
new file mode 100644
index 0000000..614d12e
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewCustomItem.xaml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<RecyclerViewItem x:Class="NUITizenGallery.CollectionViewCustomItem"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="120"
+  BackgroundColor="White">
+
+    <!-- Vertical Linear Laoyout to add Bottom Line -->
+    <RecyclerViewItem.Layout>
+        <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterHorizontal" />
+    </RecyclerViewItem.Layout>
+
+    <!-- Main View with Horizontal Linear Layout. -->
+    <View x:Name="HorizBox"
+            WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+            HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+            Padding="20,20,0,0" >
+
+        <RecyclerViewItem.Layout>
+            <LinearLayout LinearOrientation="Horizontal" LinearAlignment="CenterVertical" CellPadding="10,10" />
+        </RecyclerViewItem.Layout>
+
+        <ImageView x:Name="FlagIcon" Size2D="100,80"
+                     ResourceUrl="{Binding FlagIconPath}"
+                     Padding="20,20,0,0"/>
+
+        <TextLabel x:Name="MainLabel"
+                     WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                     HeightSpecification="{Static LayoutParamPolicies.WrapContent}"
+                     CellHorizontalAlignment="Left"
+                     CellVerticalAlignment="Center"
+                     Text="{Binding Name}"/>
+
+        <CheckBox x:Name="Checkbox"
+                    Padding="20,20,0,0"
+                    IsSelected="{Binding IsSelected}"/>
+
+        <View x:Name="VerticalBox"
+                WidthSpecification="100"
+                HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterHorizontal" CellPadding="10,10" />
+            </View.Layout>
+
+            <TextLabel x:Name="IndexLebel"
+                         CellVerticalAlignment="Center"
+                         CellHorizontalAlignment="Center"
+                         Text="{Binding Index}"
+                         TextColor="{Binding BgColor}"/>
+            <ImageView x:Name="SubIcon"
+                         Size2D="70,50"
+                         ResourceUrl="{Binding FlagIconPath}" />
+        </View>
+    </View>
+    <View x:Name="BottomLine"
+            WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+            HeightSpecification="1"
+            BackgroundColor="{Binding BgColor}" />
+
+</RecyclerViewItem>
diff --git a/test/NUITizenGallery/Examples/ActivityIndicator/ActivityIndicator.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewCustomItem.xaml.cs
similarity index 50%
rename from test/NUITizenGallery/Examples/ActivityIndicator/ActivityIndicator.cs
rename to test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewCustomItem.xaml.cs
index 174afa9..77259a2 100644
--- a/test/NUITizenGallery/Examples/ActivityIndicator/ActivityIndicator.cs
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewCustomItem.xaml.cs
@@ -15,30 +15,33 @@
  *
  */
 using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
 using Tizen.NUI;
+using Tizen.NUI.Binding;
 using Tizen.NUI.BaseComponents;
 using Tizen.NUI.Components;
+using Tizen.NUI.Components.Extension;
 
 namespace NUITizenGallery
 {
-    internal class ActivityIndicator : IExample
+    public partial class CollectionViewCustomItem : RecyclerViewItem
     {
-        Window window;
-        ActivityIndicatorPage page;
-
-        public void Activate()
+        void OnClicked(object sender, ClickedEventArgs e)
         {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-            window = NUIApplication.GetDefaultWindow();
-
-            page = new ActivityIndicatorPage();
-            window.Add(page);
+            BackgroundColor = (IsSelected?
+                                (((BindingContext == null) && (BindingContext is TestItem))?
+                                    Color.Cyan: ((TestItem)BindingContext).BgColor):
+                                Color.White);
         }
-        public void Deactivate()
+
+        public CollectionViewCustomItem()
         {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            Tizen.Log.Error("NUI", "Custom Item Created");
+            InitializeComponent();
+            Tizen.Log.Error("NUI", "Custom Item Initalzied");
+            Clicked+=OnClicked;
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewCustomItemTest.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewCustomItemTest.cs
new file mode 100644
index 0000000..09ebee9
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewCustomItemTest.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class CollectionViewCustomItemTest : IExample
+    {
+        private Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new CollectionViewCustomItemTestPage());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewCustomItemTestPage.xaml b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewCustomItemTestPage.xaml
new file mode 100644
index 0000000..52e7d9d
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewCustomItemTestPage.xaml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.CollectionViewCustomItemTestPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="CollectionViewCustomItemTestPage"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <CollectionView x:Name="ColView"
+                          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                          HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                          ScrollingDirection="Vertical"
+                          SelectionMode="Multiple"
+                          SelectionChanged="OnSelectionChanged"
+                          ItemsSource="{Binding TestSource}">
+
+            <CollectionView.ItemsLayouter>
+                  <LinearLayouter />
+            </CollectionView.ItemsLayouter>
+
+        </CollectionView>
+        </ContentPage.Content>
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewCustomItemTestPage.xaml.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewCustomItemTestPage.xaml.cs
new file mode 100644
index 0000000..dea0609
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewCustomItemTestPage.xaml.cs
@@ -0,0 +1,105 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using Tizen.NUI;
+using Tizen.NUI.Binding;
+using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
+using Tizen.NUI.Components.Extension;
+
+namespace NUITizenGallery
+{
+    public partial class CollectionViewCustomItemTestPage : ContentPage
+    {
+
+        void OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            List<object> cur = new List<object>(e.CurrentSelection);
+
+            foreach(TestItem item in e.PreviousSelection)
+            {
+                if (cur.Contains(item)) continue;
+                item.IsSelected = false;
+                Console.WriteLine($"On Selection {item.Index} : {item.IsSelected}");
+            }
+            foreach(TestItem item in cur)
+            {
+                item.IsSelected = true;
+                Console.WriteLine($"On Selection {item.Index} : {item.IsSelected}");
+            }
+        }
+
+        public CollectionViewCustomItemTestPage()
+        {
+            InitializeComponent();
+            BindingContext = new TestSourceModel(50);
+
+            ColView.ItemTemplate = new DataTemplate(() =>
+            {
+                return new CollectionViewCustomItem();;
+            });
+        }
+
+        protected override void Dispose(DisposeTypes type)
+        {
+            if (Disposed)
+            {
+                return;
+            }
+
+            if (type == DisposeTypes.Explicit)
+            {
+                RemoveAllChildren(true);
+            }
+
+            base.Dispose(type);
+        }
+
+        private void RemoveAllChildren(bool dispose = false)
+        {
+            RecursiveRemoveChildren(this, dispose);
+        }
+
+        private void RecursiveRemoveChildren(View parent, bool dispose)
+        {
+            if (parent == null)
+            {
+                return;
+            }
+
+            int maxChild = (int)parent.ChildCount;
+            for (int i = maxChild - 1; i >= 0; --i)
+            {
+                View child = parent.GetChildAt((uint)i);
+                if (child == null)
+                {
+                    continue;
+                }
+
+                RecursiveRemoveChildren(child, dispose);
+                parent.Remove(child);
+                if (dispose)
+                {
+                    child.Dispose();
+                }
+            }
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewObservableTest.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewObservableTest.cs
new file mode 100644
index 0000000..9d579cc
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewObservableTest.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class CollectionViewObservableTest : IExample
+    {
+        private Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new CollectionViewObservableTestPage());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewObservableTestPage.xaml b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewObservableTestPage.xaml
new file mode 100644
index 0000000..55fb1b8
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewObservableTestPage.xaml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.CollectionViewObservableTestPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="CollectionViewObservableTestPage"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
+            </View.Layout>
+
+            <View x:Name="TopBox"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              HeightSpecification="100"
+              BackgroundColor="#D3D3D3">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Center" CellPadding="30,10" />
+                </View.Layout>
+
+                <Button x:Name="AddItem" Text="Add" WidthSpecification="200" HeightSpecification="80" Clicked="AddItemClicked"/>
+                <Button x:Name="RemoveItem" Text="Remove" WidthSpecification="200" HeightSpecification="80"  Clicked="RemoveItemClicked"/>
+                <Button x:Name="RemoveAllItems" Text="Remove All" WidthSpecification="300" HeightSpecification="80"  Clicked="RemoveAllClicked"/>
+            </View>
+
+            <CollectionView x:Name="ColView"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+              ScrollingDirection="Vertical"
+              SelectionMode="Single">
+
+                <CollectionView.ItemsLayouter>
+                      <LinearLayouter />
+                </CollectionView.ItemsLayouter>
+
+            </CollectionView>
+        </View>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest10.xaml.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewObservableTestPage.xaml.cs
similarity index 91%
rename from test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest10.xaml.cs
rename to test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewObservableTestPage.xaml.cs
index af5bb53..59f13c2 100644
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest10.xaml.cs
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewObservableTestPage.xaml.cs
@@ -26,22 +26,25 @@ using Tizen.NUI.Components.Extension;
 
 namespace NUITizenGallery
 {
-    public partial class CollectionViewTest10 : ContentPage
+    public partial class CollectionViewObservableTestPage : ContentPage
     {
         int addCount = 0;
         public ObservableCollection<TestItem> source;
+
         void AddItemClicked(object sender, ClickedEventArgs e)
         {
             // Add item in the source
             source.Add(new TestItem(addCount, $"Test Item [{addCount}]", Color.Red));
             addCount++;
         }
+
         void RemoveItemClicked(object sender, ClickedEventArgs e)
         {
             // Removed selected item from the source
             if (ColView.SelectedItem != null)
                 source.Remove((TestItem)ColView.SelectedItem);
         }
+
         void RemoveAllClicked(object sender, ClickedEventArgs e)
         {
             // Remove All items in the source
@@ -49,7 +52,7 @@ namespace NUITizenGallery
             Console.WriteLine("Source clear is Clicked");
         }
 
-        public CollectionViewTest10()
+        public CollectionViewObservableTestPage()
         {
             InitializeComponent();
 
@@ -77,6 +80,9 @@ namespace NUITizenGallery
 
             if (type == DisposeTypes.Explicit)
             {
+                AddItem.Clicked -= AddItemClicked;
+                RemoveItem.Clicked -= RemoveItemClicked;
+                RemoveAllItems.Clicked -= RemoveAllClicked;
                 RemoveAllChildren(true);
             }
 
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest1.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest1.cs
new file mode 100644
index 0000000..6b286fb
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest1.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class CollectionViewTest1 : IExample
+    {
+        private Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new CollectionViewTest1Page());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest10Example.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest10Example.cs
deleted file mode 100644
index 7ff7315..0000000
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest10Example.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using Tizen.NUI;
-using Tizen.NUI.Components;
-
-namespace NUITizenGallery
-{
-    internal class CollectionViewTest10Example : IExample
-    {
-        private Window window;
-        private CollectionViewTest10 page;
-
-        public void Activate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
-            window = NUIApplication.GetDefaultWindow();
-            page = new CollectionViewTest10();
-
-            window.GetDefaultNavigator().Push(page);
-        }
-        public void Deactivate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            window.GetDefaultNavigator().Pop();
-            page = null;
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest1Example.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest1Example.cs
deleted file mode 100644
index 428ebf8..0000000
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest1Example.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using Tizen.NUI;
-using Tizen.NUI.Components;
-
-namespace NUITizenGallery
-{
-    internal class CollectionViewTest1Example : IExample
-    {
-        private Window window;
-        private CollectionViewTest1 page;
-
-        public void Activate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
-            window = NUIApplication.GetDefaultWindow();
-            page = new CollectionViewTest1();
-
-            window.GetDefaultNavigator().Push(page);
-        }
-        public void Deactivate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            window.GetDefaultNavigator().Pop();
-            page = null;
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest1Page.xaml b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest1Page.xaml
new file mode 100644
index 0000000..bd1cf58
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest1Page.xaml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.CollectionViewTest1Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="CollectionViewTest1Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
+            </View.Layout>
+
+            <View x:Name="TopBox"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              HeightSpecification="100"
+              BackgroundColor="#D3D3D3">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="10,10" />
+                </View.Layout>
+
+                <TextLabel x:Name="Title"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  PixelSize="30"
+                  HorizontalAlignment="Begin"
+                  Text="ScrollBar"/>
+                <View x:Name="RadioBox"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  HeightSpecification="60">
+
+                    <View.Layout>
+                        <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Center" CellPadding="10,10" />
+                    </View.Layout>
+
+                    <RadioButton x:Name="ShowBar" Text="Show" SelectedChanged="OnShowBarRadioChanged"/>
+                    <RadioButton x:Name="HideBar" Text="Hide" IsSelected="true"/>
+                </View>
+            </View>
+
+            <CollectionView x:Name="ColView"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+              ScrollingDirection="Horizontal"
+              ItemsSource="{Binding TestSource}"
+              SelectionMode="None">
+
+                <CollectionView.ItemsLayouter>
+                      <LinearLayouter />
+                </CollectionView.ItemsLayouter>
+
+            </CollectionView>
+        </View>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest1.xaml.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest1Page.xaml.cs
similarity index 96%
rename from test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest1.xaml.cs
rename to test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest1Page.xaml.cs
index 1bda94b..d13cd33 100644
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest1.xaml.cs
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest1Page.xaml.cs
@@ -24,14 +24,14 @@ using Tizen.NUI.Components.Extension;
 
 namespace NUITizenGallery
 {
-    public partial class CollectionViewTest1 : ContentPage
+    public partial class CollectionViewTest1Page : ContentPage
     {
         void OnShowBarRadioChanged(object sender, SelectedChangedEventArgs e)
         {
             ColView.HideScrollbar = !(e.IsSelected);
         }
 
-        public CollectionViewTest1()
+        public CollectionViewTest1Page()
         {
             InitializeComponent();
             BindingContext = new TestSourceModel();
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest2.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest2.cs
new file mode 100644
index 0000000..7e44b82
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest2.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class CollectionViewTest2 : IExample
+    {
+        private Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new CollectionViewTest2Page());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest2Example.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest2Example.cs
deleted file mode 100644
index 19033c5..0000000
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest2Example.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using Tizen.NUI;
-using Tizen.NUI.Components;
-
-namespace NUITizenGallery
-{
-    internal class CollectionViewTest2Example : IExample
-    {
-        private Window window;
-        private CollectionViewTest2 page;
-
-        public void Activate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
-            window = NUIApplication.GetDefaultWindow();
-            page = new CollectionViewTest2();
-
-            window.GetDefaultNavigator().Push(page);
-        }
-        public void Deactivate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            window.GetDefaultNavigator().Pop();
-            page = null;
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest2Page.xaml b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest2Page.xaml
new file mode 100644
index 0000000..9b1228a
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest2Page.xaml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.CollectionViewTest2Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="CollectionViewTest2Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
+            </View.Layout>
+
+            <View x:Name="TopBox"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              HeightSpecification="100"
+              BackgroundColor="#D3D3D3">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="10,10" />
+                </View.Layout>
+
+                <TextLabel x:Name="Title"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  PixelSize="30"
+                  HorizontalAlignment="Begin"
+                  Text="ScrollBar"/>
+                <View x:Name="RadioBox"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  HeightSpecification="60">
+
+                    <View.Layout>
+                        <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Center" CellPadding="10,10" />
+                    </View.Layout>
+
+                    <RadioButton x:Name="ShowBar" Text="Show" SelectedChanged="OnShowBarRadioChanged"/>
+                    <RadioButton x:Name="HideBar" Text="Hide" IsSelected="true"/>
+                </View>
+            </View>
+
+            <CollectionView x:Name="ColView"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+              ScrollingDirection="Vertical"
+              ItemsSource="{Binding TestSource}"
+              SelectionMode="None">
+
+                <CollectionView.ItemsLayouter>
+                      <LinearLayouter />
+                </CollectionView.ItemsLayouter>
+
+            </CollectionView>
+        </View>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest2.xaml.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest2Page.xaml.cs
similarity index 96%
rename from test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest2.xaml.cs
rename to test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest2Page.xaml.cs
index c8d8ac0..e0ed6ab 100644
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest2.xaml.cs
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest2Page.xaml.cs
@@ -24,14 +24,14 @@ using Tizen.NUI.Components.Extension;
 
 namespace NUITizenGallery
 {
-    public partial class CollectionViewTest2 : ContentPage
+    public partial class CollectionViewTest2Page : ContentPage
     {
         void OnShowBarRadioChanged(object sender, SelectedChangedEventArgs e)
         {
             ColView.HideScrollbar = !(e.IsSelected);
         }
 
-        public CollectionViewTest2()
+        public CollectionViewTest2Page()
         {
             InitializeComponent();
             BindingContext = new TestSourceModel();
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest3.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest3.cs
new file mode 100644
index 0000000..34af7a2
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest3.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class CollectionViewTest3 : IExample
+    {
+        private Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new CollectionViewTest3Page());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest3Example.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest3Example.cs
deleted file mode 100644
index 61524cc..0000000
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest3Example.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using Tizen.NUI;
-using Tizen.NUI.Components;
-
-namespace NUITizenGallery
-{
-    internal class CollectionViewTest3Example : IExample
-    {
-        private Window window;
-        private CollectionViewTest3 page;
-
-        public void Activate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
-            window = NUIApplication.GetDefaultWindow();
-            page = new CollectionViewTest3();
-
-            window.GetDefaultNavigator().Push(page);
-        }
-        public void Deactivate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            window.GetDefaultNavigator().Pop();
-            page = null;
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest3Page.xaml b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest3Page.xaml
new file mode 100644
index 0000000..4c4d8fd
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest3Page.xaml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.CollectionViewTest3Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="CollectionViewTest3Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <CollectionView x:Name="ColView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+          ScrollingDirection="Vertical"
+          ItemsSource="{Binding TestSource}"
+          SelectionMode="None">
+
+            <CollectionView.ItemsLayouter>
+                  <GridLayouter />
+            </CollectionView.ItemsLayouter>
+
+        </CollectionView>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest3.xaml.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest3Page.xaml.cs
similarity index 96%
rename from test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest3.xaml.cs
rename to test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest3Page.xaml.cs
index c61d428..73fbe91 100644
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest3.xaml.cs
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest3Page.xaml.cs
@@ -24,9 +24,9 @@ using Tizen.NUI.Components.Extension;
 
 namespace NUITizenGallery
 {
-    public partial class CollectionViewTest3 : ContentPage
+    public partial class CollectionViewTest3Page : ContentPage
     {
-        public CollectionViewTest3()
+        public CollectionViewTest3Page()
         {
             InitializeComponent();
             BindingContext = new TestSourceModel();
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest4.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest4.cs
new file mode 100644
index 0000000..5a3014d
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest4.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class CollectionViewTest4 : IExample
+    {
+        private Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new CollectionViewTest4Page());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest4Example.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest4Example.cs
deleted file mode 100644
index 6d7845e..0000000
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest4Example.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using Tizen.NUI;
-using Tizen.NUI.Components;
-
-namespace NUITizenGallery
-{
-    internal class CollectionViewTest4Example : IExample
-    {
-        private Window window;
-        private CollectionViewTest4 page;
-
-        public void Activate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
-            window = NUIApplication.GetDefaultWindow();
-            page = new CollectionViewTest4();
-
-            window.GetDefaultNavigator().Push(page);
-        }
-        public void Deactivate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            window.GetDefaultNavigator().Pop();
-            page = null;
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest4Page.xaml b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest4Page.xaml
new file mode 100644
index 0000000..02e047e
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest4Page.xaml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.CollectionViewTest4Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="CollectionViewTest4Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
+            </View.Layout>
+
+            <View x:Name="TopBox"
+                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                    HeightSpecification="100"
+              BackgroundColor="#D3D3D3">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="10,10" />
+                </View.Layout>
+
+                <TextLabel x:Name="Title"
+                             WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                             PixelSize="30"
+                             HorizontalAlignment="Begin"
+                             Text="ScrollBar"/>
+
+                <View x:Name="RadioBox"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  HeightSpecification="60">
+
+                    <View.Layout>
+                        <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Center" CellPadding="10,10" />
+                    </View.Layout>
+
+                    <RadioButton x:Name="Linear" Text="Linear" IsSelected="true"/>
+                    <RadioButton x:Name="Grid" Text="Grid"  SelectedChanged="OnGridLayouterRadioChanged"/>
+                </View>
+            </View>
+
+            <CollectionView x:Name="ColView"
+                              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                              HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                              ScrollingDirection="Vertical"
+                              ItemsSource="{Binding TestSource}"
+                              SelectionMode="None">
+
+                <CollectionView.ItemsLayouter>
+                      <LinearLayouter />
+                </CollectionView.ItemsLayouter>
+
+            </CollectionView>
+        </View>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest4.xaml.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest4Page.xaml.cs
similarity index 97%
rename from test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest4.xaml.cs
rename to test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest4Page.xaml.cs
index 530f5a4..7218a71 100644
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest4.xaml.cs
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest4Page.xaml.cs
@@ -24,7 +24,7 @@ using Tizen.NUI.Components.Extension;
 
 namespace NUITizenGallery
 {
-    public partial class CollectionViewTest4 : ContentPage
+    public partial class CollectionViewTest4Page : ContentPage
     {
         DataTemplate LinearTemplate = new DataTemplate(() =>
         {
@@ -81,7 +81,7 @@ namespace NUITizenGallery
             }
         }
 
-        public CollectionViewTest4()
+        public CollectionViewTest4Page()
         {
             InitializeComponent();
             BindingContext = new TestSourceModel();
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest5.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest5.cs
new file mode 100644
index 0000000..8b944eb
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest5.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class CollectionViewTest5 : IExample
+    {
+        private Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new CollectionViewTest5Page());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest5Example.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest5Example.cs
deleted file mode 100644
index 9f9437c..0000000
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest5Example.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using Tizen.NUI;
-using Tizen.NUI.Components;
-
-namespace NUITizenGallery
-{
-    internal class CollectionViewTest5Example : IExample
-    {
-        private Window window;
-        private CollectionViewTest5 page;
-
-        public void Activate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
-            window = NUIApplication.GetDefaultWindow();
-            page = new CollectionViewTest5();
-
-            window.GetDefaultNavigator().Push(page);
-        }
-        public void Deactivate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            window.GetDefaultNavigator().Pop();
-            page = null;
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest5Page.xaml b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest5Page.xaml
new file mode 100644
index 0000000..eed39e7
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest5Page.xaml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.CollectionViewTest5Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="CollectionViewTest5Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
+            </View.Layout>
+
+            <View x:Name="TopBox"
+                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                    HeightSpecification="120"
+                    BackgroundColor="#D3D3D3">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="10,10" />
+                </View.Layout>
+
+                <TextLabel x:Name="Title"
+                             WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                             PixelSize="20"
+                             HorizontalAlignment="Begin"
+                             Text="Selection"/>
+                <Button x:Name="SelectButton" HeightSpecification="60" Text="Select 10" Clicked="OnSelect10Clicked"/>
+            </View>
+
+            <CollectionView x:Name="ColView"
+                              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                              HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                              ScrollingDirection="Horizontal"
+                              SelectionMode="SingleAlways"
+                              SelectionChanged="OnSelectionChanged">
+
+                <CollectionView.ItemsLayouter>
+                      <LinearLayouter />
+                </CollectionView.ItemsLayouter>
+
+            </CollectionView>
+        </View>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest5.xaml.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest5Page.xaml.cs
similarity index 97%
rename from test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest5.xaml.cs
rename to test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest5Page.xaml.cs
index 0a811aa..11be8f3 100644
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest5.xaml.cs
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest5Page.xaml.cs
@@ -25,7 +25,7 @@ using Tizen.NUI.Components.Extension;
 
 namespace NUITizenGallery
 {
-    public partial class CollectionViewTest5 : ContentPage
+    public partial class CollectionViewTest5Page : ContentPage
     {
         TestItem item10;
         ObservableCollection<TestItem> source;
@@ -64,7 +64,7 @@ namespace NUITizenGallery
             DialogPage.ShowAlertDialog("Selected", message, btn);
         }
 
-        public CollectionViewTest5()
+        public CollectionViewTest5Page()
         {
             InitializeComponent();
             var MyModel = new TestSourceModel();
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest6.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest6.cs
new file mode 100644
index 0000000..78c14e3
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest6.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class CollectionViewTest6 : IExample
+    {
+        private Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new CollectionViewTest6Page());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest6Example.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest6Example.cs
deleted file mode 100644
index 1740838..0000000
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest6Example.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using Tizen.NUI;
-using Tizen.NUI.Components;
-
-namespace NUITizenGallery
-{
-    internal class CollectionViewTest6Example : IExample
-    {
-        private Window window;
-        private CollectionViewTest6 page;
-
-        public void Activate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
-            window = NUIApplication.GetDefaultWindow();
-            page = new CollectionViewTest6();
-
-            window.GetDefaultNavigator().Push(page);
-        }
-        public void Deactivate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            window.GetDefaultNavigator().Pop();
-            page = null;
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest6Page.xaml b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest6Page.xaml
new file mode 100644
index 0000000..5be4e80
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest6Page.xaml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.CollectionViewTest6Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="CollectionViewTest6Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
+            </View.Layout>
+
+            <View x:Name="TopBox"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              HeightSpecification="90"
+              BackgroundColor="#D3D3D3">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Center" CellPadding="10,10" />
+                </View.Layout>
+
+                <Button x:Name="HeaderBtn" WidthSpecification="100" HeightSpecification="60" Text="H" Clicked="HeaderBtnClicked"/>
+                <Button x:Name="FooterBtn" WidthSpecification="100" HeightSpecification="60" Text="F" Clicked="FooterBtnClicked"/>
+                <Button x:Name="LayouterBtn" WidthSpecification="300" HeightSpecification="60" Text="Layouter" Clicked="LayouterBtnClicked"/>
+                <Button x:Name="SourceBtn" WidthSpecification="150" HeightSpecification="60" Text="Src" Clicked="SrcBtnClicked"/>
+            </View>
+
+            <View x:Name="ContentBox"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+              BackgroundColor="White">
+
+                <View.Layout>
+                    <AbsoluteLayout />
+                </View.Layout>
+
+                <TextLabel x:Name="EmptyContent"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  Text="No items found"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center" />
+                <CollectionView x:Name="ColView"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  ScrollingDirection="Vertical"
+                  SelectionMode="None">
+
+                    <CollectionView.ItemsLayouter>
+                        <LinearLayouter />
+                    </CollectionView.ItemsLayouter>
+
+                </CollectionView>
+            </View>
+        </View>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest6.xaml.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest6Page.xaml.cs
similarity index 98%
rename from test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest6.xaml.cs
rename to test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest6Page.xaml.cs
index e7a9020..6345c4a 100644
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest6.xaml.cs
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest6Page.xaml.cs
@@ -25,7 +25,7 @@ using Tizen.NUI.Components.Extension;
 
 namespace NUITizenGallery
 {
-    public partial class CollectionViewTest6 : ContentPage
+    public partial class CollectionViewTest6Page : ContentPage
     {
         DataTemplate LinearTemplate = new DataTemplate(() =>
         {
@@ -167,7 +167,7 @@ namespace NUITizenGallery
         }
 
 
-        public CollectionViewTest6()
+        public CollectionViewTest6Page()
         {
             InitializeComponent();
 
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest7.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest7.cs
new file mode 100644
index 0000000..2353089
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest7.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class CollectionViewTest7 : IExample
+    {
+        private Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new CollectionViewTest7Page());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest7Example.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest7Example.cs
deleted file mode 100644
index 5aab51b..0000000
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest7Example.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using Tizen.NUI;
-using Tizen.NUI.Components;
-
-namespace NUITizenGallery
-{
-    internal class CollectionViewTest7Example : IExample
-    {
-        private Window window;
-        private CollectionViewTest7 page;
-
-        public void Activate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
-            window = NUIApplication.GetDefaultWindow();
-            page = new CollectionViewTest7();
-
-            window.GetDefaultNavigator().Push(page);
-        }
-        public void Deactivate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            window.GetDefaultNavigator().Pop();
-            page = null;
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest7Page.xaml b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest7Page.xaml
new file mode 100644
index 0000000..34de9aa
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest7Page.xaml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.CollectionViewTest7Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="CollectionViewTest7Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
+            </View.Layout>
+
+            <TextLabel x:Name="Title"
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                         HeightSpecification="90"
+                         Text="Infinite scroll"
+                         PixelSize="20"
+                         HorizontalAlignment="Begin"
+                         VerticalAlignment="Center"
+                         BackgroundColor="White"/>
+
+            <CollectionView x:Name="ColView"
+                              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                              HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                              ScrollingDirection="Vertical"
+                              HideScrollbar="false"
+                              ItemsSource="{Binding TestSource}"
+                              SelectionMode="None">
+
+                <CollectionView.ItemsLayouter>
+                    <LinearLayouter />
+                </CollectionView.ItemsLayouter>
+
+            </CollectionView>
+        </View>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest7.xaml.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest7Page.xaml.cs
similarity index 97%
rename from test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest7.xaml.cs
rename to test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest7Page.xaml.cs
index 47a2621..a4467ff 100644
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest7.xaml.cs
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest7Page.xaml.cs
@@ -25,7 +25,7 @@ using Tizen.NUI.Components.Extension;
 
 namespace NUITizenGallery
 {
-    public partial class CollectionViewTest7 : ContentPage
+    public partial class CollectionViewTest7Page : ContentPage
     {
         void OnScrolling(object sender, ScrollEventArgs e)
         {
@@ -47,7 +47,7 @@ namespace NUITizenGallery
             }
         }
 
-        public CollectionViewTest7()
+        public CollectionViewTest7Page()
         {
             InitializeComponent();
             BindingContext = new TestSourceModel(40);
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest8.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest8.cs
new file mode 100644
index 0000000..750a5e8
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest8.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class CollectionViewTest8 : IExample
+    {
+        private Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new CollectionViewTest8Page());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest8Example.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest8Example.cs
deleted file mode 100644
index b3e02f4..0000000
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest8Example.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using Tizen.NUI;
-using Tizen.NUI.Components;
-
-namespace NUITizenGallery
-{
-    internal class CollectionViewTest8Example : IExample
-    {
-        private Window window;
-        private CollectionViewTest8 page;
-
-        public void Activate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
-            window = NUIApplication.GetDefaultWindow();
-            page = new CollectionViewTest8();
-
-            window.GetDefaultNavigator().Push(page);
-        }
-        public void Deactivate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            window.GetDefaultNavigator().Pop();
-            page = null;
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest8Page.xaml b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest8Page.xaml
new file mode 100644
index 0000000..7a7f431
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest8Page.xaml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.CollectionViewTest8Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="CollectionViewTest8Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+          <View.Layout>
+              <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
+          </View.Layout>
+
+          <TextLabel x:Name="Title"
+                       WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                       HeightSpecification="90"
+                       Text="Style Control State Test"
+                       PixelSize="20"
+                       HorizontalAlignment="Begin"
+                       VerticalAlignment="Center"
+                       BackgroundColor="White"/>
+
+          <CollectionView x:Name="ColView"
+                            WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                            HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                            ScrollingDirection="Horizontal"
+                            ItemsSource="{Binding TestSource}"
+                            SelectionMode="Multiple">
+
+              <CollectionView.ItemsLayouter>
+                  <LinearLayouter />
+              </CollectionView.ItemsLayouter>
+
+          </CollectionView>
+      </View>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest8.xaml.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest8Page.xaml.cs
similarity index 96%
rename from test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest8.xaml.cs
rename to test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest8Page.xaml.cs
index d81a3cc..621c30c 100644
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest8.xaml.cs
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest8Page.xaml.cs
@@ -25,9 +25,9 @@ using Tizen.NUI.Components.Extension;
 
 namespace NUITizenGallery
 {
-    public partial class CollectionViewTest8 : ContentPage
+    public partial class CollectionViewTest8Page : ContentPage
     {
-        public CollectionViewTest8()
+        public CollectionViewTest8Page()
         {
             InitializeComponent();
             BindingContext = new TestSourceModel(40);
@@ -67,7 +67,7 @@ namespace NUITizenGallery
         protected override void Dispose(DisposeTypes type)
         {
             if (Disposed)
-            {
+            { 
                 return;
             }
 
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest9.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest9.cs
new file mode 100644
index 0000000..a9f82f7
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest9.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class CollectionViewTest9 : IExample
+    {
+        private Window window;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            window.GetDefaultNavigator().Push(new CollectionViewTest9Page());
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            window.GetDefaultNavigator().Pop();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest9Example.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest9Example.cs
deleted file mode 100644
index f1030a5..0000000
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest9Example.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright(c) 2021 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using Tizen.NUI;
-using Tizen.NUI.Components;
-
-namespace NUITizenGallery
-{
-    internal class CollectionViewTest9Example : IExample
-    {
-        private Window window;
-        private CollectionViewTest9 page;
-
-        public void Activate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
-            window = NUIApplication.GetDefaultWindow();
-            page = new CollectionViewTest9();
-
-            window.GetDefaultNavigator().Push(page);
-        }
-        public void Deactivate()
-        {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            window.GetDefaultNavigator().Pop();
-            page = null;
-        }
-    }
-}
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest9Page.xaml b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest9Page.xaml
new file mode 100644
index 0000000..64182ed
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest9Page.xaml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.CollectionViewTest9Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="CollectionViewTest9Page"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <CollectionView x:Name="ColView"
+                          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                          HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                          ScrollingDirection="Vertical"
+                          SelectionMode="Multiple"
+                          SelectionChanged="OnSelectionChanged"
+                          ItemsSource="{Binding TestSource}"
+                          IsGrouped="true">
+
+            <CollectionView.ItemsLayouter>
+                  <LinearLayouter />
+            </CollectionView.ItemsLayouter>
+
+        </CollectionView>
+        </ContentPage.Content>
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest9.xaml.cs b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest9Page.xaml.cs
similarity index 97%
rename from test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest9.xaml.cs
rename to test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest9Page.xaml.cs
index aa62204..1b9d763 100644
--- a/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest9.xaml.cs
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/CollectionViewTest9Page.xaml.cs
@@ -26,7 +26,7 @@ using Tizen.NUI.Components.Extension;
 
 namespace NUITizenGallery
 {
-    public partial class CollectionViewTest9 : ContentPage
+    public partial class CollectionViewTest9Page : ContentPage
     {
         void OnCheckClicked(object sender, ClickedEventArgs e)
         {
@@ -59,7 +59,7 @@ namespace NUITizenGallery
             }
         }
 
-        public CollectionViewTest9()
+        public CollectionViewTest9Page()
         {
             InitializeComponent();
             BindingContext = new GroupTestSourceModel(5, 5);
diff --git a/test/NUITizenGallery/Examples/CollectionViewTest/TestSource.cs b/test/NUITizenGallery/Examples/CollectionViewTest/TestSource.cs
index 979be75..2582532 100644
--- a/test/NUITizenGallery/Examples/CollectionViewTest/TestSource.cs
+++ b/test/NUITizenGallery/Examples/CollectionViewTest/TestSource.cs
@@ -11,6 +11,8 @@ public class TestItem : INotifyPropertyChanged
     string name;
     Color color;
     bool isSelected;
+    readonly string ResourcePath = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "/images/flags/";
+
     public event PropertyChangedEventHandler PropertyChanged;
     private void OnPropertyChanged(string propertyName) { PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); }
     public TestItem(int itemIndex, string itemName, Color itemColor) {  Index = itemIndex; Name = itemName; BgColor = itemColor; IsSelected=false; }
@@ -34,6 +36,11 @@ public class TestItem : INotifyPropertyChanged
         get => isSelected;
         set { isSelected = value; OnPropertyChanged("IsSelected");}
     }
+
+    public string FlagIconPath
+    {
+        get => ResourcePath+"flag_"+(index % 50)+".png";
+    }
 }
 
 public class GroupItem : ObservableCollection<TestItem>
diff --git a/test/NUITizenGallery/Examples/ContentPageTest/ContentPageTest.cs b/test/NUITizenGallery/Examples/ContentPageTest/ContentPageTest.cs
index 8491872..8aedbf8 100644
--- a/test/NUITizenGallery/Examples/ContentPageTest/ContentPageTest.cs
+++ b/test/NUITizenGallery/Examples/ContentPageTest/ContentPageTest.cs
@@ -24,7 +24,6 @@ namespace NUITizenGallery
     {
         Window window;
         Navigator navigator;
-        ContentPageTestPage1 page;
         int pageCount = 0;
 
         public void Activate()
@@ -33,11 +32,8 @@ namespace NUITizenGallery
 
             window = NUIApplication.GetDefaultWindow();
             navigator = window.GetDefaultNavigator();
-
             pageCount = navigator.PageCount;
-
-            page = new ContentPageTestPage1();
-            navigator.Push(page);
+            window.GetDefaultNavigator().Push(new ContentPageTestPage1());
         }
 
         public void Deactivate()
diff --git a/test/NUITizenGallery/Examples/ContentPageTest/ContentPageTestPage1.xaml b/test/NUITizenGallery/Examples/ContentPageTest/ContentPageTestPage1.xaml
new file mode 100644
index 0000000..e262ee6
--- /dev/null
+++ b/test/NUITizenGallery/Examples/ContentPageTest/ContentPageTestPage1.xaml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.ContentPageTestPage1"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="ContentPageTestPage1"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <Button x:Name="button"
+                  Text="ONE"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" />
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/ContentPageTest/ContentPageTestPage2.xaml b/test/NUITizenGallery/Examples/ContentPageTest/ContentPageTestPage2.xaml
new file mode 100644
index 0000000..3edc8ae
--- /dev/null
+++ b/test/NUITizenGallery/Examples/ContentPageTest/ContentPageTestPage2.xaml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.ContentPageTestPage2"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="ContentPageTestPage2"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <Button x:Name="button"
+                  Text="TWO"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" />
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CustomCellTest/CustomCellListItem.cs b/test/NUITizenGallery/Examples/CustomCellTest/CustomCellListItem.cs
index 4e49c40..86abd74 100644
--- a/test/NUITizenGallery/Examples/CustomCellTest/CustomCellListItem.cs
+++ b/test/NUITizenGallery/Examples/CustomCellTest/CustomCellListItem.cs
@@ -32,7 +32,7 @@ namespace NUITizenGallery
             TextContent.TextColor = Color.Gray;
             TextContent.MultiLine = true;
             TextContent.Text = "ABCDEFG\nBVGFGH!!!\nASDASD";
-            
+
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/CustomCellTest/CustomCellListItem.xaml b/test/NUITizenGallery/Examples/CustomCellTest/CustomCellListItem.xaml
new file mode 100644
index 0000000..faac0b9
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CustomCellTest/CustomCellListItem.xaml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<View x:Class="NUITizenGallery.CustomCellListItem"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  Size2D="720, 250">
+
+    <ImageView x:Name="Image" Size2D="50,50" Position2D="25,50"/>
+    <TextLabel x:Name="Title" Text="Not set" PointSize="14" Size2D="550, 70" Position2D="100,0"/>
+    <TextLabel x:Name="TextContent" Text="Not set" PointSize="10" Size2D="550, 180" Position2D="100, 70"/>
+    <CheckBox x:Name="Check" Position2D="640, 50"/>
+</View>
diff --git a/test/NUITizenGallery/Examples/CustomCellTest/CustomCellTest.cs b/test/NUITizenGallery/Examples/CustomCellTest/CustomCellTest.cs
index b3ff764..5678897 100644
--- a/test/NUITizenGallery/Examples/CustomCellTest/CustomCellTest.cs
+++ b/test/NUITizenGallery/Examples/CustomCellTest/CustomCellTest.cs
@@ -21,24 +21,20 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    internal class CustomCellTestP: IExample
+    internal class CustomCellTest : IExample
     {
         Window window;
-        CustomCellTestPage page;
 
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
             window = NUIApplication.GetDefaultWindow();
-
-            page = new CustomCellTestPage();
-            window.Add(page);
+            window.GetDefaultNavigator().Push(new CustomCellTestPage());
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/CustomCellTest/CustomCellTestPage.xaml b/test/NUITizenGallery/Examples/CustomCellTest/CustomCellTestPage.xaml
new file mode 100644
index 0000000..33916ce
--- /dev/null
+++ b/test/NUITizenGallery/Examples/CustomCellTest/CustomCellTestPage.xaml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.CustomCellTestPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="CustomCellTestPage"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <ScrollableBase x:Name="ListView"
+                          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <ScrollableBase.Layout>
+                <LinearLayout LinearOrientation="Vertical" CellPadding="5,5" LinearAlignment="Center"/>
+            </ScrollableBase.Layout>
+
+        </ScrollableBase>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/Examples/CustomCellTest/CustomCellTestPage.xaml.cs b/test/NUITizenGallery/Examples/CustomCellTest/CustomCellTestPage.xaml.cs
index abd61c9..d45b9d4 100644
--- a/test/NUITizenGallery/Examples/CustomCellTest/CustomCellTestPage.xaml.cs
+++ b/test/NUITizenGallery/Examples/CustomCellTest/CustomCellTestPage.xaml.cs
@@ -20,33 +20,15 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class CustomCellTestPage : View
+    public partial class CustomCellTestPage : ContentPage
     {
         private readonly int ScrollTime = 500;
         private readonly int TestItems = 20;
+
         public CustomCellTestPage()
         {
             InitializeComponent();
-
-            //Application Linear Layout
-            LinearLayout layout = new LinearLayout();
-            layout.LinearOrientation = LinearLayout.Orientation.Vertical;
-            layout.LinearAlignment = LinearLayout.Alignment.Center;
-            layout.Padding = new Extents(5, 5, 5, 5);
-            layout.CellPadding = new Size2D(5, 5);
-            this.Layout = layout;
-
-            ListView.BackgroundColor = Color.White;
-            ListView.Size2D = new Size2D(720, 1280);
-
-            //Set linear layout for scrollable widget
-            LinearLayout scrollLayout = new LinearLayout();
-            scrollLayout.LinearOrientation = LinearLayout.Orientation.Vertical;
-            scrollLayout.LinearAlignment = LinearLayout.Alignment.Center;
-            scrollLayout.CellPadding = new Size2D(5, 5);
-            ListView.Layout = scrollLayout;
             ListView.ScrollDuration = ScrollTime;
-            this.Add(ListView);
 
             var items = new CustomCellListItem[TestItems];
             for (int i = 0; i < TestItems; i++) {
diff --git a/test/NUITizenGallery/Examples/DatePickerTest/DatePickerTest.cs b/test/NUITizenGallery/Examples/DatePickerTest/DatePickerTest.cs
index bfc558a..c0a3313 100644
--- a/test/NUITizenGallery/Examples/DatePickerTest/DatePickerTest.cs
+++ b/test/NUITizenGallery/Examples/DatePickerTest/DatePickerTest.cs
@@ -7,21 +7,18 @@ namespace NUITizenGallery
     internal class DatePickerTest : IExample
     {
         private Window window;
-        private DatePickerTestPage page;
+
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
 
             window = NUIApplication.GetDefaultWindow();
-            page = new DatePickerTestPage();
-
-            window.GetDefaultNavigator().Push(page);
+            window.GetDefaultNavigator().Push( new DatePickerTestPage());
         }
         public void Deactivate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
             window.GetDefaultNavigator().Pop();
-            page = null;
         }
     }
 }
diff --git a/test/NUITizenGallery/Examples/DatePickerTest/DatePickerTestPage.xaml b/test/NUITizenGallery/Examples/DatePickerTest/DatePickerTestPage.xaml
new file mode 100644
index 0000000..216f089
--- /dev/null
+++ b/test/NUITizenGallery/Examples/DatePickerTest/DatePickerTestPage.xaml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.DatePickerTestPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+  ParentOrigin="Center"
+  PivotPoint="Center"
+  PositionUsesPivotPoint="true"
+  BackgroundColor="White">
+
+    <!-- AppBar is top-side bar with navigation content, title, and action. If you not set any contents, back button is automatically added. -->
+    <ContentPage.AppBar>
+        <AppBar x:Name="appBar" Title="DatePickerTestPage"/>
+    </ContentPage.AppBar>
+
+    <!-- Content is main placdeholder of ContentPage. Add your content into this view. -->
+    <ContentPage.Content>
+        <View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+              <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterHorizontal" CellPadding="30,30"/>
+            </View.Layout>
+
+            <TextLabel x:Name="text1"
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                         HeightSpecification="100"
+                         HorizontalAlignment="Center"
+                         VerticalAlignment="Center" />
+            <Button x:Name="dateButton"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      HeightSpecification="80"
+                      Text="Date Picker" />
+            <Button x:Name="setMinButton"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      HeightSpecification="80"
+                      Text="Set Min Date" />
+            <Button x:Name="setMaxButton"
+                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                      HeightSpecification="80"
+                      Text="Set Max Date" />
+        </View>
+    </ContentPage.Content>
+</ContentPage>
\ No newline at end of file
diff --git a/test/NUITizenGallery/Examples/DatePickerTest/DatePickerTest.xaml.cs b/test/NUITizenGallery/Examples/DatePickerTest/DatePickerTestPage.xaml.cs
similarity index 100%
rename from test/NUITizenGallery/Examples/DatePickerTest/DatePickerTest.xaml.cs
rename to test/NUITizenGallery/Examples/DatePickerTest/DatePickerTestPage.xaml.cs
diff --git a/test/NUITizenGallery/Examples/FlexTest5/FlexTest5.cs b/test/NUITizenGallery/Examples/FlexTest5/FlexTest5.cs
new file mode 100644
index 0000000..7264df4
--- /dev/null
+++ b/test/NUITizenGallery/Examples/FlexTest5/FlexTest5.cs
@@ -0,0 +1,47 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+
+namespace NUITizenGallery
+{
+    internal class FlexTest5 : IExample
+    {
+        private Window window;
+        private FlexTest5Page page;
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            page = new FlexTest5Page();
+            page.PositionUsesPivotPoint = true;
+            page.ParentOrigin = ParentOrigin.Center;
+            page.PivotPoint = PivotPoint.Center;
+            page.HeightResizePolicy = ResizePolicyType.FillToParent;
+            page.WidthResizePolicy = ResizePolicyType.FillToParent;
+            window.Add(page);
+
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            page.Unparent();
+            page.Dispose();
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/FlexTest5/FlexTest5.xaml.cs b/test/NUITizenGallery/Examples/FlexTest5/FlexTest5.xaml.cs
new file mode 100644
index 0000000..b7ea8fd
--- /dev/null
+++ b/test/NUITizenGallery/Examples/FlexTest5/FlexTest5.xaml.cs
@@ -0,0 +1,28 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using Tizen.NUI.BaseComponents;
+
+namespace NUITizenGallery
+{
+    public partial class FlexTest5Page : View
+    {
+        public FlexTest5Page()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/NUITizenGallery/Examples/BindingTest1/BindingTest1.cs b/test/NUITizenGallery/Examples/FrameLayoutTest2/FrameLayoutTest2.cs
similarity index 89%
rename from test/NUITizenGallery/Examples/BindingTest1/BindingTest1.cs
rename to test/NUITizenGallery/Examples/FrameLayoutTest2/FrameLayoutTest2.cs
index 67f54d0..6eb4c12 100644
--- a/test/NUITizenGallery/Examples/BindingTest1/BindingTest1.cs
+++ b/test/NUITizenGallery/Examples/FrameLayoutTest2/FrameLayoutTest2.cs
@@ -19,16 +19,16 @@ using Tizen.NUI;
 
 namespace NUITizenGallery
 {
-    internal class BindingTest1 : IExample
+    internal class FrameLayoutTest2 : IExample
     {
         Window window;
-        private BindingTest1Page page;
+        FrameLayoutTest2Page page;
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
 
             window = NUIApplication.GetDefaultWindow();
-            page = new BindingTest1Page();
+            page = new FrameLayoutTest2Page();
 
             window.Add(page);
         }
diff --git a/test/NUITizenGallery/Examples/FrameLayoutTest2/FrameLayoutTest2Page.xaml.cs b/test/NUITizenGallery/Examples/FrameLayoutTest2/FrameLayoutTest2Page.xaml.cs
new file mode 100644
index 0000000..2d2ddff
--- /dev/null
+++ b/test/NUITizenGallery/Examples/FrameLayoutTest2/FrameLayoutTest2Page.xaml.cs
@@ -0,0 +1,75 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+
+namespace NUITizenGallery
+{
+    public partial class FrameLayoutTest2Page : View
+    {
+        public FrameLayoutTest2Page()
+        {
+            InitializeComponent();
+            layout.SetPadding(new PaddingType(10f, 10f, 10f, 10f));
+        }
+
+        protected override void Dispose(DisposeTypes type)
+        {
+            if (Disposed)
+            {
+                return;
+            }
+
+            if (type == DisposeTypes.Explicit)
+            {
+                RemoveAllChildren(true);
+            }
+
+            base.Dispose(type);
+        }
+
+        private void RemoveAllChildren(bool dispose = false)
+        {
+            RecursiveRemoveChildren(this, dispose);
+        }
+
+        private void RecursiveRemoveChildren(View parent, bool dispose)
+        {
+            if (parent == null)
+            {
+                return;
+            }
+
+            int maxChild = (int)parent.ChildCount;
+            for (int i = maxChild - 1; i >= 0; --i)
+            {
+                View child = parent.GetChildAt((uint)i);
+                if (child == null)
+                {
+                    continue;
+                }
+
+                RecursiveRemoveChildren(child, dispose);
+                parent.Remove(child);
+                if (dispose)
+                {
+                    child.Dispose();
+                }
+            }
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/GridTest3/GridTest3.cs b/test/NUITizenGallery/Examples/GridTest3/GridTest3.cs
new file mode 100755
index 0000000..fd1fa7d
--- /dev/null
+++ b/test/NUITizenGallery/Examples/GridTest3/GridTest3.cs
@@ -0,0 +1,42 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class GridTest3 : IExample
+    {
+        private Window window;
+        private GridTest3Page page;
+        public void Activate()
+        {
+            window = NUIApplication.GetDefaultWindow();
+            page = new GridTest3Page();
+            window.GetDefaultNavigator().Push(page);
+        }
+
+        public void Deactivate()
+        {
+            window.GetDefaultNavigator().Pop();
+            page = null;
+        }
+    }
+}
+
diff --git a/test/NUITizenGallery/Examples/GridTest3/GridTest3.xaml.cs b/test/NUITizenGallery/Examples/GridTest3/GridTest3.xaml.cs
new file mode 100755
index 0000000..91d3341
--- /dev/null
+++ b/test/NUITizenGallery/Examples/GridTest3/GridTest3.xaml.cs
@@ -0,0 +1,120 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    public partial class GridTest3Page : ContentPage
+    {
+        public GridTest3Page()
+        {
+            InitializeComponent();
+            var btnStyle = new ButtonStyle();
+            var btnStyle1 = new ButtonStyle();
+            var btnStyle2 = new ButtonStyle();
+            var btnStyle3 = new ButtonStyle();
+            btnStyle.BackgroundColor = new Selector<Tizen.NUI.Color>
+            {
+                Normal = Tizen.NUI.Color.Blue,
+                Pressed = Tizen.NUI.Color.DarkBlue,
+            };
+            btnStyle1.BackgroundColor = new Selector<Tizen.NUI.Color>
+            {
+                Normal = Tizen.NUI.Color.Red,
+                Pressed = Tizen.NUI.Color.DarkRed,
+            };
+            btnStyle2.BackgroundColor = new Selector<Tizen.NUI.Color>
+            {
+                Normal = Tizen.NUI.Color.LightSeaGreen,
+                Pressed = Tizen.NUI.Color.SeaGreen,
+            };
+            btnStyle3.BackgroundColor = new Selector<Tizen.NUI.Color>
+            {
+                Normal = Tizen.NUI.Color.Yellow,
+                Pressed = Tizen.NUI.Color.Orange,
+            };
+
+            btnClear.ApplyStyle(btnStyle);
+            btnUp.ApplyStyle(btnStyle);
+            btnProc.ApplyStyle(btnStyle);
+            btnDiv.ApplyStyle(btnStyle);
+            btnMultiply.ApplyStyle(btnStyle);
+            btnMinus.ApplyStyle(btnStyle);
+            btnPlus.ApplyStyle(btnStyle);
+            btnDot.ApplyStyle(btnStyle3);
+            btnEqual.ApplyStyle(btnStyle1);
+            btn0.ApplyStyle(btnStyle2);
+            btn1.ApplyStyle(btnStyle2);
+            btn2.ApplyStyle(btnStyle2);
+            btn3.ApplyStyle(btnStyle2);
+            btn4.ApplyStyle(btnStyle2);
+            btn5.ApplyStyle(btnStyle2);
+            btn6.ApplyStyle(btnStyle2);
+            btn7.ApplyStyle(btnStyle2);
+            btn8.ApplyStyle(btnStyle2);
+            btn9.ApplyStyle(btnStyle2);
+        }
+        protected override void Dispose(DisposeTypes type)
+        {
+            if (Disposed)
+            {
+                return;
+            }
+
+            if (type == DisposeTypes.Explicit)
+            {
+                RemoveAllChildren(true);
+            }
+
+            base.Dispose(type);
+        }
+
+        private void RemoveAllChildren(bool dispose = false)
+        {
+            RecursiveRemoveChildren(this, dispose);
+        }
+
+        private void RecursiveRemoveChildren(View parent, bool dispose)
+        {
+            if (parent == null)
+            {
+                return;
+            }
+
+            int maxChild = (int)parent.ChildCount;
+            for (int i = maxChild - 1; i >= 0; --i)
+            {
+                View child = parent.GetChildAt((uint)i);
+                if (child == null)
+                {
+                    continue;
+                }
+
+                RecursiveRemoveChildren(child, dispose);
+                parent.Remove(child);
+                if (dispose)
+                {
+                    child.Dispose();
+                }
+            }
+        }
+    }
+}
+
diff --git a/test/NUITizenGallery/Examples/GridTest4/GridTest4.cs b/test/NUITizenGallery/Examples/GridTest4/GridTest4.cs
new file mode 100755
index 0000000..f5a738e
--- /dev/null
+++ b/test/NUITizenGallery/Examples/GridTest4/GridTest4.cs
@@ -0,0 +1,42 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class GridTest4 : IExample
+    {
+        private Window window;
+        private GridTest4Page page;
+        public void Activate()
+        {
+            window = NUIApplication.GetDefaultWindow();
+            page = new GridTest4Page();
+            window.GetDefaultNavigator().Push(page);
+        }
+
+        public void Deactivate()
+        {
+            window.GetDefaultNavigator().Pop();
+            page = null; ;
+        }
+    }
+}
+
diff --git a/test/NUITizenGallery/Examples/GridTest4/GridTest4.xaml.cs b/test/NUITizenGallery/Examples/GridTest4/GridTest4.xaml.cs
new file mode 100755
index 0000000..bd80bae
--- /dev/null
+++ b/test/NUITizenGallery/Examples/GridTest4/GridTest4.xaml.cs
@@ -0,0 +1,81 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    public partial class GridTest4Page : ContentPage
+    {
+        public GridTest4Page()
+        {
+            InitializeComponent();
+            btn2.BackgroundColor = Color.Gray;
+            btn3.BackgroundColor = Color.Yellow;
+            btn4.BackgroundColor = Color.Green;
+            btn4.TextColor = Color.Pink;
+            btn5.BackgroundColor = Color.Purple;
+        }
+        protected override void Dispose(DisposeTypes type)
+        {
+            if (Disposed)
+            {
+                return;
+            }
+
+            if (type == DisposeTypes.Explicit)
+            {
+                RemoveAllChildren(true);
+            }
+
+            base.Dispose(type);
+        }
+
+        private void RemoveAllChildren(bool dispose = false)
+        {
+            RecursiveRemoveChildren(this, dispose);
+        }
+
+        private void RecursiveRemoveChildren(View parent, bool dispose)
+        {
+            if (parent == null)
+            {
+                return;
+            }
+
+            int maxChild = (int)parent.ChildCount;
+            for (int i = maxChild - 1; i >= 0; --i)
+            {
+                View child = parent.GetChildAt((uint)i);
+                if (child == null)
+                {
+                    continue;
+                }
+
+                RecursiveRemoveChildren(child, dispose);
+                parent.Remove(child);
+                if (dispose)
+                {
+                    child.Dispose();
+                }
+            }
+        }
+    }
+}
+
diff --git a/test/NUITizenGallery/Examples/ImageTest5/ImageTest5.cs b/test/NUITizenGallery/Examples/ImageTest5/ImageTest5.cs
index 49b5245..5fc2721 100755
--- a/test/NUITizenGallery/Examples/ImageTest5/ImageTest5.cs
+++ b/test/NUITizenGallery/Examples/ImageTest5/ImageTest5.cs
@@ -17,6 +17,7 @@
 
 using System;
 using Tizen.NUI;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
@@ -26,18 +27,16 @@ namespace NUITizenGallery
         private ImageTest5Page page;
         public void Activate()
         {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
             window = NUIApplication.GetDefaultWindow();
             page = new ImageTest5Page();
-            window.Add(page);
+            window.GetDefaultNavigator().Push(page);
         }
 
         public void Deactivate()
         {
-            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
-            page.Unparent();
-            page.Dispose();
+            window.GetDefaultNavigator().Pop();
+            page = null; ;
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/test/NUITizenGallery/Examples/ImageTest5/ImageTest5.xaml.cs b/test/NUITizenGallery/Examples/ImageTest5/ImageTest5.xaml.cs
index 9b55fb9..5186d37 100755
--- a/test/NUITizenGallery/Examples/ImageTest5/ImageTest5.xaml.cs
+++ b/test/NUITizenGallery/Examples/ImageTest5/ImageTest5.xaml.cs
@@ -21,17 +21,24 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class ImageTest5Page : View
+    public partial class ImageTest5Page : ContentPage
     {
 
         private float imgWidth = 0;
         private float imgHeight = 0;
+        private String mode = "FillToParent";
+        private int choice = 0;
 
         private void updateLabel()
         {
             imgHeight = imageView.Size2D.Height;
             imgWidth = imageView.Size2D.Width;
-            desc1.Text = "Mode : AscpectFit / Width : " + (imgWidth > 0 ? imgWidth.ToString() : "-") + ", Height: " + (imgHeight > 0 ? imgHeight.ToString() : "-");
+
+            if (choice == 0) mode = "FillToParent";
+            else if (choice == 1) mode = "SizeRelativeToParent";
+            else if (choice == 2) mode = "FitToChildren";
+            else mode = "Other";
+            desc1.Text = "Mode : " + mode + "/ Width : " + (imgWidth > 0 ? imgWidth.ToString() : "-") + ", Height: " + (imgHeight > 0 ? imgHeight.ToString() : "-");
         }
 
         public ImageTest5Page()
@@ -61,8 +68,71 @@ namespace NUITizenGallery
             };
             image5Btn.Clicked += (o, e) =>
             {
+                if (choice == 0)
+                {
+                    imageView.HeightResizePolicy = Tizen.NUI.ResizePolicyType.FillToParent;
+                    imageView.WidthResizePolicy = Tizen.NUI.ResizePolicyType.FillToParent;
+                    choice++;
+                }
+                else if (choice == 1)
+                {
+                    imageView.HeightResizePolicy = Tizen.NUI.ResizePolicyType.SizeRelativeToParent;
+                    imageView.WidthResizePolicy = Tizen.NUI.ResizePolicyType.SizeRelativeToParent;
+                    choice++;
+                }
+                else if (choice == 2)
+                {
+                    imageView.HeightResizePolicy = Tizen.NUI.ResizePolicyType.FitToChildren;
+                    imageView.WidthResizePolicy = Tizen.NUI.ResizePolicyType.FitToChildren;
+                    choice = 0;
+                }
                 updateLabel();
             };
         }
+        protected override void Dispose(DisposeTypes type)
+        {
+            if (Disposed)
+            {
+                return;
+            }
+
+            if (type == DisposeTypes.Explicit)
+            {
+                RemoveAllChildren(true);
+            }
+
+            base.Dispose(type);
+        }
+
+        private void RemoveAllChildren(bool dispose = false)
+        {
+            RecursiveRemoveChildren(this, dispose);
+        }
+
+        private void RecursiveRemoveChildren(View parent, bool dispose)
+        {
+            if (parent == null)
+            {
+                return;
+            }
+
+            int maxChild = (int)parent.ChildCount;
+            for (int i = maxChild - 1; i >= 0; --i)
+            {
+                View child = parent.GetChildAt((uint)i);
+                if (child == null)
+                {
+                    continue;
+                }
+
+                RecursiveRemoveChildren(child, dispose);
+                parent.Remove(child);
+                if (dispose)
+                {
+                    child.Dispose();
+                }
+            }
+        }
     }
-}
\ No newline at end of file
+}
+
diff --git a/test/NUITizenGallery/Examples/CarouselViewTest4/CarouselViewTest4.cs b/test/NUITizenGallery/Examples/IndicatorViewTest2/IndicatorViewTest2.cs
similarity index 89%
rename from test/NUITizenGallery/Examples/CarouselViewTest4/CarouselViewTest4.cs
rename to test/NUITizenGallery/Examples/IndicatorViewTest2/IndicatorViewTest2.cs
index 5ab0e24..0cae39a 100644
--- a/test/NUITizenGallery/Examples/CarouselViewTest4/CarouselViewTest4.cs
+++ b/test/NUITizenGallery/Examples/IndicatorViewTest2/IndicatorViewTest2.cs
@@ -20,18 +20,17 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    internal class CarouselViewTest4 : IExample
+    internal class IndicatorViewTest2 : IExample
     {
         private Window window;
-        private CarouselViewTest4Page page;
+        private IndicatorViewTest2Page page;
 
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
             window = NUIApplication.GetDefaultWindow();
-            page = new CarouselViewTest4Page();
 
+            page = new IndicatorViewTest2Page();
             window.GetDefaultNavigator().Push(page);
         }
         public void Deactivate()
diff --git a/test/NUITizenGallery/Examples/IndicatorViewTest2/IndicatorViewTest2.xaml.cs b/test/NUITizenGallery/Examples/IndicatorViewTest2/IndicatorViewTest2.xaml.cs
new file mode 100644
index 0000000..ce0fb39
--- /dev/null
+++ b/test/NUITizenGallery/Examples/IndicatorViewTest2/IndicatorViewTest2.xaml.cs
@@ -0,0 +1,78 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using System.Collections.Generic;
+
+using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
+using Tizen.NUI;
+
+namespace NUITizenGallery
+{
+    public partial class IndicatorViewTest2Page : ContentPage
+    {
+        private readonly string ResourcePath = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "/images/";
+        private readonly int PagesCount = 5;
+        private List<Position> IndicatorPositions;
+
+        public IndicatorViewTest2Page()
+        {
+            InitializeComponent();
+            Scroller.ScrollAnimationEnded += OnScrollAnimationEnded;
+
+            PaginationStyle paginationStyle = new PaginationStyle()
+            {
+                IndicatorSize = new Size(26, 26),
+                IndicatorSpacing = 8,
+            };
+
+            Index.ApplyStyle(paginationStyle);
+            Index.IndicatorCount = PagesCount;
+            Index.SelectedIndex = 0;
+            Index.BackgroundColor = Tizen.NUI.Color.Gray;
+            Index.TouchEvent += OnIndexTouchEvent;
+
+            IndicatorPositions = new List<Position>();
+            for (int i = 0; i < PagesCount; ++i)
+            {
+                IndicatorPositions.Add(Index.GetIndicatorPosition(i));
+            }
+        }
+
+        private bool OnIndexTouchEvent(object sender, TouchEventArgs args)
+        {
+            if (args.Touch.GetState(0) == Tizen.NUI.PointStateType.Finished)
+            {
+                for (int i = PagesCount -1 ; i >= 0; i--)
+                {
+                    if (args.Touch.GetLocalPosition(0).X >= IndicatorPositions[i].X)
+                    {
+                        Scroller.ScrollToIndex(i);
+                        break;
+                    }
+                }
+            }
+
+            return true;
+        }
+
+        private void OnScrollAnimationEnded(object sender, ScrollEventArgs args)
+        {
+            Index.SelectedIndex = Scroller.CurrentPage;
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/CarouselPageTest1/CarouselPageTest1.cs b/test/NUITizenGallery/Examples/IndicatorViewTest3/IndicatorViewTest3.cs
similarity index 89%
rename from test/NUITizenGallery/Examples/CarouselPageTest1/CarouselPageTest1.cs
rename to test/NUITizenGallery/Examples/IndicatorViewTest3/IndicatorViewTest3.cs
index bd145b4..def9d2f 100644
--- a/test/NUITizenGallery/Examples/CarouselPageTest1/CarouselPageTest1.cs
+++ b/test/NUITizenGallery/Examples/IndicatorViewTest3/IndicatorViewTest3.cs
@@ -20,18 +20,17 @@ using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    internal class CarouselPageTest1 : IExample
+    internal class IndicatorViewTest3 : IExample
     {
         private Window window;
-        private CarouselPageTest1Page page;
+        private IndicatorViewTest3Page page;
 
         public void Activate()
         {
             Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
-
             window = NUIApplication.GetDefaultWindow();
-            page = new CarouselPageTest1Page();
 
+            page = new IndicatorViewTest3Page();
             window.GetDefaultNavigator().Push(page);
         }
         public void Deactivate()
diff --git a/test/NUITizenGallery/Examples/IndicatorViewTest3/IndicatorViewTest3.xaml.cs b/test/NUITizenGallery/Examples/IndicatorViewTest3/IndicatorViewTest3.xaml.cs
new file mode 100644
index 0000000..bc701c3
--- /dev/null
+++ b/test/NUITizenGallery/Examples/IndicatorViewTest3/IndicatorViewTest3.xaml.cs
@@ -0,0 +1,127 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using System.Collections.Generic;
+
+using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
+using Tizen.NUI;
+
+namespace NUITizenGallery
+{
+    public partial class IndicatorViewTest3Page : ContentPage
+    {
+        private readonly string ResourcePath = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "/images/";
+        private readonly int PagesCount = 5;
+        private List<Position> IndicatorPositions;
+
+        public IndicatorViewTest3Page()
+        {
+            InitializeComponent();
+            Scroller.ScrollAnimationEnded += OnScrollAnimationEnded;
+
+            PaginationStyle paginationStyle = new PaginationStyle()
+            {
+                IndicatorSize = new Size(26, 26),
+                IndicatorSpacing = 8,
+            };
+
+            Index.ApplyStyle(paginationStyle);
+            Index.PositionUsesPivotPoint = true;
+            Index.ParentOrigin = new Position(0.5f, 0.05f, 0.5f);
+            Index.IndicatorCount = PagesCount;
+            Index.SelectedIndex = 0;
+            Index.Opacity = 0.5f;
+
+            IndicatorPositions = new List<Position>();
+            for (int i = 0; i < PagesCount; ++i)
+            {
+                IndicatorPositions.Add(Index.GetIndicatorPosition(i));
+            }
+
+            Index.BackgroundColor = Tizen.NUI.Color.Gray;
+            Index.TouchEvent += OnIndexTouchEvent;
+        }
+
+        private bool OnIndexTouchEvent(object sender, TouchEventArgs args)
+        {
+            if (args.Touch.GetState(0) == Tizen.NUI.PointStateType.Finished)
+            {
+                for (int i = PagesCount -1 ; i >= 0; i--)
+                {
+                    if (args.Touch.GetLocalPosition(0).X >= IndicatorPositions[i].X)
+                    {
+                        Scroller.ScrollToIndex(i);
+                        break;
+                    }
+                }
+            }
+
+            return true;
+        }
+
+        private void OnScrollAnimationEnded(object sender, ScrollEventArgs args)
+        {
+            Index.SelectedIndex = Scroller.CurrentPage;
+        }
+
+        protected override void Dispose(DisposeTypes type)
+        {
+            if (Disposed)
+            {
+                return;
+            }
+
+            if (type == DisposeTypes.Explicit)
+            {
+                RemoveAllChildren(true);
+            }
+
+            base.Dispose(type);
+        }
+
+        private void RemoveAllChildren(bool dispose = false)
+        {
+            RecursiveRemoveChildren(this, dispose);
+        }
+
+        private void RecursiveRemoveChildren(View parent, bool dispose)
+        {
+            if (parent == null)
+            {
+                return;
+            }
+
+            int maxChild = (int)parent.ChildCount;
+            for (int i = maxChild - 1; i >= 0; --i)
+            {
+                View child = parent.GetChildAt((uint)i);
+                if (child == null)
+                {
+                    continue;
+                }
+
+                RecursiveRemoveChildren(child, dispose);
+                parent.Remove(child);
+                if (dispose)
+                {
+                    child.Dispose();
+                }
+            }
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/KeyboardTest1/KeyboardTest1.cs b/test/NUITizenGallery/Examples/KeyboardTest1/KeyboardTest1.cs
new file mode 100644
index 0000000..517c243
--- /dev/null
+++ b/test/NUITizenGallery/Examples/KeyboardTest1/KeyboardTest1.cs
@@ -0,0 +1,46 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class KeyboardTest1 : IExample
+    {
+        private Window window;
+        private KeyboardTest1Page page;
+        private Navigator navigator;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            page = new KeyboardTest1Page();
+            navigator = window.GetDefaultNavigator();
+
+            navigator.Push(page);
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            navigator.Pop();
+            page = null;
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/KeyboardTest1/KeyboardTest1Page.xaml.cs b/test/NUITizenGallery/Examples/KeyboardTest1/KeyboardTest1Page.xaml.cs
new file mode 100644
index 0000000..8278723
--- /dev/null
+++ b/test/NUITizenGallery/Examples/KeyboardTest1/KeyboardTest1Page.xaml.cs
@@ -0,0 +1,95 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Binding;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    public partial class KeyboardTest1Page : ContentPage
+    {
+        public KeyboardTest1Page()
+        {
+            InitializeComponent();
+            dateTimeKeyboardButton.Command = new Command(() => SetOutputMethod(InputMethod.PanelLayoutType.Datetime));
+            emailKeyboardButton.Command = new Command(() => SetOutputMethod(InputMethod.PanelLayoutType.Email));
+            emoticonKeyboardButton.Command = new Command(() => SetOutputMethod(InputMethod.PanelLayoutType.Emoticon));
+            hexKeyboardButton.Command = new Command(() => SetOutputMethod(InputMethod.PanelLayoutType.HEX));
+            ipLayoutKeyboardButton.Command = new Command(() => SetOutputMethod(InputMethod.PanelLayoutType.IP));
+            monthKeyboardButton.Command = new Command(() => SetOutputMethod(InputMethod.PanelLayoutType.Month));
+            normalKeyboardButton.Command = new Command(() => SetOutputMethod(InputMethod.PanelLayoutType.Normal));
+            numberKeyboardButton.Command = new Command(() => SetOutputMethod(InputMethod.PanelLayoutType.Number));
+            numberOnlyKeyboardButton.Command = new Command(() => SetOutputMethod(InputMethod.PanelLayoutType.NumberOnly));
+            passworKeyboarddButton.Command = new Command(() => SetOutputMethod(InputMethod.PanelLayoutType.Password));
+            phoneNumberKeyboardButton.Command = new Command(() => SetOutputMethod(InputMethod.PanelLayoutType.PhoneNumber));
+            terminalKeyboardButton.Command = new Command(() => SetOutputMethod(InputMethod.PanelLayoutType.Terminal));
+            urlKeyboarddButton.Command = new Command(() => SetOutputMethod(InputMethod.PanelLayoutType.URL));
+        }
+
+        private void SetOutputMethod(InputMethod.PanelLayoutType inputLayoutType)
+        {
+            InputMethod im = new InputMethod();
+            im.PanelLayout = inputLayoutType;
+            textField.InputMethodSettings = im.OutputMap;
+        }
+
+        protected override void Dispose(DisposeTypes type)
+        {
+            if (Disposed)
+            {
+                return;
+            }
+
+            if (type == DisposeTypes.Explicit)
+            {
+                RemoveAllChildren(true);
+            }
+
+            base.Dispose(type);
+        }
+
+        private void RemoveAllChildren(bool dispose = false)
+        {
+            RecursiveRemoveChildren(this, dispose);
+        }
+
+        private void RecursiveRemoveChildren(View parent, bool dispose)
+        {
+            if (parent == null)
+            {
+                return;
+            }
+
+            int maxChild = (int)parent.ChildCount;
+            for (int i = maxChild - 1; i >= 0; --i)
+            {
+                View child = parent.GetChildAt((uint)i);
+                if (child == null)
+                {
+                    continue;
+                }
+                RecursiveRemoveChildren(child, dispose);
+                parent.Remove(child);
+                if (dispose)
+                {
+                    child.Dispose();
+                }
+            }
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/LayoutAddRemoveTest1/LayoutAddRemoveTest1.cs b/test/NUITizenGallery/Examples/LayoutAddRemoveTest1/LayoutAddRemoveTest1.cs
new file mode 100644
index 0000000..ab06c5e
--- /dev/null
+++ b/test/NUITizenGallery/Examples/LayoutAddRemoveTest1/LayoutAddRemoveTest1.cs
@@ -0,0 +1,46 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class LayoutAddRemoveTest1 : IExample
+    {
+        private Window window;
+        private LayoutAddRemoveTest1Page page;
+        private Navigator navigator;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            page = new LayoutAddRemoveTest1Page();
+            navigator = window.GetDefaultNavigator();
+
+            navigator.Push(page);
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            navigator.Pop();
+            page = null;
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/LayoutAddRemoveTest1/LayoutAddRemoveTest1Page.xaml.cs b/test/NUITizenGallery/Examples/LayoutAddRemoveTest1/LayoutAddRemoveTest1Page.xaml.cs
new file mode 100644
index 0000000..e35984c
--- /dev/null
+++ b/test/NUITizenGallery/Examples/LayoutAddRemoveTest1/LayoutAddRemoveTest1Page.xaml.cs
@@ -0,0 +1,105 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    public partial class LayoutAddRemoveTest1Page : ContentPage
+    {
+        private float red = 0f;
+        public LayoutAddRemoveTest1Page()
+        {
+            InitializeComponent();
+            addButton.Clicked += OnAddButtonClicked;
+            removeButton.Clicked += OnRemoveButtonClicked;
+        }
+
+        private void OnAddButtonClicked(object sender, ClickedEventArgs e)
+        {
+            linear.Add(new View
+            {
+                BackgroundColor = new Color(red, 1f, 1f, 1f),
+                HeightSpecification = 200,
+                WidthSpecification = LayoutParamPolicies.MatchParent
+            });
+
+            red += 0.3f;
+
+            if (red > 1.0f)
+            {
+                red = 0f;
+            }
+        }
+
+        private void OnRemoveButtonClicked(object sender, ClickedEventArgs e)
+        {
+            if (linear.ChildCount > 0)
+            {
+                linear.Remove(linear.Children[0]);
+            }
+        }
+
+        protected override void Dispose(DisposeTypes type)
+        {
+            if (Disposed)
+            {
+                return;
+            }
+
+            if (type == DisposeTypes.Explicit)
+            {
+                addButton.Clicked -= OnAddButtonClicked;
+                removeButton.Clicked -= OnRemoveButtonClicked;
+                RemoveAllChildren(true);
+            }
+
+            base.Dispose(type);
+        }
+
+        private void RemoveAllChildren(bool dispose = false)
+        {
+            RecursiveRemoveChildren(this, dispose);
+        }
+
+        private void RecursiveRemoveChildren(View parent, bool dispose)
+        {
+            if (parent == null)
+            {
+                return;
+            }
+
+            int maxChild = (int)parent.ChildCount;
+            for (int i = maxChild - 1; i >= 0; --i)
+            {
+                View child = parent.GetChildAt((uint)i);
+                if (child == null)
+                {
+                    continue;
+                }
+
+                RecursiveRemoveChildren(child, dispose);
+                parent.Remove(child);
+                if (dispose)
+                {
+                    child.Dispose();
+                }
+            }
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/LayoutAddRemoveTest2/LayoutAddRemoveTest2.cs b/test/NUITizenGallery/Examples/LayoutAddRemoveTest2/LayoutAddRemoveTest2.cs
new file mode 100644
index 0000000..cebbfed
--- /dev/null
+++ b/test/NUITizenGallery/Examples/LayoutAddRemoveTest2/LayoutAddRemoveTest2.cs
@@ -0,0 +1,45 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class LayoutAddRemoveTest2 : IExample
+    {
+        private Window window;
+        private LayoutAddRemoveTest2Page page;
+        private Navigator navigator;
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            page = new LayoutAddRemoveTest2Page();
+            navigator = window.GetDefaultNavigator();
+
+            navigator.Push(page);
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            navigator.Pop();
+            page = null;
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/LayoutAddRemoveTest2/LayoutAddRemoveTest2Page.xaml.cs b/test/NUITizenGallery/Examples/LayoutAddRemoveTest2/LayoutAddRemoveTest2Page.xaml.cs
new file mode 100644
index 0000000..1f98dd8
--- /dev/null
+++ b/test/NUITizenGallery/Examples/LayoutAddRemoveTest2/LayoutAddRemoveTest2Page.xaml.cs
@@ -0,0 +1,116 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System.Threading;
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    public partial class LayoutAddRemoveTest2Page : ContentPage
+    {
+        float red = 1f;
+        public LayoutAddRemoveTest2Page()
+        {
+            InitializeComponent();
+            addButton.Clicked += OnAddButtonClicked;
+            addTaskButton.Clicked += OnAddTaskButtonClicked;
+            removeButton.Clicked += OnRemoveButtonClicked;
+        }
+
+        private void OnAddButtonClicked(object sender, ClickedEventArgs e)
+        {
+            linear.Add(new View
+            {
+                WidthSpecification = 240,
+                HeightSpecification = 240,
+                BackgroundColor = new Color(red / 255f, 50f / 255f, 50 / 255f, 255f),
+            });
+
+            red = red > 255f ? 1f : red + 50f;
+        }
+
+        private void OnAddTaskButtonClicked(object sender, ClickedEventArgs e)
+        {
+            SynchronizationContext.Current.Post(AddButton, null);
+        }
+
+        private void OnRemoveButtonClicked(object sender, ClickedEventArgs e)
+        {
+            if (linear.ChildCount > 0)
+            {
+                linear.Remove(linear.Children[0]);
+            }
+        }
+
+        private void AddButton(object state)
+        {
+            linear.Add(new Button()
+            {
+                Text = "Add",
+                HeightSpecification = LayoutParamPolicies.MatchParent,
+            });
+        }
+
+        protected override void Dispose(DisposeTypes type)
+        {
+            if (Disposed)
+            {
+                return;
+            }
+
+            if (type == DisposeTypes.Explicit)
+            {
+                addButton.Clicked -= OnAddButtonClicked;
+                addTaskButton.Clicked -= OnAddTaskButtonClicked;
+                removeButton.Clicked -= OnRemoveButtonClicked;
+                RemoveAllChildren(true);
+            }
+
+            base.Dispose(type);
+        }
+
+        private void RemoveAllChildren(bool dispose = false)
+        {
+            RecursiveRemoveChildren(this, dispose);
+        }
+
+        private void RecursiveRemoveChildren(View parent, bool dispose)
+        {
+            if (parent == null)
+            {
+                return;
+            }
+
+            int maxChild = (int)parent.ChildCount;
+            for (int i = maxChild - 1; i >= 0; --i)
+            {
+                View child = parent.GetChildAt((uint)i);
+                if (child == null)
+                {
+                    continue;
+                }
+                RecursiveRemoveChildren(child, dispose);
+                parent.Remove(child);
+                if (dispose)
+                {
+                    child.Dispose();
+                }
+            }
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/ScrollViewTest6/ScrollViewTest6.cs b/test/NUITizenGallery/Examples/ScrollViewTest6/ScrollViewTest6.cs
new file mode 100755
index 0000000..cf61bb1
--- /dev/null
+++ b/test/NUITizenGallery/Examples/ScrollViewTest6/ScrollViewTest6.cs
@@ -0,0 +1,41 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class ScrollViewTest6 : IExample
+    {
+        private Window window;
+        private ScrollViewTest6Page page;
+        public void Activate()
+        {
+            window = NUIApplication.GetDefaultWindow();
+            page = new ScrollViewTest6Page();
+            window.GetDefaultNavigator().Push(page);
+        }
+        public void Deactivate()
+        {
+            window.GetDefaultNavigator().Pop();
+            page = null;
+        }
+    }
+}
+
diff --git a/test/NUITizenGallery/Examples/ScrollViewTest6/ScrollViewTest6.xaml.cs b/test/NUITizenGallery/Examples/ScrollViewTest6/ScrollViewTest6.xaml.cs
new file mode 100755
index 0000000..0e2d0cc
--- /dev/null
+++ b/test/NUITizenGallery/Examples/ScrollViewTest6/ScrollViewTest6.xaml.cs
@@ -0,0 +1,153 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    public partial class ScrollViewTest6Page : ContentPage
+    {
+
+        void onValueChanged1(object sender, SliderValueChangedEventArgs e)
+        {
+            float v = slider1.CurrentValue;
+            ScrollArea.SizeWidth = v;
+            widthLbl.Text = "Width:" + v.ToString();
+        }
+
+        void onValueChanged2(object sender, SliderValueChangedEventArgs e)
+        {
+            float v = slider2.CurrentValue;
+            ScrollArea.SizeHeight = v;
+            heightLbl.Text = "Height:" + v.ToString();
+        }
+
+        void onBtn1Clicked(object sender, ClickedEventArgs e)
+        {
+            txtLbl3.Text += " More horizontal text.";
+        }
+
+        void onBtn2Clicked(object sender, ClickedEventArgs e)
+        {
+            TextLabel tl = new TextLabel()
+            {
+                Text = " Next line of text.",
+                PointSize = 10,
+                TextColor = Tizen.NUI.Color.Green
+            };
+            ScrollArea.Add(tl);
+        }
+
+        void onBtn3Clicked(object sender, ClickedEventArgs e)
+        {
+            int childrenCount = (int)ScrollArea.ChildCount - 1;
+            View child = ScrollArea.GetChildAt((uint)childrenCount);
+            if (child != null)
+            {
+                ScrollArea.Remove(child);
+            }
+        }
+
+        void onBtn4Clicked(object sender, ClickedEventArgs e)
+        {
+            ScrollArea.ScrollTo(0, false);
+        }
+
+        void onBtn5Clicked(object sender, ClickedEventArgs e)
+        {
+            ScrollArea.ScrollTo(0, true);
+        }
+
+        void onBtn6Clicked(object sender, ClickedEventArgs e)
+        {
+            if (ScrollArea.ScrollingDirection == ScrollableBase.Direction.Vertical)
+            {
+                orientLbl.Text = "Orientation: Horizontal";
+                ScrollArea.ScrollingDirection = ScrollableBase.Direction.Horizontal;
+            }
+            else
+            {
+                orientLbl.Text = "Orientation: Vertical";
+                ScrollArea.ScrollingDirection = ScrollableBase.Direction.Vertical;
+            }
+        }
+
+        public ScrollViewTest6Page()
+        {
+            InitializeComponent();
+            slider1.ValueChanged += onValueChanged1;
+            slider2.ValueChanged += onValueChanged2;
+            btn1.Clicked += onBtn1Clicked;
+            btn2.Clicked += onBtn2Clicked;
+            btn3.Clicked += onBtn3Clicked;
+            btn4.Clicked += onBtn4Clicked;
+            btn5.Clicked += onBtn5Clicked;
+            btn6.Clicked += onBtn6Clicked;
+            ScrollArea.Scrolling += (o, e) =>
+            {
+                scrollLbl.Text = "ScrollX:" + ScrollArea.ScrollPosition.X.ToString() + ", ScrollY:" + ScrollArea.ScrollPosition.Y.ToString();
+            };
+        }
+
+        protected override void Dispose(DisposeTypes type)
+        {
+            if (Disposed)
+            {
+                return;
+            }
+
+            if (type == DisposeTypes.Explicit)
+            {
+                RemoveAllChildren(true);
+            }
+
+            base.Dispose(type);
+        }
+
+        private void RemoveAllChildren(bool dispose = false)
+        {
+            RecursiveRemoveChildren(this, dispose);
+        }
+
+        private void RecursiveRemoveChildren(View parent, bool dispose)
+        {
+            if (parent == null)
+            {
+                return;
+            }
+
+            int maxChild = (int)parent.ChildCount;
+            for (int i = maxChild - 1; i >= 0; --i)
+            {
+                View child = parent.GetChildAt((uint)i);
+                if (child == null)
+                {
+                    continue;
+                }
+
+                RecursiveRemoveChildren(child, dispose);
+                parent.Remove(child);
+                if (dispose)
+                {
+                    child.Dispose();
+                }
+            }
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/TimerTest1/Converters/InverseBoolConverter.cs b/test/NUITizenGallery/Examples/TimerTest1/Converters/InverseBoolConverter.cs
new file mode 100644
index 0000000..7264e28
--- /dev/null
+++ b/test/NUITizenGallery/Examples/TimerTest1/Converters/InverseBoolConverter.cs
@@ -0,0 +1,31 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using System.Globalization;
+using Tizen.NUI.Binding;
+
+namespace NUITizenGallery.Converters
+{
+    public class InverseBoolConverter : IValueConverter
+    {
+        public static InverseBoolConverter Converter => new InverseBoolConverter();
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) => !(bool)value;
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => !(bool)value;
+    }
+}
diff --git a/test/NUITizenGallery/Examples/TimerTest1/TimerTest1.cs b/test/NUITizenGallery/Examples/TimerTest1/TimerTest1.cs
new file mode 100644
index 0000000..e7acd93
--- /dev/null
+++ b/test/NUITizenGallery/Examples/TimerTest1/TimerTest1.cs
@@ -0,0 +1,46 @@
+/*
+ * Copyright(c) 2021 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+using System;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+
+namespace NUITizenGallery
+{
+    internal class TimerTest1 : IExample
+    {
+        private Window window;
+        private TimerTest1Page page;
+        private Navigator navigator;
+
+        public void Activate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Activate()");
+
+            window = NUIApplication.GetDefaultWindow();
+            page = new TimerTest1Page();
+            navigator = window.GetDefaultNavigator();
+
+            navigator.Push(page);
+        }
+        public void Deactivate()
+        {
+            Console.WriteLine($"@@@ this.GetType().Name={this.GetType().Name}, Deactivate()");
+            navigator.Pop();
+            page = null;
+        }
+    }
+}
diff --git a/test/NUITizenGallery/Examples/BoxViewTest1/BoxViewTest1.xaml.cs b/test/NUITizenGallery/Examples/TimerTest1/TimerTest1Page.xaml.cs
similarity index 94%
rename from test/NUITizenGallery/Examples/BoxViewTest1/BoxViewTest1.xaml.cs
rename to test/NUITizenGallery/Examples/TimerTest1/TimerTest1Page.xaml.cs
index f710567..b1dce37 100644
--- a/test/NUITizenGallery/Examples/BoxViewTest1/BoxViewTest1.xaml.cs
+++ b/test/NUITizenGallery/Examples/TimerTest1/TimerTest1Page.xaml.cs
@@ -16,12 +16,13 @@
  */
 using Tizen.NUI;
 using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Components;
 
 namespace NUITizenGallery
 {
-    public partial class BoxViewTest1 : View
+    public partial class TimerTest1Page : ContentPage
     {
-        public BoxViewTest1()
+        public TimerTest1Page()
         {
             InitializeComponent();
         }
diff --git a/test/NUITizenGallery/Examples/TimerTest1/ViewModels/TimerTest1ViewModel.cs b/test/NUITizenGallery/Examples/TimerTest1/ViewModels/TimerTest1ViewModel.cs
new file mode 100644
index 0000000..7cbfa3f
--- /dev/null
+++ b/test/NUITizenGallery/Examples/TimerTest1/ViewModels/TimerTest1ViewModel.cs
@@ -0,0 +1,140 @@
+using System;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using System.Windows.Input;
+using Tizen.NUI.Binding;
+using Tizen.NUI;
+using System.Diagnostics;
+
+namespace NUITizenGallery.ViewModels
+{
+    public class TimerTest1ViewModel : INotifyPropertyChanged, IDisposable
+    {
+        private readonly Timer timer;
+        private readonly Stopwatch stopWatch = new Stopwatch();
+        private bool timerStarted;
+        private string hoursMinutesSeconds;
+        private string miliseconds;
+        private bool disposed = false;
+
+        public ICommand StartTimer
+        {
+            get;
+            private set;
+        }
+
+        public ICommand StopTimer
+        {
+            get;
+            private set;
+        }
+
+        public TimerTest1ViewModel()
+        {
+            timerStarted = false;
+            timer = new Timer(100);
+
+            timer.Tick += OnTimerIntervalElapsed;
+            timer.Stop();
+
+            StartTimer = new Command(ExecuteStartTimer);
+            StopTimer = new Command(ExecuteStopTimer);
+            HoursMinutesSeconds = "00:00";
+            Miliseconds = ".00";
+        }
+
+        private bool OnTimerIntervalElapsed(object sender, Timer.TickEventArgs e)
+        {
+            var ts = stopWatch.Elapsed;
+            HoursMinutesSeconds = ts.Hours == 0 ?
+                string.Format("{0:00}:{1:00}", ts.Minutes, ts.Seconds) :
+                string.Format("{0:00}:{1:00}:{2:00}", ts.Hours, ts.Minutes, ts.Seconds);
+
+            Miliseconds = string.Format(".{0:00}", ts.Milliseconds / 10);
+
+            return true;
+        }
+
+        public bool TimerStarted
+        {
+            get => timerStarted;
+            set
+            {
+                if (timerStarted != value)
+                {
+                    timerStarted = value;
+                    RaisePropertyChagend();
+                }
+            }
+        }
+
+        public string HoursMinutesSeconds
+        {
+            get => hoursMinutesSeconds;
+            set
+            {
+                if (hoursMinutesSeconds != value)
+                {
+                    hoursMinutesSeconds = value;
+                    RaisePropertyChagend();
+                }
+            }
+        }
+
+        public string Miliseconds
+        {
+            get => miliseconds;
+            set
+            {
+                if (miliseconds != value)
+                {
+                    miliseconds = value;
+                    RaisePropertyChagend();
+                }
+            }
+        }
+
+        private void ExecuteStartTimer()
+        {
+            TimerStarted = true;
+            timer.Start();
+            stopWatch.Start();
+        }
+
+
+        private void ExecuteStopTimer()
+        {
+            TimerStarted = false;
+            timer.Stop();
+            stopWatch.Stop();
+        }
+
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        private void RaisePropertyChagend([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposed)
+            {
+                if (disposing)
+                {
+                    timer.Tick -= OnTimerIntervalElapsed;
+                    timer?.Dispose();
+                }
+
+                disposed = true;
+            }
+        }
+    }
+}
diff --git a/test/NUITizenGallery/NUITizenGallery.cs b/test/NUITizenGallery/NUITizenGallery.cs
index 812ba76..19a07d7 100644
--- a/test/NUITizenGallery/NUITizenGallery.cs
+++ b/test/NUITizenGallery/NUITizenGallery.cs
@@ -62,6 +62,7 @@ namespace NUITizenGallery
                 PlaceholderText = "Search",
                 WidthSpecification = LayoutParamPolicies.MatchParent,
                 HeightSpecification = LayoutParamPolicies.WrapContent,
+                MinimumSize = new Size2D(0, 40),
             };
         }
 
diff --git a/test/NUITizenGallery/NUITizenGallery.csproj b/test/NUITizenGallery/NUITizenGallery.csproj
index 5585c66..2b12966 100755
--- a/test/NUITizenGallery/NUITizenGallery.csproj
+++ b/test/NUITizenGallery/NUITizenGallery.csproj
@@ -1,419 +1,471 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
+
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
         <DebugType>portable</DebugType>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
         <DebugType>None</DebugType>
     </PropertyGroup>
-    <ItemGroup>
-        <None Remove="res\layout\BoxViewTest\BoxViewTest1.xaml" />
-        <None Remove="res\layout\BoxViewTest\BoxViewTest2.xaml" />
-        <None Remove="res\layout\BoxViewTest\BoxViewTest3.xaml" />
-        <None Remove="res\layout\BoxViewTest\BoxViewTest4.xaml" />
-    </ItemGroup>
-    <ItemGroup>
-        <EmbeddedResource Include="res\layout\BoxViewTest\BoxViewTest4.xaml">
-            <SubType>Designer</SubType>
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\BoxViewTest\BoxViewTest3.xaml">
-            <SubType>Designer</SubType>
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\BoxViewTest\BoxViewTest1.xaml">
-            <SubType>Designer</SubType>
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\BoxViewTest\BoxViewTest2.xaml">
-            <SubType>Designer</SubType>
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\FrameLayoutTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\StackLayoutTest8Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\StackLayoutTest6Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\LabelTest3Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\BindingTest1.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\BindingTest2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\StackLayoutTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\StackLayoutTest2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\StackLayoutTest3Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\StackLayoutTest4Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\StackLayoutTest5Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\Test1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\EditorTest1.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\EditorTest2.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\TextAnchorTest.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\EntryTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\EntryTest4Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\EntryTest2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\Test2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CustomCellListItem.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CustomCellTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\BrushImageTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\BrushBorderTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\BrushViewerTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\BrushComponentsTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\BrushBackgroundTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\BackgroundTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ActivityIndicatorPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\AbsoluteLayoutPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ListItemTitleView.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\PerformanceTest3Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ListItemTitleSwitch.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\PerformanceTest2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ListItemTitle.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\PerformanceTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ProgressbarTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\OpacityTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\IndicatorViewTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\IndicatorViewTest4Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ButtonTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\FrameTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ListViewFooterTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\SliderTest2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\SliderTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\PickerTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\DatePickerTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\TimePickerTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CollectionViewFocusTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CollectionViewItem.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CarouselPageTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CarouselViewTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CarouselViewTest2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CarouselViewTest4Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ButtonTest7Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ButtonTest5Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ButtonTest6Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ImageButtonTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\HelloWorldPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\IconTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\LabelTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\AnimationTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\AnimationTest3Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ImageTest3Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ImageTest2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\FlexTest3Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\FlexTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\FlexTest2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ScaleTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ScaleTest2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\BackgroundColorTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ImageTest5Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ImageTest4Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\BackgroundColorTest2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\BackgroundColorTest3Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\BackgroundColorTest4Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\BackgroundColorTest5Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ImageTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\LabelTest2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ScrollViewTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\AnimationTest2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ButtonTest2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CollectionViewTest/CollectionViewTest1.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CollectionViewTest/CollectionViewTest2.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CollectionViewTest/CollectionViewTest3.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CollectionViewTest/CollectionViewTest4.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CollectionViewTest/CollectionViewTest5.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CollectionViewTest/CollectionViewTest6.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CollectionViewTest/CollectionViewTest7.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CollectionViewTest/CollectionViewTest8.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CollectionViewTest/CollectionViewTest9.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CollectionViewTest/CollectionViewTest10.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ContentPageTestPage1.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ContentPageTestPage2.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\GridTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\GridTest2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\CheckBoxTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\AlertDialogTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\NavigatorTest\NavigatorTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\NavigatorTest\NavigatorTest2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\RotationTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\TabViewTest\TabViewTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\MenuTest\MenuTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\MenuTest\MenuTestMenu.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\PinchGestureTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\PanGestureTest1.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\RecalculateTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\TapGestureTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\TapGestureTest2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\TapGestureTest3Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\TapGestureTest4Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\SimpleTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ToolbarItemTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\SwipeGestureRecognizerTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\SwipeViewTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\SwipeViewTest2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\WebViewTest1.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\WebViewTest2.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\SetColorTestPage.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\LabelTest5Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\StackInGridTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ScrollViewTest2Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ScrollViewTest3Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ScrollViewTest4Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\ScrollViewTest7Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Include="res\layout\RefreshViewTest1Page.xaml">
-            <Generator>MSBuild:Compile</Generator>
-        </EmbeddedResource>
-    </ItemGroup>
+
+
+  <ItemGroup>
+    <None Remove="Examples\BoxViewTest\BoxViewTest1.xaml" />
+    <None Remove="Examples\BoxViewTest\BoxViewTest2.xaml" />
+    <None Remove="Examples\BoxViewTest\BoxViewTest3.xaml" />
+    <None Remove="Examples\BoxViewTest\BoxViewTest4.xaml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Examples\AbsoluteLayoutTest\AbsoluteLayoutTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\ActivityIndicatorTest\ActivityIndicatorTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+   <EmbeddedResource Include="Examples\AlertDialogTest\AlertDialogTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\AnimationTest\AnimationTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\AnimationTest\AnimationTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\AnimationTest\AnimationTest3Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\BackgroundColorTest\BackgroundColorTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\BackgroundColorTest\BackgroundColorTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\BackgroundColorTest\BackgroundColorTest3Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\BackgroundColorTest\BackgroundColorTest4Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\BackgroundColorTest\BackgroundColorTest5Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\BackgroundTest\BackgroundTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\BindingTest\BindingTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\BindingTest\BindingTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\BoxViewTest\BoxViewTest1Page.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\BoxViewTest\BoxViewTest2Page.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\BoxViewTest\BoxViewTest3Page.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\BoxViewTest\BoxViewTest4Page.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\BrushTest\BrushBackgroundTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\BrushTest\BrushBorderTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\BrushTest\BrushComponentsTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\BrushTest\BrushImageTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\BrushTest\BrushViewerTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+	  <EmbeddedResource Include="Examples\ButtonTest\ButtonTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+	  <EmbeddedResource Include="Examples\ButtonTest\ButtonTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\ButtonTest\ButtonTest5Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\ButtonTest\ButtonTest6Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\ButtonTest\ButtonTest7Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CarouselTest\CarouselPageTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CarouselTest\CarouselViewTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CarouselTest\CarouselViewTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CarouselTest\CarouselViewTest4Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CarouselTest\CarouselViewItem.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CarouselTest\CarouselViewFocusTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CheckBoxTest\CheckBoxTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CollectionViewTest\CollectionViewCustomItem.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CollectionViewTest\CollectionViewCustomItemTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CollectionViewTest\CollectionViewObservableTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CollectionViewTest\CollectionViewTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CollectionViewTest\CollectionViewTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CollectionViewTest\CollectionViewTest3Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CollectionViewTest\CollectionViewTest4Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CollectionViewTest\CollectionViewTest5Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CollectionViewTest\CollectionViewTest6Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CollectionViewTest\CollectionViewTest7Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CollectionViewTest\CollectionViewTest8Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CollectionViewTest\CollectionViewTest9Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\ContentPageTest\ContentPageTestPage1.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\ContentPageTest\ContentPageTestPage2.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CustomCellTest\CustomCellListItem.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\CustomCellTest\CustomCellTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Examples\DatePickerTest\DatePickerTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\EditorTest1.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\EditorTest2.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\EntryTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\EntryTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\EntryTest4Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\FlexTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+	  <EmbeddedResource Include="res\layout\FlexTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\FlexTest3Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+	  <EmbeddedResource Include="res\layout\FlexTest5Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\FrameLayoutTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\FrameLayoutTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\FrameTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+   <EmbeddedResource Include="res\layout\GridTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+   </EmbeddedResource>
+   <EmbeddedResource Include="res\layout\GridTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\GridTest3Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\GridTest4Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\HelloWorldPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\IconTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ImageButtonTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ImageTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ImageTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ImageTest3Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ImageTest4Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ImageTest5Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\IndicatorViewTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\IndicatorViewTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\IndicatorViewTest3Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\IndicatorViewTest4Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\KeyboardTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\LabelTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\LabelTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\LabelTest3Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\LabelTest5Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\LayoutAddRemoveTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\LayoutAddRemoveTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ListViewFooterTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+   <EmbeddedResource Include="res\layout\MenuTest\MenuTestMenu.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+   <EmbeddedResource Include="res\layout\MenuTest\MenuTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+   <EmbeddedResource Include="res\layout\NavigatorTest\NavigatorTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+   <EmbeddedResource Include="res\layout\NavigatorTest\NavigatorTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\OpacityTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\PanGestureTest1.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ListItemTitleView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\PerformanceTest3Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ListItemTitleSwitch.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\PerformanceTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ListItemTitle.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\PerformanceTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\PickerTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\PinchGestureTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ProgressbarTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\RecalculateTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\RefreshViewTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\RotationTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>   
+    <EmbeddedResource Include="res\layout\ScaleTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ScaleTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ScrollViewTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ScrollViewTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ScrollViewTest3Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ScrollViewTest4Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ScrollViewTest6Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ScrollViewTest7Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\SetColorTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\SimpleTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>      
+    <EmbeddedResource Include="res\layout\SliderTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\SliderTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\StackInGridTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\StackLayoutTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\StackLayoutTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\StackLayoutTest3Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\StackLayoutTest4Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\StackLayoutTest5Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\StackLayoutTest6Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\StackLayoutTest8Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\SwipeViewTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\SwipeViewTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\SwipeGestureRecognizerTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+   <EmbeddedResource Include="res\layout\TabViewTest\TabViewTestPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\TapGestureTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\TapGestureTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\TapGestureTest3Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\TapGestureTest4Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\Test1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\Test2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\TextAnchorTest.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\TimePickerTestPage.xaml">
+    <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\TimerTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\ToolbarItemTest1Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\WebViewTest1.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="res\layout\WebViewTest2.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="res\layout\FrameLayoutTest2Page.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </None>
+  </ItemGroup>
+
+
     <ItemGroup>
         <Folder Include="lib\" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Tizen.NUI.XamlBuild" Version="1.0.27" />
+        <PackageReference Include="Tizen.NUI.XamlBuild" Version="1.0.30" />
     </ItemGroup>
 
     <ItemGroup>
@@ -424,4 +476,5 @@
     <PropertyGroup>
         <NeedInjection>True</NeedInjection>
     </PropertyGroup>
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/test/NUITizenGallery/res/images/flags/flag_0.png b/test/NUITizenGallery/res/images/flags/flag_0.png
new file mode 100755
index 0000000..8b02773
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_0.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_1.png b/test/NUITizenGallery/res/images/flags/flag_1.png
new file mode 100755
index 0000000..e68cb1d
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_1.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_10.png b/test/NUITizenGallery/res/images/flags/flag_10.png
new file mode 100755
index 0000000..0ac7196
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_10.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_11.png b/test/NUITizenGallery/res/images/flags/flag_11.png
new file mode 100755
index 0000000..0689845
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_11.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_12.png b/test/NUITizenGallery/res/images/flags/flag_12.png
new file mode 100755
index 0000000..1fb4de0
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_12.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_13.png b/test/NUITizenGallery/res/images/flags/flag_13.png
new file mode 100755
index 0000000..d48a33d
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_13.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_14.png b/test/NUITizenGallery/res/images/flags/flag_14.png
new file mode 100755
index 0000000..0c80c77
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_14.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_15.png b/test/NUITizenGallery/res/images/flags/flag_15.png
new file mode 100755
index 0000000..35986a9
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_15.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_16.png b/test/NUITizenGallery/res/images/flags/flag_16.png
new file mode 100755
index 0000000..ec43558
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_16.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_17.png b/test/NUITizenGallery/res/images/flags/flag_17.png
new file mode 100755
index 0000000..6d27f57
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_17.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_18.png b/test/NUITizenGallery/res/images/flags/flag_18.png
new file mode 100755
index 0000000..5c9b22f
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_18.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_19.png b/test/NUITizenGallery/res/images/flags/flag_19.png
new file mode 100755
index 0000000..20455dd
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_19.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_2.png b/test/NUITizenGallery/res/images/flags/flag_2.png
new file mode 100755
index 0000000..5eb51f2
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_2.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_20.png b/test/NUITizenGallery/res/images/flags/flag_20.png
new file mode 100755
index 0000000..ef4b327
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_20.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_21.png b/test/NUITizenGallery/res/images/flags/flag_21.png
new file mode 100755
index 0000000..495f08f
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_21.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_22.png b/test/NUITizenGallery/res/images/flags/flag_22.png
new file mode 100755
index 0000000..8b39bb3
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_22.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_23.png b/test/NUITizenGallery/res/images/flags/flag_23.png
new file mode 100755
index 0000000..10c67b6
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_23.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_24.png b/test/NUITizenGallery/res/images/flags/flag_24.png
new file mode 100755
index 0000000..645709c
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_24.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_25.png b/test/NUITizenGallery/res/images/flags/flag_25.png
new file mode 100755
index 0000000..39e6a39
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_25.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_26.png b/test/NUITizenGallery/res/images/flags/flag_26.png
new file mode 100755
index 0000000..9ccf301
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_26.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_27.png b/test/NUITizenGallery/res/images/flags/flag_27.png
new file mode 100755
index 0000000..646cf73
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_27.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_28.png b/test/NUITizenGallery/res/images/flags/flag_28.png
new file mode 100755
index 0000000..608439c
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_28.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_29.png b/test/NUITizenGallery/res/images/flags/flag_29.png
new file mode 100755
index 0000000..82be9a1
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_29.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_3.png b/test/NUITizenGallery/res/images/flags/flag_3.png
new file mode 100755
index 0000000..1749142
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_3.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_30.png b/test/NUITizenGallery/res/images/flags/flag_30.png
new file mode 100755
index 0000000..6e8e640
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_30.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_31.png b/test/NUITizenGallery/res/images/flags/flag_31.png
new file mode 100755
index 0000000..03c2782
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_31.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_32.png b/test/NUITizenGallery/res/images/flags/flag_32.png
new file mode 100755
index 0000000..2bde94f
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_32.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_33.png b/test/NUITizenGallery/res/images/flags/flag_33.png
new file mode 100755
index 0000000..e17d899
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_33.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_34.png b/test/NUITizenGallery/res/images/flags/flag_34.png
new file mode 100755
index 0000000..e8b771a
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_34.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_35.png b/test/NUITizenGallery/res/images/flags/flag_35.png
new file mode 100755
index 0000000..03e13f3
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_35.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_36.png b/test/NUITizenGallery/res/images/flags/flag_36.png
new file mode 100755
index 0000000..4b5abba
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_36.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_37.png b/test/NUITizenGallery/res/images/flags/flag_37.png
new file mode 100755
index 0000000..3a2cf4c
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_37.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_38.png b/test/NUITizenGallery/res/images/flags/flag_38.png
new file mode 100755
index 0000000..fa5b4ae
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_38.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_39.png b/test/NUITizenGallery/res/images/flags/flag_39.png
new file mode 100755
index 0000000..b8bf562
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_39.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_4.png b/test/NUITizenGallery/res/images/flags/flag_4.png
new file mode 100755
index 0000000..7b33a86
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_4.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_40.png b/test/NUITizenGallery/res/images/flags/flag_40.png
new file mode 100755
index 0000000..ba15f91
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_40.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_41.png b/test/NUITizenGallery/res/images/flags/flag_41.png
new file mode 100755
index 0000000..e3fd7e8
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_41.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_42.png b/test/NUITizenGallery/res/images/flags/flag_42.png
new file mode 100755
index 0000000..c8c36fc
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_42.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_43.png b/test/NUITizenGallery/res/images/flags/flag_43.png
new file mode 100755
index 0000000..a869221
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_43.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_44.png b/test/NUITizenGallery/res/images/flags/flag_44.png
new file mode 100755
index 0000000..f0c67c4
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_44.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_45.png b/test/NUITizenGallery/res/images/flags/flag_45.png
new file mode 100755
index 0000000..5cf7bae
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_45.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_46.png b/test/NUITizenGallery/res/images/flags/flag_46.png
new file mode 100755
index 0000000..3d7159a
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_46.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_47.png b/test/NUITizenGallery/res/images/flags/flag_47.png
new file mode 100755
index 0000000..2959492
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_47.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_48.png b/test/NUITizenGallery/res/images/flags/flag_48.png
new file mode 100755
index 0000000..7134f00
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_48.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_49.png b/test/NUITizenGallery/res/images/flags/flag_49.png
new file mode 100755
index 0000000..f58d88c
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_49.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_5.png b/test/NUITizenGallery/res/images/flags/flag_5.png
new file mode 100755
index 0000000..d2f270e
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_5.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_6.png b/test/NUITizenGallery/res/images/flags/flag_6.png
new file mode 100755
index 0000000..de7544c
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_6.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_7.png b/test/NUITizenGallery/res/images/flags/flag_7.png
new file mode 100755
index 0000000..def188c
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_7.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_8.png b/test/NUITizenGallery/res/images/flags/flag_8.png
new file mode 100755
index 0000000..a9fc3e3
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_8.png differ
diff --git a/test/NUITizenGallery/res/images/flags/flag_9.png b/test/NUITizenGallery/res/images/flags/flag_9.png
new file mode 100755
index 0000000..6fdc0ea
Binary files /dev/null and b/test/NUITizenGallery/res/images/flags/flag_9.png differ
diff --git a/test/NUITizenGallery/res/layout/AbsoluteLayoutPage.xaml b/test/NUITizenGallery/res/layout/AbsoluteLayoutPage.xaml
deleted file mode 100644
index a4d6d06..0000000
--- a/test/NUITizenGallery/res/layout/AbsoluteLayoutPage.xaml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<b:View x:Class="NUITizenGallery.AbsoluteLayoutPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:b="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    PositionUsesPivotPoint="True" ParentOrigin="Center" 
-    PivotPoint="Center" WidthResizePolicy="FillToParent" 
-    HeightResizePolicy="FillToParent" BackgroundColor="#FFFFFF">
-
-    <b:TextLabel Text="Stylish Header" PointSize="12" Position2D="73,130"/>
-    <b:View BackgroundColor="#FF0000" Position2D="32,108" Size2D="400,5"/>
-    <b:View BackgroundColor="#00FF00" Position2D="32,120" Size2D="400,5"/>
-    <b:View BackgroundColor="#0000FF" Position2D="42,100" Size2D="5,100"/>
-    <b:View BackgroundColor="#FF00FF" Position2D="54,100" Size2D="5,100"/>
-
-</b:View>
diff --git a/test/NUITizenGallery/res/layout/ActivityIndicatorPage.xaml b/test/NUITizenGallery/res/layout/ActivityIndicatorPage.xaml
deleted file mode 100644
index 2e3c67f..0000000
--- a/test/NUITizenGallery/res/layout/ActivityIndicatorPage.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<base:View x:Class="NUITizenGallery.ActivityIndicatorPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    PositionUsesPivotPoint="True" ParentOrigin="Center" 
-    PivotPoint="Center" WidthResizePolicy="FillToParent" 
-    HeightResizePolicy="FillToParent" BackgroundColor="#FFFFFF">
-
-    <comp:Loading x:Name="Spinner" Size2D="100, 100" Position2D="10, 10"/>
-</base:View>
diff --git a/test/NUITizenGallery/res/layout/AnimationTest1Page.xaml b/test/NUITizenGallery/res/layout/AnimationTest1Page.xaml
deleted file mode 100755
index 5917293..0000000
--- a/test/NUITizenGallery/res/layout/AnimationTest1Page.xaml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<base:View x:Class="NUITizenGallery.AnimationTest1Page"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    PositionUsesPivotPoint="True" 
-	ParentOrigin="Center" 
-    PivotPoint="Center" 
-	WidthResizePolicy="FillToParent" 
-    HeightResizePolicy="FillToParent" 
-	BackgroundColor="#FFFFFF">
-
-    <base:View.Layout>
-        <LinearLayout LinearOrientation="Vertical" CellPadding="10,10" LinearAlignment="Top"/>
-    </base:View.Layout>
-
-    <base:View x:Name="imgView" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" Weight="0.3">
-        <base:View.Layout>
-            <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterHorizontal" CellPadding="10,10"/>
-        </base:View.Layout>
-        <ImageView x:Name="imageView" ResourceUrl="*Resource*/images/a.jpg" />
-    </base:View>
-
-    <base:View x:Name="btnView" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" Weight="0.7">
-        <View.Layout>
-            <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterHorizontal" CellPadding="10,10" />
-        </View.Layout>
-        <comp:Button x:Name="image1Btn" Text="Start Animation" Size2D="680,100"/>
-        <comp:Button x:Name="image2Btn" Text="Stop Animation"  Size2D="680,100"/>
-        <base:TextLabel x:Name="desc1"  Text="" PointSize="15" TextColor="Black"/>
-    </base:View>
-
-
-</base:View>
-
diff --git a/test/NUITizenGallery/res/layout/AnimationTest2Page.xaml b/test/NUITizenGallery/res/layout/AnimationTest2Page.xaml
deleted file mode 100755
index 533989c..0000000
--- a/test/NUITizenGallery/res/layout/AnimationTest2Page.xaml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<base:View x:Class="NUITizenGallery.AnimationTest2Page"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    PositionUsesPivotPoint="True" 
-	ParentOrigin="Center" 
-    PivotPoint="Center" 
-	WidthResizePolicy="FillToParent" 
-    HeightResizePolicy="FillToParent" 
-	BackgroundColor="#FFFFFF">
-
-    <base:View.Layout>
-        <LinearLayout LinearOrientation="Vertical" CellPadding="10,10" LinearAlignment="Top"/>
-    </base:View.Layout>
-
-    <base:View x:Name="imgView" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" Weight="0.3">
-        <base:View.Layout>
-            <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterHorizontal" CellPadding="10,10"/>
-        </base:View.Layout>
-        <ImageView x:Name="imageView" ResourceUrl="*Resource*/images/a.jpg" />
-    </base:View>
-
-    <base:View x:Name="btnView" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" Weight="0.7">
-        <View.Layout>
-            <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterHorizontal" CellPadding="10,10" />
-        </View.Layout>
-        <comp:Button x:Name="image1Btn" Text="Start Animation" Size2D="680,100"/>
-        <comp:Button x:Name="image2Btn" Text="Stop Animation"  Size2D="680,100"/>
-        <base:TextLabel x:Name="desc1"  Text="" PointSize="15" TextColor="Black"/>
-    </base:View>
-
-
-</base:View>
-
diff --git a/test/NUITizenGallery/res/layout/AnimationTest3Page.xaml b/test/NUITizenGallery/res/layout/AnimationTest3Page.xaml
deleted file mode 100755
index d191df9..0000000
--- a/test/NUITizenGallery/res/layout/AnimationTest3Page.xaml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<base:View x:Class="NUITizenGallery.AnimationTest3Page"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    PositionUsesPivotPoint="True" 
-	ParentOrigin="Center" 
-    PivotPoint="Center" 
-	WidthResizePolicy="FillToParent" 
-    HeightResizePolicy="FillToParent" 
-	BackgroundColor="#FFFFFF">
-
-    <base:View.Layout>
-        <LinearLayout LinearOrientation="Vertical" CellPadding="10,10" LinearAlignment="Top"/>
-    </base:View.Layout>
-
-    <base:View x:Name="imgView" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" Weight="0.3">
-        <base:View.Layout>
-            <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterHorizontal" CellPadding="10,10"/>
-        </base:View.Layout>
-        <ImageView x:Name="imageView" ResourceUrl="*Resource*/images/a.jpg" />
-    </base:View>
-
-    <base:View x:Name="btnView" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" Weight="0.7">
-        <View.Layout>
-            <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterHorizontal" CellPadding="10,10" />
-        </View.Layout>
-        <comp:Button x:Name="image1Btn" Text="Start Animation" Size2D="680,100"/>
-        <comp:Button x:Name="image2Btn" Text="Stop Animation"  Size2D="680,100"/>
-        <base:TextLabel x:Name="desc1"  Text="" PointSize="15" TextColor="Black"/>
-    </base:View>
-
-
-</base:View>
-
diff --git a/test/NUITizenGallery/res/layout/BackgroundColorTest1Page.xaml b/test/NUITizenGallery/res/layout/BackgroundColorTest1Page.xaml
deleted file mode 100644
index c687174..0000000
--- a/test/NUITizenGallery/res/layout/BackgroundColorTest1Page.xaml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<b:View x:Class="NUITizenGallery.BackgroundColorTest1Page"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:b="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  HeightResizePolicy="FillToParent" 
-  WidthResizePolicy="FillToParent" 
-  ParentOrigin="Center" 
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <View.Layout>
-        <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center"/>
-    </View.Layout>
-
-    <View x:Name="mainView"
-          WidthResizePolicy="FillToParent"
-          HeightResizePolicy="FillToParent"
-          BackgroundColor="#00ffff"
-          Opacity="0.9"
-          Weight="1.0">
-
-        <View.Layout>
-            <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10"/>
-        </View.Layout>
-        
-        <nui:Button x:Name="button1"
-                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                    PointSize="8"
-                    Text="Change BackgroundColor"
-                    TextColor="White"
-                    BackgroundColor="Black"/>
-
-        <nui:Button x:Name="button2"
-                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                    PointSize="8"
-                    Text="Button1 (Red)"
-                    TextColor="White"
-                    BackgroundColor="Red"/>
-
-        <nui:Button x:Name="button3"
-                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                    PointSize="8"
-                    Text="Button2 (Blue/0.5)"
-                    TextColor="White"
-                    BackgroundColor = "Blue"
-                    Opacity="0.5"/>
-
-        <nui:Button x:Name="button4"
-                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                    PointSize="8"
-                    Text="Button3 (0,0,1,.5)"
-                    TextColor="White"
-                    BackgroundColor="0,0,1,.5"
-                    Opacity="0.4"/>
-
-        <TextLabel WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                   PointSize="8"
-                   Text="Label1 (Silver)"
-                   BackgroundColor="#C0C0C0"/>
-
-        <TextLabel WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                   PointSize="8"
-                   Text="Label2 (Pink/0.5)"
-                   BackgroundColor="#FF66FF"
-                   Opacity="0.4"/>
-
-        <TextField WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                   PointSize="8"
-                   Text="This is a Entry with very looooooooooooong looooooooooooooong text,  (Background color : Color.Lime)"
-                   BackgroundColor="#00FF00" 
-                   Weight="1.0"/>
-
-        <TextField WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                   PointSize="8"
-                   Text="Formatted entry (Background color : Color.Maroon)"
-                   BackgroundColor="#800000" 
-                   Weight="1.0"/>
-
-        <Progress WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                  MinValue="0.0"
-                  MaxValue="1.0"
-                  BufferColor="#FF66FF"
-                  CurrentValue="0.5"
-                  Weight="1.0"/>
-
-        <Slider WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                MinValue="0"
-                MaxValue="1.0"
-                BgTrackColor="#800080" 
-                Weight="1.0"/>
-        
-    </View>
-
-    <View x:Name="loadingView"
-          BackgroundColor="Blue"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" >
-
-        <Loading x:Name="loading"
-                 PositionUsesPivotPoint="True"
-                 ParentOrigin="Center"
-                 PivotPoint="Center"
-                 Size2D="50,50"/>
-
-    </View>
-
-</b:View>
diff --git a/test/NUITizenGallery/res/layout/BackgroundColorTest2Page.xaml b/test/NUITizenGallery/res/layout/BackgroundColorTest2Page.xaml
deleted file mode 100644
index 5c78fd0..0000000
--- a/test/NUITizenGallery/res/layout/BackgroundColorTest2Page.xaml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<b:View x:Class="NUITizenGallery.BackgroundColorTest2Page"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:b="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  BackgroundColor="Yellow"
-  HeightResizePolicy="FillToParent"
-  WidthResizePolicy="FillToParent"
-  ParentOrigin="Center" 
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true">
-
-    <View.Layout>
-        <LinearLayout LinearOrientation="Vertical" LinearAlignment="Begin" CellPadding="10,0"/>
-    </View.Layout>
-
-    <View x:Name="layout1"
-           WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-           BackgroundColor="Red"
-           Weight="1.0"
-           Opacity="0.5">
-
-        <Button x:Name="button1"
-                WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                PointSize="6"
-                Text="Change Layout 1 Background Color"
-                TextColor="White"
-                BackgroundColor="Black"/>
-
-    </View>
-
-    <View x:Name="layout2"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          BackgroundColor="Green"
-          Weight="1.0"
-          Opacity="0.5">
-
-        <Button x:Name="button2"
-                WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                PointSize="6"
-                Text="Change Layout 2 Background Color &amp; Opacity"
-                TextColor="White"
-                BackgroundColor="#800000"/>
-
-    </View>
-
-</b:View>
diff --git a/test/NUITizenGallery/res/layout/BackgroundColorTest3Page.xaml b/test/NUITizenGallery/res/layout/BackgroundColorTest3Page.xaml
deleted file mode 100644
index f4d533a..0000000
--- a/test/NUITizenGallery/res/layout/BackgroundColorTest3Page.xaml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<b:View x:Class="NUITizenGallery.BackgroundColorTest3Page"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:b="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  HeightResizePolicy="FillToParent"
-  WidthResizePolicy="FillToParent"
-  ParentOrigin="Center" 
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true">
-    
-    <Button x:Name="button1"
-            BackgroundColor="Black"
-            WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-            PointSize="6"
-            Text="Change Page Background Color"
-            TextColor="White"/>
-
-</b:View>
diff --git a/test/NUITizenGallery/res/layout/BackgroundColorTest4Page.xaml b/test/NUITizenGallery/res/layout/BackgroundColorTest4Page.xaml
deleted file mode 100644
index 6612868..0000000
--- a/test/NUITizenGallery/res/layout/BackgroundColorTest4Page.xaml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<b:View x:Class="NUITizenGallery.BackgroundColorTest4Page"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:b="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  HeightResizePolicy="FillToParent"
-  WidthResizePolicy="FillToParent"
-  ParentOrigin="Center" 
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <View.Layout>
-        <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10"/>
-    </View.Layout>
-
-    <View HeightResizePolicy="FillToParent"
-          WidthResizePolicy="FillToParent"
-          BackgroundColor="Green"
-          Weight="0.9"/>
-
-
-    <View x:Name="mainView"
-          HeightResizePolicy="FillToParent" 
-          WidthResizePolicy="FillToParent"
-          BackgroundColor="White"
-          Weight="0.05">
-        
-        <View.Layout>
-            <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10"/>
-        </View.Layout>
-
-        <TextLabel x:Name="label"
-                   WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                   PointSize="6"
-                   Text="This is a sample label"
-                   VerticalAlignment="Center"/>
-
-        <Button x:Name="btnRedLabel"
-                WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                PointSize="6"
-                Text="Set label background color to red"
-                TextColor="White" />
-
-        <Button x:Name="btnDefaultLabel"
-                   WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                    PointSize="6"
-                    Text="Set label background color to default"
-                    TextColor="White"/>
-
-        <Button x:Name="button"
-                WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                PointSize="6"
-                Text="This is a sample button"
-                TextColor="White"/>
-
-        <Button x:Name="btnBlueButton"
-                WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                PointSize="6"
-                Text="Set button background color to blue"
-                TextColor="White"/>
-
-        <Button x:Name="btnDefaultButton"
-                WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                PointSize="6"
-                Text="Set button background color to default"
-                TextColor="White"/>
-        
-    </View>
-</b:View>
diff --git a/test/NUITizenGallery/res/layout/BackgroundColorTest5Page.xaml b/test/NUITizenGallery/res/layout/BackgroundColorTest5Page.xaml
deleted file mode 100644
index c6fa929..0000000
--- a/test/NUITizenGallery/res/layout/BackgroundColorTest5Page.xaml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<b:View x:Class="NUITizenGallery.BackgroundColorTest5Page"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:b="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  HeightResizePolicy="FillToParent"
-  WidthResizePolicy="FillToParent"
-  ParentOrigin="Center" 
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true">
-    
-    <View.Layout>
-        <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center"/>
-    </View.Layout>
-
-    <View x:Name="mainView"
-          WidthResizePolicy="FillToParent"
-          BackgroundColor="#00ffff"
-          Opacity="0.9"
-          Weight="1.0">
-
-        <View.Layout>
-            <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10"/>
-        </View.Layout>
-
-        <Button x:Name="button1"
-                WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                PointSize="8"
-                Text="Change BackgroundColor"/>
-
-        <TextLabel x:Name="label"
-                   WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                   PointSize="8"
-                   Text="This is label"/>
-
-        <TextField x:Name="textField"
-                   WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                   PointSize="8"
-                   Text="This is Entry"/>
-
-        <Progress x:Name="progress"
-                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                  MinValue="0.0"
-                  MaxValue="1.0"
-                  CurrentValue="0.5"
-                  BufferColor="#FF66FF"
-                  Weight="1.0"/>
-
-        <Slider x:Name="slider"
-                WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                MinValue="0"
-                MaxValue="1.0"
-                BgTrackColor="#800080"
-                Weight="1.0"/>
-
-    </View>
-
-    <View x:Name="loadingView"
-          BackgroundColor="Yellow"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" >
-
-        <Loading x:Name="loading"
-                 PositionUsesPivotPoint="True"
-                 ParentOrigin="Center"
-                 PivotPoint="Center"
-                 Size2D="50,50"/>
-
-    </View>
-    
-</b:View>
diff --git a/test/NUITizenGallery/res/layout/BackgroundTestPage.xaml b/test/NUITizenGallery/res/layout/BackgroundTestPage.xaml
deleted file mode 100644
index 4024e45..0000000
--- a/test/NUITizenGallery/res/layout/BackgroundTestPage.xaml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<base:View x:Class="NUITizenGallery.BackgroundTestPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    PositionUsesPivotPoint="True" ParentOrigin="Center" 
-    PivotPoint="Center" WidthResizePolicy="FillToParent" 
-    HeightResizePolicy="FillToParent" BackgroundColor="#FFFFFF"
-    x:Name="BackgroundView">
-
-    <comp:Button Text="Change Background" x:Name="ChangeBackgroundButton" WidthResizePolicy="FillToParent"/>
-</base:View>
diff --git a/test/NUITizenGallery/res/layout/BindingTest1.xaml b/test/NUITizenGallery/res/layout/BindingTest1.xaml
deleted file mode 100644
index 333a446..0000000
--- a/test/NUITizenGallery/res/layout/BindingTest1.xaml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<base:View x:Class="NUITizenGallery.BindingTest1Page"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:vm="clr-namespace:NUITizenGallery.ViewModels"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  xmlns:behaviors="clr-namespace:NUITizenGallery.Behaviors"
-  BackgroundColor="White"
-  PositionUsesPivotPoint="True" ParentOrigin="Center" PivotPoint="Center" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-    
-    <View.BindingContext>
-        <vm:BindingTest1ViewModel x:Name="context"/>
-    </View.BindingContext>
-    
-    <View.Layout>
-        <LinearLayout LinearOrientation="Vertical" CellPadding="10,10"/>
-    </View.Layout>
-
-    <View BindingContext="{Binding Source={x:Reference context}}"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          HeightSpecification="150"
-          BackgroundColor="Red"
-          behaviors:VisibilitySetter.IsVisible="{Binding IsBoxVisible}"/>
-
-    <View BindingContext="{Binding Source={x:Reference context}}"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          HeightSpecification="150"
-          BackgroundColor="Blue"
-          behaviors:VisibilitySetter.IsVisible="{Binding IsBoxVisible}"/>
-
-    <Button BindingContext="{Binding Source={x:Reference context}}"
-            Command="{Binding ChangeVisibility}"
-            WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-            Text="Visibility"/>
-
-
-</base:View>
diff --git a/test/NUITizenGallery/res/layout/BindingTest2Page.xaml b/test/NUITizenGallery/res/layout/BindingTest2Page.xaml
deleted file mode 100644
index 5481e38..0000000
--- a/test/NUITizenGallery/res/layout/BindingTest2Page.xaml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<base:View x:Class="NUITizenGallery.BindingTest2Page"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:vm="clr-namespace:NUITizenGallery.ViewModels"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  BackgroundColor="White"
-  PositionUsesPivotPoint="True" ParentOrigin="Center" PivotPoint="Center" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-    
-    <View.BindingContext>
-        <vm:BindingTest2ViewModel x:Name="context"/>
-    </View.BindingContext>
-    
-    <View.Layout>
-        <LinearLayout LinearOrientation="Vertical" CellPadding="10,10" LinearAlignment="CenterHorizontal"/>
-    </View.Layout>
-
-    <TextLabel BindingContext="{Binding Source={x:Reference context}"
-               WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-               HorizontalAlignment="Center"
-               MultiLine="True"
-               Text="{Binding BoxSizeText}"/>
-
-    <Slider BindingContext="{Binding Source={x:Reference context}}"
-            WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-            MinValue="0"
-            MaxValue="300"
-            CurrentValue="{Binding BoxSize}"/>
-    
-    <View BindingContext="{Binding Source={x:Reference context}}"
-          BackgroundColor="Red"
-          SizeWidth="{Binding BoxSize}"
-          SizeHeight="{Binding BoxSize}"/>
-
-    <View BindingContext="{Binding Source={x:Reference context}}"
-          BackgroundColor="Blue"
-          SizeWidth="{Binding BoxSize}"
-          SizeHeight="{Binding BoxSize}"/>
-
-</base:View>
diff --git a/test/NUITizenGallery/res/layout/BoxViewTest/BoxViewTest1.xaml b/test/NUITizenGallery/res/layout/BoxViewTest/BoxViewTest1.xaml
deleted file mode 100644
index 2875b1c..0000000
--- a/test/NUITizenGallery/res/layout/BoxViewTest/BoxViewTest1.xaml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<b:View x:Class="NUITizenGallery.BoxViewTest1"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:b="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  HeightResizePolicy="FillToParent" 
-  WidthResizePolicy="FillToParent" 
-  ParentOrigin="Center" 
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <View.Layout>
-        <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
-    </View.Layout>
-
-    <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          SizeHeight="80"
-          BackgroundColor="1,0,0,1"
-          />
-
-    <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          SizeHeight="80"
-          BackgroundColor="0,1,0,1"
-          />
-
-    <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          SizeHeight="80"
-          BackgroundColor="0,0,1,1"
-          />
-    
-</b:View>
diff --git a/test/NUITizenGallery/res/layout/BoxViewTest/BoxViewTest2.xaml b/test/NUITizenGallery/res/layout/BoxViewTest/BoxViewTest2.xaml
deleted file mode 100644
index e0d8890..0000000
--- a/test/NUITizenGallery/res/layout/BoxViewTest/BoxViewTest2.xaml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<b:View x:Class="NUITizenGallery.BoxViewTest2"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:b="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  HeightResizePolicy="FillToParent" 
-  WidthResizePolicy="FillToParent" 
-  ParentOrigin="Center" 
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <View.Layout>
-        <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top"/>
-    </View.Layout>
-
-    <View WidthResizePolicy="FillToParent">
-
-        <View.Layout>
-            <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10"/>
-        </View.Layout>
-
-        <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              SizeHeight="80"
-              BackgroundColor="1,0,0,1"/>
-
-        <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              SizeHeight="80"
-              BackgroundColor="0,1,0,1"/>
-
-        <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              SizeHeight="80"
-              BackgroundColor="0,0,1,1"/>
-
-    </View>
-
-    <View Weight="1.0">
-        
-        <View.Layout>
-            <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Bottom" CellPadding="10,10" />
-        </View.Layout>
-
-        <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              SizeHeight="800"
-              SizeWidth="80"
-              BackgroundColor="1,0,0,1"/>
-
-        <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              SizeHeight="800"
-              SizeWidth="80"
-              BackgroundColor="0,1,0,1"/>
-
-        <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              SizeHeight="800"
-              SizeWidth="80"
-              BackgroundColor="0,0,1,1"/>
-
-    </View>
-
-</b:View>
diff --git a/test/NUITizenGallery/res/layout/BoxViewTest/BoxViewTest3.xaml b/test/NUITizenGallery/res/layout/BoxViewTest/BoxViewTest3.xaml
deleted file mode 100644
index 277720c..0000000
--- a/test/NUITizenGallery/res/layout/BoxViewTest/BoxViewTest3.xaml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<b:View x:Class="NUITizenGallery.BoxViewTest3"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:b="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  HeightResizePolicy="FillToParent" 
-  WidthResizePolicy="FillToParent" 
-  ParentOrigin="Center" 
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <View.Layout>
-        <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10"/>
-    </View.Layout>
-
-    <TextLabel Text="Normal colors"/>
-
-    <View x:Name="colorBox"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          SizeHeight="80"/>
-
-    <TextLabel Text="Pre-multiplied alpha colors" />
-
-    <View x:Name="preColorBox"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          SizeHeight="80"/>
-
-    <TextLabel Text="R"/>
-
-    <nui:Slider x:Name="red"
-                WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                CurrentValue="176.0"
-                MinValue="0.0"
-                MaxValue="255.0"/>
-
-    <TextLabel Text="G"/>
-
-    <nui:Slider x:Name="green"
-                WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                CurrentValue="255.0"
-                MinValue="0.0"
-                MaxValue="255.0"/>
-
-    <TextLabel Text="B"/>
-
-    <nui:Slider x:Name="blue"
-                WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                CurrentValue="35.0"
-                MinValue="0.0"
-                MaxValue="255.0"/>
-
-    <TextLabel Text="A"/>
-
-    <nui:Slider x:Name="alpha"
-                WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                CurrentValue="255.0"
-                MinValue="0.0"
-                MaxValue="255.0"/>
-
-    <TextLabel x:Name="output"/>
-
-</b:View>
diff --git a/test/NUITizenGallery/res/layout/BoxViewTest/BoxViewTest4.xaml b/test/NUITizenGallery/res/layout/BoxViewTest/BoxViewTest4.xaml
deleted file mode 100644
index a6e658a..0000000
--- a/test/NUITizenGallery/res/layout/BoxViewTest/BoxViewTest4.xaml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<b:View x:Class="NUITizenGallery.BoxViewTest4"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:b="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  HeightResizePolicy="FillToParent" 
-  WidthResizePolicy="FillToParent" 
-  ParentOrigin="Center" 
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="#808080">
-
-    <View.Layout>
-        <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterVertical" CellPadding="10,10" />
-    </View.Layout>
-
-    <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}" >
-        
-        <View.Layout>
-            <LinearLayout LinearAlignment="Center"/>
-        </View.Layout>
-
-        <View x:Name="box"
-          BackgroundColor="1,0,0,1"
-          Size2D="200,200"/>
-        
-    </View>
-
-    <TextLabel x:Name="label" 
-               Text="+++ Scale : "/>
-
-    <nui:Button x:Name="button1"
-                WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                Text="Box Scale++"/>
-
-    <nui:Button x:Name="button2"
-                WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                Text="Box Scale--"/>
-</b:View>
diff --git a/test/NUITizenGallery/res/layout/BrushBackgroundTestPage.xaml b/test/NUITizenGallery/res/layout/BrushBackgroundTestPage.xaml
deleted file mode 100644
index 273c5a6..0000000
--- a/test/NUITizenGallery/res/layout/BrushBackgroundTestPage.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<base:View x:Class="NUITizenGallery.BrushBackgroundTestPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    PositionUsesPivotPoint="True" ParentOrigin="Center"
-    PivotPoint="Center" WidthResizePolicy="FillToParent"
-    HeightResizePolicy="FillToParent" BackgroundColor="#FFFFFF"
-    x:Name="MainView">
-
-    <View.Layout>
-      <LinearLayout LinearOrientation="Vertical" CellPadding="10,10"/>
-    </View.Layout>
-
-    <comp:Button x:Name="ButtonSolid" Text="Set solid color" WidthResizePolicy="FillToParent"/>
-    <comp:Button x:Name="ButtonGradientLinear" Text="Set linear gradient" WidthResizePolicy="FillToParent"/>
-    <comp:Button x:Name="ButtonGradientRadial" Text="Set radial gradient" WidthResizePolicy="FillToParent"/>
-</base:View>
diff --git a/test/NUITizenGallery/res/layout/BrushBorderTestPage.xaml b/test/NUITizenGallery/res/layout/BrushBorderTestPage.xaml
deleted file mode 100644
index 608f07f..0000000
--- a/test/NUITizenGallery/res/layout/BrushBorderTestPage.xaml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<base:View x:Class="NUITizenGallery.BrushBorderTestPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    PositionUsesPivotPoint="True" ParentOrigin="Center" 
-    PivotPoint="Center" WidthResizePolicy="FillToParent" 
-    HeightResizePolicy="FillToParent" BackgroundColor="#FFFFFF"
-    x:Name="MainView">
-
-    LinearLayout pageLayout = new LinearLayout();
-            pageLayout.LinearOrientation = LinearLayout.Orientation.Vertical;
-            pageLayout.CellPadding = new Size2D(10, 10);
-            pageLayout.Padding = new Extents(10, 10, 10, 10);
-            this.Layout = pageLayout;
-
-    <View.Layout>
-      <LinearLayout LinearOrientation="Vertical" CellPadding="0,10" LinearAlignment="Center"/>
-    </View.Layout>
-
-    <comp:Button x:Name="ButtonSolid" Text="Set solid color" WidthResizePolicy="FillToParent"/>
-    <comp:Button x:Name="ButtonGradientLinear" Text="Set linear gradient" WidthResizePolicy="FillToParent"/>
-    <comp:Button x:Name="ButtonGradientRadial" Text="Set radial gradient" WidthResizePolicy="FillToParent"/>
-
-    <base:VisualView x:Name="ViewTest1" Size2D="500,120" BackgroundColor="#0000FF"/>
-</base:View>
diff --git a/test/NUITizenGallery/res/layout/BrushComponentsTestPage.xaml b/test/NUITizenGallery/res/layout/BrushComponentsTestPage.xaml
deleted file mode 100644
index 101782c..0000000
--- a/test/NUITizenGallery/res/layout/BrushComponentsTestPage.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<base:View x:Class="NUITizenGallery.BrushComponentsTestPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    PositionUsesPivotPoint="True" ParentOrigin="Center" 
-    PivotPoint="Center" WidthResizePolicy="FillToParent" 
-    HeightResizePolicy="FillToParent" BackgroundColor="#FFFFFF"
-    x:Name="MainView">
-
-    <comp:Button x:Name="ButtonSolid" Text="Set solid color" WidthResizePolicy="FillToParent"/>
-    <comp:Button x:Name="ButtonGradientLinear" Text="Set linear gradient" WidthResizePolicy="FillToParent"/>
-    <comp:Button x:Name="ButtonGradientRadial" Text="Set radial gradient" WidthResizePolicy="FillToParent"/>
-
-    <base:View x:Name="ViewTest1" Size2D="500,120" WidthResizePolicy="FillToParent"/>
-    <base:View x:Name="ViewTest2" Size2D="500,120" WidthResizePolicy="FillToParent"/>
-    <base:View x:Name="ViewTest3" Size2D="500,120" WidthResizePolicy="FillToParent"/>
-</base:View>
diff --git a/test/NUITizenGallery/res/layout/BrushImageTestPage.xaml b/test/NUITizenGallery/res/layout/BrushImageTestPage.xaml
deleted file mode 100644
index b975941..0000000
--- a/test/NUITizenGallery/res/layout/BrushImageTestPage.xaml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<comp:ContentPage x:Class="NUITizenGallery.BrushImageTestPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  ParentOrigin="Center"
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-  
-  <comp:ContentPage.AppBar>
-    <comp:AppBar x:Name="appBar"
-                 Title="BrushImageTest"/>
-  </comp:ContentPage.AppBar>
-
-  <comp:ContentPage.Content>
-        <base:View x:Name="ContentView"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-            <View.Layout>
-                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
-            </View.Layout>
-
-            <comp:Button x:Name="ButtonSolid" Text="Set solid color" WidthResizePolicy="FillToParent"/>
-            <comp:Button x:Name="ButtonGradientLinear" Text="Set linear gradient" WidthResizePolicy="FillToParent"/>
-            <comp:Button x:Name="ButtonGradientRadial" Text="Set radial gradient" WidthResizePolicy="FillToParent"/>
-
-            <base:ImageView x:Name="Image1" WidthSpecification="{Static LayoutParamPolicies.WrapContent}" HeightSpecification="{Static LayoutParamPolicies.WrapContent}"/>
-            <base:ImageView x:Name="Image2" WidthSpecification="{Static LayoutParamPolicies.WrapContent}" HeightSpecification="{Static LayoutParamPolicies.WrapContent}"/>
-        </base:View>
-    </comp:ContentPage.Content>
-</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/BrushViewerTestPage.xaml b/test/NUITizenGallery/res/layout/BrushViewerTestPage.xaml
deleted file mode 100644
index 62e7a17..0000000
--- a/test/NUITizenGallery/res/layout/BrushViewerTestPage.xaml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<base:View x:Class="NUITizenGallery.BrushViewerTestPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    PositionUsesPivotPoint="True" ParentOrigin="Center" 
-    PivotPoint="Center" WidthResizePolicy="FillToParent" 
-    HeightResizePolicy="FillToParent" BackgroundColor="#FFFFFF"
-    x:Name="MainView">
-
-    <comp:Button x:Name="ButtonSolid" Text="Set solid color" WidthResizePolicy="FillToParent"/>
-    <comp:Button x:Name="ButtonGradientLinear" Text="Set linear gradient" WidthResizePolicy="FillToParent"/>
-    <comp:Button x:Name="ButtonGradientRadial" Text="Set radial gradient" WidthResizePolicy="FillToParent"/>
-    <base:VisualView x:Name="BrushViewer" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
-</base:View>
diff --git a/test/NUITizenGallery/res/layout/ButtonTest1Page.xaml b/test/NUITizenGallery/res/layout/ButtonTest1Page.xaml
deleted file mode 100644
index fa9a76b..0000000
--- a/test/NUITizenGallery/res/layout/ButtonTest1Page.xaml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<b:View x:Class="NUITizenGallery.ButtonTest1Page"
-xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:b="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
-
-    <b:View x:Name="rootView"
-            HeightResizePolicy="FillToParent"
-            WidthResizePolicy="FillToParent"
-            BackgroundColor ="#ffffff">
-        <View.Layout>
-            <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="50,50"/>
-        </View.Layout>
-
-        <nui:Button x:Name="button1"
-
-                    WidthResizePolicy="FillToParent"
-                    BackgroundColor="#52c7d9"
-                    PointSize="10"
-                    Text="Text Button"
-                    TextColor="#ffffff"
-                    Weight="0.12"/>
-
-        <nui:Button x:Name="button2"
-
-                    WidthResizePolicy="FillToParent"
-                    BackgroundColor="#52c7d9"
-                    PointSize="10"
-                    TextColor="#ffffff"
-                    Weight="0.12"> 
-            <nui:Button.Icon>
-                <b:ImageView x:Name="imageview1" SizeHeight="60" SizeWidth="60" />
-            </nui:Button.Icon>            
-        </nui:Button>
-
-        <nui:Button x:Name="button3"
-
-                    WidthResizePolicy="FillToParent"
-                    BackgroundColor="#52c7d9"
-                    PointSize="10"
-                    Text="Image and Text Button"
-                    TextColor="#ffffff"
-                    Weight="0.12">
-            <nui:Button.Icon>
-                <b:ImageView x:Name="imageview2" SizeHeight="60" SizeWidth="60" />
-            </nui:Button.Icon>      
-        </nui:Button>
-
-        <nui:Button x:Name="button4"
-
-                    WidthResizePolicy="FillToParent"
-                    BackgroundColor="#ffffff"
-                    PointSize="10"
-                    Text="Color Change"
-                    TextColor="#52c7d9"
-                    Weight="0.12">
-            <nui:Button.Icon>
-                <b:ImageView x:Name="imageview3" SizeHeight="60" SizeWidth="60" />
-            </nui:Button.Icon>      
-        </nui:Button>
-
-        <nui:Button x:Name="button5"
-
-                    WidthResizePolicy="FillToParent"
-                    BackgroundColor="#52c7d9"
-                    PointSize="10"
-                    Text="Text Toggle"
-                    TextColor="#ffffff"
-                    Weight="0.12">
-            <nui:Button.Icon>
-                <b:ImageView x:Name="imageview4" SizeHeight="60" SizeWidth="60" />
-            </nui:Button.Icon>      
-        </nui:Button>
-
-        <nui:Button x:Name="button6"
-
-                    WidthResizePolicy="FillToParent"
-                    BackgroundColor="#52c7d9"
-                    PointSize="10"
-                    Text="Image Toggle"
-                    TextColor="#ffffff"
-                    Weight="0.12">
-            <nui:Button.Icon>
-                <b:ImageView x:Name="imageview5" SizeHeight="60" SizeWidth="60" />
-            </nui:Button.Icon>      
-        </nui:Button>
-
-        <nui:Button x:Name="button7"
-
-                    WidthResizePolicy="FillToParent"
-                    BackgroundColor="#52c7d9"
-                    PointSize="10"
-                    IsEnabled="False"
-                    Text="Disabled button"
-                    TextColor="#ffffff"
-                    Weight="0.12"/>
-
-        <nui:Button x:Name="button8"
-
-                    WidthResizePolicy="FillToParent"
-                    BackgroundColor="#52c7d9"
-                    PointSize="10"
-                    Text="Disabled toggle"
-                    TextColor="#ffffff"
-                    Weight="0.12"/>
-    </b:View>
-</b:View>
diff --git a/test/NUITizenGallery/res/layout/ButtonTest2Page.xaml b/test/NUITizenGallery/res/layout/ButtonTest2Page.xaml
deleted file mode 100644
index 7b89435..0000000
--- a/test/NUITizenGallery/res/layout/ButtonTest2Page.xaml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<b:View x:Class="NUITizenGallery.ButtonTest2Page"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:b="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  PositionUsesPivotPoint="True" ParentOrigin="Center" PivotPoint="Center" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-
-    <b:View x:Name="rootView"
-            HeightResizePolicy="FillToParent"
-            WidthResizePolicy="FillToParent"
-            BackgroundColor="White">
-
-        <View.Layout>
-            <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="30,30"/>
-        </View.Layout>
-
-        <nui:Button x:Name="coloredButton"
-                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                    BackgroundColor="Transparent"
-                    Text="Color change"
-                    TextColor="Color.Blue"
-                    Opacity="0.5"
-                    PointSize="8">
-
-            <nui:Button.Icon>
-                <b:ImageView x:Name="imageview1" SizeHeight="60" SizeWidth="60" />
-            </nui:Button.Icon>
-
-        </nui:Button>
-
-        <nui:Button x:Name="button2"
-                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                    IsEnabled="False"
-                    PointSize="8"
-                    Text="Disabled button"/>
-
-        <nui:Button x:Name="button3"
-                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                    PointSize="8"
-                    Text="Disabled toggle"/>
-
-
-    </b:View>
-</b:View>
diff --git a/test/NUITizenGallery/res/layout/ButtonTest5Page.xaml b/test/NUITizenGallery/res/layout/ButtonTest5Page.xaml
deleted file mode 100644
index 52daaf3..0000000
--- a/test/NUITizenGallery/res/layout/ButtonTest5Page.xaml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<b:View x:Class="NUITizenGallery.ButtonTest5Page"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:b="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
-
-<b:View x:Name="rootView"
-            HeightResizePolicy="FillToParent"
-            WidthResizePolicy="FillToParent"
-            BackgroundColor="#ffffff">
-        <View.Layout>
-            <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="30,30"/>
-        </View.Layout>
-
-       
-        <b:TextLabel x:Name="text1"
-                     WidthResizePolicy="FillToParent"
-                     HeightResizePolicy="UseNaturalSize"
-                     PointSize="8"
-                     Text="Button Size: 70"
-                     />
-
-        <nui:Slider x:Name="slider1"
-                    MinValue="0"
-                    MaxValue="200"
-                    CurrentValue="70"
-                    WidthResizePolicy="FillToParent"
-                    TrackThickness="5"
-                    BgTrackColor="#b1b1b1"
-                    SlidedTrackColor="#3db9cc"
-                    />
-
-        <b:TextLabel x:Name="text2"
-                     WidthResizePolicy="FillToParent"
-                     HeightResizePolicy="UseNaturalSize"
-                     PointSize="8"
-                     Text="Button Font Size: 5"
-                     />
-
-        <nui:Slider x:Name="slider2"
-                    MinValue="0"
-                    MaxValue="30"
-                    CurrentValue="5"
-                    WidthResizePolicy="FillToParent"
-                    TrackThickness="5"
-                    BgTrackColor="#b1b1b1"
-                    SlidedTrackColor="#3db9cc"
-                    />
-
-        <b:TextLabel x:Name="text3"
-                     WidthResizePolicy="FillToParent"
-                     HeightResizePolicy="UseNaturalSize"
-                     PointSize="8"
-                     Text="Button Opaticy: 1.0"
-                     />
-
-        <nui:Slider x:Name="slider3"
-                    MinValue="0"
-                    MaxValue="1"
-                    CurrentValue="1"
-                    WidthResizePolicy="FillToParent"
-                    TrackThickness="5"
-                    BgTrackColor="#b1b1b1"
-                    SlidedTrackColor="#3db9cc"
-                    />
-
-        <nui:Button x:Name="button1"
-                    WidthResizePolicy="FillToParent"
-                    SizeHeight="70"
-                    BackgroundColor="#0000ff"
-                    Text="Button1"
-                    PointSize="5"
-                    Opacity="1"/>
-
-        <nui:Button x:Name="button2"
-                    WidthResizePolicy="FillToParent"
-                    SizeHeight="70"
-                    BackgroundColor="#0000ff"
-                    PointSize="5"
-                    Opacity="1"
-                    Text="Button2"/>
-
-    </b:View>
-</b:View>
-
diff --git a/test/NUITizenGallery/res/layout/ButtonTest6Page.xaml b/test/NUITizenGallery/res/layout/ButtonTest6Page.xaml
deleted file mode 100644
index 88fd2a9..0000000
--- a/test/NUITizenGallery/res/layout/ButtonTest6Page.xaml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<comp:ContentPage x:Class="NUITizenGallery.ButtonTest6Page"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  HeightResizePolicy="FillToParent"
-  WidthResizePolicy="FillToParent"
-  ParentOrigin="Center"
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <comp:ContentPage.AppBar>
-        <comp:AppBar x:Name="appBar"
-                    Title="ButtonTest6"/>
-    </comp:ContentPage.AppBar>
-
-    <comp:ContentPage.Content>
-      <base:View x:Name="ContentView"
-        WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-        HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-
-        <View.Layout>
-            <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="60,60"/>
-        </View.Layout>
-
-        <View WidthResizePolicy="FillToParent">
-
-            <comp:Button x:Name="button1"
-                            WidthResizePolicy="FillToParent"
-                            SizeHeight="70"
-                            BackgroundColor="#3db9cc"
-                            PointSize="5"
-                            Opacity="1"
-                            Text="BackgroundColor"/>
-
-        </View>
-
-        <View Weight="1.0">
-            <View.Layout>
-                <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Center" CellPadding="30,30"/>
-            </View.Layout>
-
-            <TextLabel x:Name="redText"
-                        HorizontalAlignment="Center"
-                        SizeWidth="100"
-                        SizeHeight="180"
-                        PointSize="8"
-                        BackgroundColor="Red"
-                        Text="RED"
-                        />
-            <TextLabel x:Name="greenText"
-                        HorizontalAlignment="Center"
-                        SizeWidth="100"
-                        SizeHeight="180"
-                        PointSize="8"
-                        BackgroundColor="Green"
-                        Text="GREEN"
-                        />
-
-            <TextLabel x:Name="grayText"
-                        HorizontalAlignment="Center"
-                        SizeWidth="100"
-                        SizeHeight="180"
-                        PointSize="8"
-                        BackgroundColor="#8C8C8C"
-                        Text="GRAY"
-                        />
-        </View>
-
-      </base:View>
-    </comp:ContentPage.Content>
-</comp:ContentPage>
-
diff --git a/test/NUITizenGallery/res/layout/ButtonTest7Page.xaml b/test/NUITizenGallery/res/layout/ButtonTest7Page.xaml
deleted file mode 100644
index 84c7a75..0000000
--- a/test/NUITizenGallery/res/layout/ButtonTest7Page.xaml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<b:View x:Class="NUITizenGallery.ButtonTest7Page"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:b="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
-
-    <b:View x:Name="rootView"
-            HeightResizePolicy="FillToParent"
-            WidthResizePolicy="FillToParent"
-            BackgroundColor="#ffffff">
-        <View.Layout>
-            <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="30,30"/>
-        </View.Layout>
-
-
-        <b:TextLabel x:Name="text1"
-                     WidthResizePolicy="FillToParent"
-                     HeightResizePolicy="UseNaturalSize"
-                     PointSize="8"
-                     Text="Button Press and release event trigger test"
-                     />
-
-        <nui:Button x:Name="button1"
-                    WidthResizePolicy="FillToParent"
-                    SizeHeight="70"
-                    BackgroundColor="#3db9cc"
-                    PointSize="5"
-                    Opacity="1"
-                    Text="Click me"/>
-
-        <b:TextLabel x:Name="text2"
-                     WidthResizePolicy="FillToParent"
-                     HeightResizePolicy="UseNaturalSize"
-                     PointSize="8"
-                     Text=""
-                     />
-
-    </b:View>
-</b:View>
-
diff --git a/test/NUITizenGallery/res/layout/CarouselPageTest1Page.xaml b/test/NUITizenGallery/res/layout/CarouselPageTest1Page.xaml
deleted file mode 100644
index 983d59d..0000000
--- a/test/NUITizenGallery/res/layout/CarouselPageTest1Page.xaml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<comp:ContentPage x:Class="NUITizenGallery.CarouselPageTest1Page"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    PositionUsesPivotPoint="True" ParentOrigin="Center"
-    PivotPoint="Center" WidthResizePolicy="FillToParent"
-    HeightResizePolicy="FillToParent" BackgroundColor="#FFFFFF">
-
-    <comp:ContentPage.AppBar>
-        <comp:AppBar x:Name="appBar"
-                    Title="CarouselPageTest1"/>
-    </comp:ContentPage.AppBar>
-
-    <comp:ContentPage.Content>
-        <base:View x:Name="ContentView"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-            <View.Layout>
-                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="10,10" />
-            </View.Layout>
-
-            <comp:ScrollableBase x:Name="Scroller" SnapToPage="true" ScrollingDirection="Horizontal" BackgroundColor="Yellow" SizeWidth="600">
-              <ScrollableBase.Layout>
-                <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Top" CellPadding="5,5" />
-              </ScrollableBase.Layout>
-
-              <base:View x:Name="Page1" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="500">
-                <View.Layout>
-                  <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="5,5" />
-                </View.Layout> -->
-
-                <base:TextLabel Text="Page 0" WidthSpecification="{Static LayoutParamPolicies.WrapContent}" HeightSpecification="{Static LayoutParamPolicies.WrapContent}" HorizontalAlignment="Center"/>
-                <base:View Size2D="400,400" BackgroundColor="Red"/>
-              </base:View>
-              <base:View x:Name="Page2" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="500">
-                <View.Layout>
-                  <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="5,5" />
-                </View.Layout> -->
-
-                <base:TextLabel Text="Page 0" WidthSpecification="{Static LayoutParamPolicies.WrapContent}" HeightSpecification="{Static LayoutParamPolicies.WrapContent}" HorizontalAlignment="Center"/>
-                <base:View Size2D="400,400" BackgroundColor="Green"/>
-              </base:View>
-              <base:View x:Name="Page3" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="500">
-                <View.Layout>
-                  <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="5,5" />
-                </View.Layout> -->
-
-                <base:TextLabel Text="Page 0"  WidthSpecification="{Static LayoutParamPolicies.WrapContent}" HeightSpecification="{Static LayoutParamPolicies.WrapContent}" HorizontalAlignment="Center"/>
-                <base:View Size2D="400,400" BackgroundColor="Blue"/>
-              </base:View>
-            </comp:ScrollableBase>
-
-            <comp:Pagination x:Name="Index" Size2D="250,50"/>
-        </base:View>
-    </comp:ContentPage.Content>
-</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/CarouselViewTest1Page.xaml b/test/NUITizenGallery/res/layout/CarouselViewTest1Page.xaml
deleted file mode 100644
index bd97e71..0000000
--- a/test/NUITizenGallery/res/layout/CarouselViewTest1Page.xaml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<comp:ContentPage x:Class="NUITizenGallery.CarouselViewTest1Page"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  ParentOrigin="Center"
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <comp:ContentPage.AppBar>
-    <comp:AppBar x:Name="appBar"
-                Title="CarouselViewTest1"/>
-    </comp:ContentPage.AppBar>
-
-    <comp:ContentPage.Content>
-        <base:View x:Name="ContentView"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-            <View.Layout>
-                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
-            </View.Layout>
-
-            <base:View x:Name="VerticalBox"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              HeightSpecification="80">
-
-              <View.Layout>
-                <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Top" CellPadding="5,5" />
-              </View.Layout>
-
-              <comp:Button x:Name="Default" Text="Default" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"  WidthSpecification="190"/>
-              <comp:Button x:Name="Always" Text="Always" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"  WidthSpecification="190"/>
-              <comp:Button x:Name="Never" Text="Never" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"  WidthSpecification="190"/>
-              <base:TextLabel x:Name="ScrollStatus" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"  WidthSpecification="150"/>
-            </base:View>
-
-            <base:TextLabel MultiLine="True" WidthSpecification="{Static LayoutParamPolicies.MatchParent}"  HeightSpecification="80"
-                        Text="Horizontal Scrollbar Visibility Test"/>
-
-            <comp:ScrollableBase x:Name="Scroller" SnapToPage="true" ScrollingDirection="Horizontal"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-              <ScrollableBase.Layout>
-                <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Top" CellPadding="5,5" />
-              </ScrollableBase.Layout>
-              <base:View x:Name="Page1" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"  BackgroundColor="#ff0000"/>
-              <base:View x:Name="Page2" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"  BackgroundColor="#00ff00"/>
-              <base:View x:Name="Page3" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"  BackgroundColor="#0000ff"/>
-            </comp:ScrollableBase>
-        
-            <comp:Pagination x:Name="Index" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="50"/>
-        </base:View>
-    </comp:ContentPage.Content>
-</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/CarouselViewTest2Page.xaml b/test/NUITizenGallery/res/layout/CarouselViewTest2Page.xaml
deleted file mode 100644
index 450429f..0000000
--- a/test/NUITizenGallery/res/layout/CarouselViewTest2Page.xaml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<comp:ContentPage x:Class="NUITizenGallery.CarouselViewTest2Page"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  ParentOrigin="Center"
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <comp:ContentPage.AppBar>
-        <comp:AppBar x:Name="appBar"
-                    Title="CarouselViewTest1"/>
-    </comp:ContentPage.AppBar>
-
-    <comp:ContentPage.Content>
-        <base:View x:Name="ContentView"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-            
-            <View.Layout>
-                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
-            </View.Layout>
-
-            <base:View x:Name="VerticalBox"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              HeightSpecification="80">
-
-              <View.Layout>
-                <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Top" CellPadding="5,5" />
-              </View.Layout>
-
-              <comp:Button x:Name="Default" Text="Default" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"  WidthSpecification="190"/>
-              <comp:Button x:Name="Always" Text="Always" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"  WidthSpecification="190"/>
-              <comp:Button x:Name="Never" Text="Never" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"  WidthSpecification="190"/>
-              <base:TextLabel x:Name="ScrollStatus" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"  WidthSpecification="150"/>
-            </base:View>
-
-            <base:TextLabel MultiLine="True" WidthSpecification="{Static LayoutParamPolicies.MatchParent}"  HeightSpecification="80"
-                        Text="Vertical Scrollbar Visibility Test"/>
-
-            <comp:ScrollableBase x:Name="Scroller" SnapToPage="true" ScrollingDirection="Vertical" 
-                                 WidthSpecification="{Static LayoutParamPolicies.MatchParent}"  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-              <ScrollableBase.Layout>
-                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="5,5" />
-              </ScrollableBase.Layout>
-
-              <base:View x:Name="Page1" Size2D="720, 900" BackgroundColor="#ff0000"/>
-              <base:View x:Name="Page2" Size2D="720, 900" BackgroundColor="#00ff00"/>
-              <base:View x:Name="Page3" Size2D="720, 900" BackgroundColor="#0000ff"/>
-            </comp:ScrollableBase>
-        
-            <comp:Pagination x:Name="Index" Size2D="720,50" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" />
-        </base:View>
-    </comp:ContentPage.Content>
-</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/CarouselViewTest4Page.xaml b/test/NUITizenGallery/res/layout/CarouselViewTest4Page.xaml
deleted file mode 100644
index 360b87b..0000000
--- a/test/NUITizenGallery/res/layout/CarouselViewTest4Page.xaml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<comp:ContentPage x:Class="NUITizenGallery.CarouselViewTest4Page"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  ParentOrigin="Center"
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <comp:ContentPage.AppBar>
-        <comp:AppBar x:Name="appBar"
-                    Title="CarouselViewTest4"/>
-    </comp:ContentPage.AppBar>
-
-    <comp:ContentPage.Content>
-        <base:View x:Name="ContentView"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-            
-            <View.Layout>
-                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
-            </View.Layout>
-
-            <base:View>
-              <base:View.Layout>
-                <LinearLayout LinearOrientation="Horizontal" CellPadding="10,10" LinearAlignment="Center"/>
-              </base:View.Layout>
-              <comp:Button x:Name="SetPage0Button" Text="0" Size2D="50, 50"/>
-              <comp:Button x:Name="SetPage1Button" Text="1" Size2D="50, 50"/>
-              <comp:Button x:Name="SetPage2Button" Text="2" Size2D="50, 50"/>
-              <comp:Button x:Name="SetPage3Button" Text="3" Size2D="50, 50"/>
-              <comp:Button x:Name="SetPage4Button" Text="4" Size2D="50, 50"/>
-              <comp:Button x:Name="SetPage5Button" Text="5" Size2D="50, 50"/>
-            </base:View>
-
-            <comp:ScrollableBase x:Name="Scroller" SnapToPage="true" ScrollingDirection="Horizontal" WidthSpecification="{Static LayoutParamPolicies.MatchParent}"  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-              <comp:ScrollableBase.Layout>
-                <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Center"/>
-              </comp:ScrollableBase.Layout>
-
-              <base:View x:Name="Page0" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"  BackgroundColor="#ff0000">
-                <base:TextLabel Text="Page 0" MultiLine="True" Size2D="720, 100"/>
-              </base:View>
-              <base:View x:Name="Page1" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"  BackgroundColor="#00ff00">
-                <base:TextLabel Text="Page 1" MultiLine="True" Size2D="720, 100"/>
-              </base:View>
-              <base:View x:Name="Page2" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"  BackgroundColor="#0000ff">
-                <base:TextLabel Text="Page 2" MultiLine="True" Size2D="720, 100"/>
-              </base:View>
-              <base:View x:Name="Page3" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"  BackgroundColor="#ff0000">
-                <base:TextLabel Text="Page 3" MultiLine="True" Size2D="720, 100"/>
-              </base:View>
-              <base:View x:Name="Page4" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"  BackgroundColor="#00ff00">
-                <base:TextLabel Text="Page 4" MultiLine="True" Size2D="720, 100"/>
-              </base:View>
-              <base:View x:Name="Page5" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"  BackgroundColor="#0000ff">
-                <base:TextLabel Text="Page 5" MultiLine="True" Size2D="720, 100"/>
-              </base:View>
-            </comp:ScrollableBase>
-        </base:View>
-    </comp:ContentPage.Content>
-</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/CheckBoxTestPage.xaml b/test/NUITizenGallery/res/layout/CheckBoxTestPage.xaml
deleted file mode 100755
index a70715c..0000000
--- a/test/NUITizenGallery/res/layout/CheckBoxTestPage.xaml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<base:View x:Class="NUITizenGallery.CheckBoxTestPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    PositionUsesPivotPoint="True" 
-	ParentOrigin="Center" 
-    PivotPoint="Center" 
-	WidthResizePolicy="FillToParent" 
-    HeightResizePolicy="FillToParent" 
-	BackgroundColor="#FFFFFF">
-
-    <base:View.Layout>
-        <LinearLayout LinearOrientation="Vertical" CellPadding="10,10" LinearAlignment="Top"/>
-    </base:View.Layout>
-
-    <base:View x:Name="btnView" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" >
-        <View.Layout>
-            <LinearLayout LinearOrientation="Vertical" CellPadding="100,100" LinearAlignment="CenterVertical" />
-        </View.Layout>
-        <comp:CheckBox x:Name="checkBox1" Text="False"/>
-        <comp:CheckBox x:Name="checkBox2" Text="Colored CheckBox" IsSelected="true" />
-    </base:View>
-</base:View>
-
diff --git a/test/NUITizenGallery/res/layout/CollectionViewFocusTestPage.xaml b/test/NUITizenGallery/res/layout/CollectionViewFocusTestPage.xaml
deleted file mode 100644
index 4b53156..0000000
--- a/test/NUITizenGallery/res/layout/CollectionViewFocusTestPage.xaml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<base:View x:Class="NUITizenGallery.CollectionViewFocusTestPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    PositionUsesPivotPoint="True" ParentOrigin="Center" 
-    PivotPoint="Center" WidthResizePolicy="FillToParent" 
-    HeightResizePolicy="FillToParent" BackgroundColor="#FFFFFF">
-
-    <!-- <base:View.Layout>
-        <LinearLayout LinearOrientation="Vertical" CellPadding="40,0" LinearAlignment="Center"/>
-    </base:View.Layout> -->
-
-    <comp:ScrollableBase x:Name="Scroller" ScrollingDirection="Horizontal" Size2D="720, 900">
-      <comp:ScrollableBase.Layout>
-        <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Center" CellPadding="120,0"/>
-      </comp:ScrollableBase.Layout>
-    </comp:ScrollableBase>
-
-</base:View>
diff --git a/test/NUITizenGallery/res/layout/CollectionViewItem.xaml b/test/NUITizenGallery/res/layout/CollectionViewItem.xaml
deleted file mode 100644
index 8dc6560..0000000
--- a/test/NUITizenGallery/res/layout/CollectionViewItem.xaml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<base:View x:Class="NUITizenGallery.CollectionViewItem"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" Size2D="340, 900">
-
-  <base:View x:Name="ItemBackground" BackgroundColor="#ff0000" PositionUsesPivotPoint="True" ParentOrigin="Center" PivotPoint="Center" Size2D="300, 700">
-    <base:View.Layout>
-      <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center"/>
-    </base:View.Layout>
-
-    <base:ImageView x:Name="ItemPoster" Size2D="300, 438"/>
-    <base:TextLabel x:Name="ItemTitle"  Size2D="300, 50" BackgroundColor="#5c5c5c" Opacity="0.7" TextColor="#ffffff"/>
-    <base:TextLabel x:Name="ItemDescription" Size2D="300, 150" BackgroundColor="#5c5c5c" Opacity="0.7"/>
-  </base:View>
-
-</base:View>
\ No newline at end of file
diff --git a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest1.xaml b/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest1.xaml
deleted file mode 100644
index e9630ab..0000000
--- a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest1.xaml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<comp:ContentPage x:Class="NUITizenGallery.CollectionViewTest1"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  ParentOrigin="Center"
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <comp:ContentPage.AppBar>
-        <comp:AppBar x:Name="appBar"
-                    Title="CollectionViewTest1"/>
-    </comp:ContentPage.AppBar>
-
-    <comp:ContentPage.Content>
-        <base:View x:Name="ContentView"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-            <View.Layout>
-                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
-            </View.Layout>
-            <base:View x:Name="TopBox"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              HeightSpecification="100"
-              BackgroundColor="#D3D3D3">
-                <base:View.Layout>
-                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="10,10" />
-                </base:View.Layout>
-                <base:TextLabel x:Name="Title"
-                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                  PixelSize="30"
-                  HorizontalAlignment="Begin"
-                  Text="ScrollBar"/>
-                <base:View x:Name="RadioBox"
-                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                  HeightSpecification="60">
-                    <base:View.Layout>
-                        <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Center" CellPadding="10,10" />
-                    </base:View.Layout>
-                    <comp:RadioButton x:Name="ShowBar" Text="Show" SelectedChanged="OnShowBarRadioChanged"/>
-                    <comp:RadioButton x:Name="HideBar" Text="Hide" IsSelected="true"/>
-                </base:View>
-            </base:View>
-
-            <comp:CollectionView x:Name="ColView"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              ScrollingDirection="Horizontal"
-              ItemsSource="{Binding TestSource}"
-              SelectionMode="None">
-                <comp:CollectionView.ItemsLayouter>
-                      <comp:LinearLayouter />
-                </comp:CollectionView.ItemsLayouter>
-            </comp:CollectionView>
-        </base:View>
-    </comp:ContentPage.Content>
-</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest10.xaml b/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest10.xaml
deleted file mode 100644
index 8b14dfc..0000000
--- a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest10.xaml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<comp:ContentPage x:Class="NUITizenGallery.CollectionViewTest10"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  ParentOrigin="Center"
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <comp:ContentPage.AppBar>
-        <comp:AppBar x:Name="appBar"
-                    Title="CollectionViewTest10"/>
-    </comp:ContentPage.AppBar>
-
-    <comp:ContentPage.Content>
-        <base:View x:Name="ContentView"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-            <View.Layout>
-                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
-            </View.Layout>
-            <base:View x:Name="TopBox"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              HeightSpecification="100"
-              BackgroundColor="#D3D3D3">
-                <base:View.Layout>
-                    <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Center" CellPadding="30,10" />
-                </base:View.Layout>
-                <comp:Button x:Name="AddItem" Text="Add" WidthSpecification="200" HeightSpecification="80" Clicked="AddItemClicked"/>
-                <comp:Button x:Name="RemoveItem" Text="Remove" WidthSpecification="200" HeightSpecification="80"  Clicked="RemoveItemClicked"/>
-                <comp:Button x:Name="RemoveAllItems" Text="Remove All" WidthSpecification="300" HeightSpecification="80"  Clicked="RemoveAllClicked"/>
-            </base:View>
-
-            <comp:CollectionView x:Name="ColView"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              ScrollingDirection="Vertical"
-              SelectionMode="Single">
-                <comp:CollectionView.ItemsLayouter>
-                      <comp:LinearLayouter />
-                </comp:CollectionView.ItemsLayouter>
-            </comp:CollectionView>
-        </base:View>
-    </comp:ContentPage.Content>
-</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest2.xaml b/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest2.xaml
deleted file mode 100644
index eec52e8..0000000
--- a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest2.xaml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<comp:ContentPage x:Class="NUITizenGallery.CollectionViewTest2"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  ParentOrigin="Center"
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <comp:ContentPage.AppBar>
-        <comp:AppBar x:Name="appBar"
-                    Title="CollectionViewTest2"/>
-    </comp:ContentPage.AppBar>
-
-    <comp:ContentPage.Content>
-        <base:View x:Name="ContentView"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-            <View.Layout>
-                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
-            </View.Layout>
-            <base:View x:Name="TopBox"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              HeightSpecification="100"
-              BackgroundColor="#D3D3D3">
-                <base:View.Layout>
-                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="10,10" />
-                </base:View.Layout>
-                <base:TextLabel x:Name="Title"
-                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                  PixelSize="30"
-                  HorizontalAlignment="Begin"
-                  Text="ScrollBar"/>
-                <base:View x:Name="RadioBox"
-                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                  HeightSpecification="60">
-                    <base:View.Layout>
-                        <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Center" CellPadding="10,10" />
-                    </base:View.Layout>
-                    <comp:RadioButton x:Name="ShowBar" Text="Show" SelectedChanged="OnShowBarRadioChanged"/>
-                    <comp:RadioButton x:Name="HideBar" Text="Hide" IsSelected="true"/>
-                </base:View>
-            </base:View>
-
-            <comp:CollectionView x:Name="ColView"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              ScrollingDirection="Vertical"
-              ItemsSource="{Binding TestSource}"
-              SelectionMode="None">
-                <comp:CollectionView.ItemsLayouter>
-                      <comp:LinearLayouter />
-                </comp:CollectionView.ItemsLayouter>
-            </comp:CollectionView>
-        </base:View>
-    </comp:ContentPage.Content>
-</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest3.xaml b/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest3.xaml
deleted file mode 100644
index 537dd20..0000000
--- a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest3.xaml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<comp:ContentPage x:Class="NUITizenGallery.CollectionViewTest3"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  ParentOrigin="Center"
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <comp:ContentPage.AppBar>
-        <comp:AppBar x:Name="appBar"
-                    Title="CollectionViewTest3"/>
-    </comp:ContentPage.AppBar>
-
-    <comp:ContentPage.Content>
-        <comp:CollectionView x:Name="ColView"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          ScrollingDirection="Vertical"
-          ItemsSource="{Binding TestSource}"
-          SelectionMode="None">
-            <comp:CollectionView.ItemsLayouter>
-                  <comp:GridLayouter />
-            </comp:CollectionView.ItemsLayouter>
-        </comp:CollectionView>
-    </comp:ContentPage.Content>
-</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest4.xaml b/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest4.xaml
deleted file mode 100644
index 35f3890..0000000
--- a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest4.xaml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<comp:ContentPage x:Class="NUITizenGallery.CollectionViewTest4"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  ParentOrigin="Center"
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <comp:ContentPage.AppBar>
-        <comp:AppBar x:Name="appBar"
-                    Title="CollectionViewTest4"/>
-    </comp:ContentPage.AppBar>
-
-    <comp:ContentPage.Content>
-        <base:View x:Name="ContentView"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-            <View.Layout>
-                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
-            </View.Layout>
-            <base:View x:Name="TopBox"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              HeightSpecification="100"
-              BackgroundColor="#D3D3D3">
-                <base:View.Layout>
-                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="10,10" />
-                </base:View.Layout>
-                <base:TextLabel x:Name="Title"
-                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                  PixelSize="30"
-                  HorizontalAlignment="Begin"
-                  Text="ScrollBar"/>
-                <base:View x:Name="RadioBox"
-                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                  HeightSpecification="60">
-                    <base:View.Layout>
-                        <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Center" CellPadding="10,10" />
-                    </base:View.Layout>
-                    <comp:RadioButton x:Name="Linear" Text="Linear" IsSelected="true"/>
-                    <comp:RadioButton x:Name="Grid" Text="Grid"  SelectedChanged="OnGridLayouterRadioChanged"/>
-                </base:View>
-            </base:View>
-
-            <comp:CollectionView x:Name="ColView"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              ScrollingDirection="Vertical"
-              ItemsSource="{Binding TestSource}"
-              SelectionMode="None">
-                <comp:CollectionView.ItemsLayouter>
-                      <comp:LinearLayouter />
-                </comp:CollectionView.ItemsLayouter>
-            </comp:CollectionView>
-        </base:View>
-    </comp:ContentPage.Content>
-</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest5.xaml b/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest5.xaml
deleted file mode 100644
index 29f00a6..0000000
--- a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest5.xaml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<comp:ContentPage x:Class="NUITizenGallery.CollectionViewTest5"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  ParentOrigin="Center"
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <comp:ContentPage.AppBar>
-        <comp:AppBar x:Name="appBar"
-                    Title="CollectionViewTest5"/>
-    </comp:ContentPage.AppBar>
-
-    <comp:ContentPage.Content>
-        <base:View x:Name="ContentView"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-            <View.Layout>
-                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
-            </View.Layout>
-            <base:View x:Name="TopBox"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              HeightSpecification="120"
-              BackgroundColor="#D3D3D3">
-                <base:View.Layout>
-                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="10,10" />
-                </base:View.Layout>
-                <base:TextLabel x:Name="Title"
-                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                  PixelSize="20"
-                  HorizontalAlignment="Begin"
-                  Text="Selection"/>
-                <comp:Button x:Name="SelectButton" HeightSpecification="60" Text="Select 10" Clicked="OnSelect10Clicked"/>
-            </base:View>
-
-            <comp:CollectionView x:Name="ColView"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              ScrollingDirection="Horizontal"
-              SelectionMode="SingleAlways"
-              SelectionChanged="OnSelectionChanged">
-                <comp:CollectionView.ItemsLayouter>
-                      <comp:LinearLayouter />
-                </comp:CollectionView.ItemsLayouter>
-            </comp:CollectionView>
-        </base:View>
-    </comp:ContentPage.Content>
-</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest6.xaml b/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest6.xaml
deleted file mode 100644
index ba32789..0000000
--- a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest6.xaml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<comp:ContentPage x:Class="NUITizenGallery.CollectionViewTest6"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  ParentOrigin="Center"
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <comp:ContentPage.AppBar>
-        <comp:AppBar x:Name="appBar"
-                    Title="CollectionViewTest6"/>
-    </comp:ContentPage.AppBar>
-
-    <comp:ContentPage.Content>
-        <base:View x:Name="ContentView"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-            <View.Layout>
-                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
-            </View.Layout>
-            <base:View x:Name="TopBox"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              HeightSpecification="90"
-              BackgroundColor="#D3D3D3">
-                <base:View.Layout>
-                    <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Center" CellPadding="10,10" />
-                </base:View.Layout>
-                <comp:Button x:Name="HeaderBtn" WidthSpecification="100" HeightSpecification="60" Text="H" Clicked="HeaderBtnClicked"/>
-                <comp:Button x:Name="FooterBtn" WidthSpecification="100" HeightSpecification="60" Text="F" Clicked="FooterBtnClicked"/>
-                <comp:Button x:Name="LayouterBtn" WidthSpecification="300" HeightSpecification="60" Text="Layouter" Clicked="LayouterBtnClicked"/>
-                <comp:Button x:Name="SourceBtn" WidthSpecification="150" HeightSpecification="60" Text="Src" Clicked="SrcBtnClicked"/>
-            </base:View>
-
-            <base:View x:Name="Content"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              BackgroundColor="White">
-                <base:View.Layout>
-                    <AbsoluteLayout />
-                </base:View.Layout>
-                <base:TextLabel x:Name="EmptyContent"
-                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                  Text="No items found"
-                  HorizontalAlignment="Center"
-                  VerticalAlignment="Center" />
-                <comp:CollectionView x:Name="ColView"
-                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                  ScrollingDirection="Vertical"
-                  SelectionMode="None">
-                    <comp:CollectionView.ItemsLayouter>
-                        <comp:LinearLayouter />
-                    </comp:CollectionView.ItemsLayouter>
-                </comp:CollectionView>
-            </base:View>
-        </base:View>
-    </comp:ContentPage.Content>
-</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest7.xaml b/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest7.xaml
deleted file mode 100644
index b56bdc4..0000000
--- a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest7.xaml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<comp:ContentPage x:Class="NUITizenGallery.CollectionViewTest7"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  ParentOrigin="Center"
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <comp:ContentPage.AppBar>
-        <comp:AppBar x:Name="appBar"
-                    Title="CollectionViewTest7"/>
-    </comp:ContentPage.AppBar>
-
-    <comp:ContentPage.Content>
-      <base:View x:Name="ContentView"
-        WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-        HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-            <View.Layout>
-                <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
-            </View.Layout>
-            <base:TextLabel x:Name="Title"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              HeightSpecification="90"
-              Text="Infinite scroll"
-              PixelSize="20"
-              HorizontalAlignment="Begin"
-              VerticalAlignment="Center"
-              BackgroundColor="White"/>
-            <comp:CollectionView x:Name="ColView"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-              ScrollingDirection="Vertical"
-              HideScrollbar="false"
-              ItemsSource="{Binding TestSource}"
-              SelectionMode="None">
-                <comp:CollectionView.ItemsLayouter>
-                    <comp:LinearLayouter />
-                </comp:CollectionView.ItemsLayouter>
-            </comp:CollectionView>
-        </base:View>
-    </comp:ContentPage.Content>
-</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest8.xaml b/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest8.xaml
deleted file mode 100644
index 5c8c8d8..0000000
--- a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest8.xaml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<comp:ContentPage x:Class="NUITizenGallery.CollectionViewTest8"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  ParentOrigin="Center"
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <comp:ContentPage.AppBar>
-        <comp:AppBar x:Name="appBar"
-                    Title="CollectionViewTest8"/>
-    </comp:ContentPage.AppBar>
-
-    <comp:ContentPage.Content>
-      <base:View x:Name="ContentView"
-        WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-        HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-          <View.Layout>
-              <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10" />
-          </View.Layout>
-          <base:TextLabel x:Name="Title"
-            WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-            HeightSpecification="90"
-            Text="Style Control State Test"
-            PixelSize="20"
-            HorizontalAlignment="Begin"
-            VerticalAlignment="Center"
-            BackgroundColor="White"/>
-          <comp:CollectionView x:Name="ColView"
-            WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-            HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-            ScrollingDirection="Horizontal"
-            ItemsSource="{Binding TestSource}"
-            SelectionMode="Multiple">
-              <comp:CollectionView.ItemsLayouter>
-                  <comp:LinearLayouter />
-              </comp:CollectionView.ItemsLayouter>
-          </comp:CollectionView>
-      </base:View>
-    </comp:ContentPage.Content>
-</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest9.xaml b/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest9.xaml
deleted file mode 100644
index 82d396a..0000000
--- a/test/NUITizenGallery/res/layout/CollectionViewTest/CollectionViewTest9.xaml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<comp:ContentPage x:Class="NUITizenGallery.CollectionViewTest9"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  ParentOrigin="Center"
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true">
-
-    <comp:ContentPage.AppBar>
-        <comp:AppBar x:Name="appBar"
-                    Title="CollectionViewTest9"/>
-    </comp:ContentPage.AppBar>
-
-    <comp:ContentPage.Content>
-        <comp:CollectionView x:Name="ColView"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          ScrollingDirection="Vertical"
-          SelectionMode="Multiple"
-          SelectionChanged="OnSelectionChanged"
-          ItemsSource="{Binding TestSource}"
-          IsGrouped="true">
-            <comp:CollectionView.ItemsLayouter>
-                  <comp:LinearLayouter />
-            </comp:CollectionView.ItemsLayouter>
-        </comp:CollectionView>
-        </comp:ContentPage.Content>
-</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/ContentPageTestPage1.xaml b/test/NUITizenGallery/res/layout/ContentPageTestPage1.xaml
deleted file mode 100644
index 974ac3a..0000000
--- a/test/NUITizenGallery/res/layout/ContentPageTestPage1.xaml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<nui:ContentPage x:Class="NUITizenGallery.ContentPageTestPage1"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:b="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-
-    <nui:ContentPage.AppBar>
-        <nui:AppBar x:Name="appBar"
-                    Title="ContentPageTestPage1"/>
-    </nui:ContentPage.AppBar>
-
-    <nui:ContentPage.Content>
-        <nui:Button x:Name="button"
-                    Text="ONE"
-                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                    HeightSpecification="{Static LayoutParamPolicies.MatchParent}" />
-    </nui:ContentPage.Content>
-
-</nui:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/ContentPageTestPage2.xaml b/test/NUITizenGallery/res/layout/ContentPageTestPage2.xaml
deleted file mode 100644
index 90d6b7c..0000000
--- a/test/NUITizenGallery/res/layout/ContentPageTestPage2.xaml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<nui:ContentPage x:Class="NUITizenGallery.ContentPageTestPage2"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:b="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-
-    <nui:ContentPage.AppBar>
-        <nui:AppBar x:Name="appBar"
-                    Title="ContentPageTestPage2"/>
-    </nui:ContentPage.AppBar>
-
-    <nui:ContentPage.Content>
-        <nui:Button x:Name="button"
-                    Text="TWO"
-                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                    HeightSpecification="{Static LayoutParamPolicies.MatchParent}" />
-    </nui:ContentPage.Content>
-
-</nui:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/CustomCellListItem.xaml b/test/NUITizenGallery/res/layout/CustomCellListItem.xaml
deleted file mode 100644
index 5d07463..0000000
--- a/test/NUITizenGallery/res/layout/CustomCellListItem.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<base:View x:Class="NUITizenGallery.CustomCellListItem"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" Size2D="720, 250">
-
-    <base:ImageView x:Name="Image" Size2D="50,50" Position2D="25,50"/>
-    <base:TextLabel x:Name="Title" Text="Not set" PointSize="14" Size2D="550, 70" Position2D="100,0"/>
-    <base:TextLabel x:Name="TextContent" Text="Not set" PointSize="10" Size2D="550, 180" Position2D="100, 70"/>
-    <comp:CheckBox x:Name="Check" Position2D="640, 50"/>
-</base:View>
diff --git a/test/NUITizenGallery/res/layout/CustomCellTestPage.xaml b/test/NUITizenGallery/res/layout/CustomCellTestPage.xaml
deleted file mode 100644
index b97f90c..0000000
--- a/test/NUITizenGallery/res/layout/CustomCellTestPage.xaml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<base:View x:Class="NUITizenGallery.CustomCellTestPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" BackgroundColor="#ffffff">
-
-  <comp:ScrollableBase x:Name="ListView"/>
-</base:View>
diff --git a/test/NUITizenGallery/res/layout/DatePickerTestPage.xaml b/test/NUITizenGallery/res/layout/DatePickerTestPage.xaml
deleted file mode 100644
index b1cf5ea..0000000
--- a/test/NUITizenGallery/res/layout/DatePickerTestPage.xaml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<comp:ContentPage x:Class="NUITizenGallery.DatePickerTestPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
-  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 
-  ParentOrigin="Center"
-  PivotPoint="Center"
-  PositionUsesPivotPoint="true"
-  BackgroundColor="White">
-
-    <comp:ContentPage.AppBar>
-        <comp:AppBar x:Name="appBar"
-                    Title="DatePickerTestPage"/>
-    </comp:ContentPage.AppBar>
-
-    <comp:ContentPage.Content>
-        <base:View x:Name="ContentView"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}" >
-            <View.Layout>
-              <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterHorizontal" CellPadding="30,30"/>
-            </View.Layout>
-              <base:TextLabel x:Name="text1"
-                              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                              HeightSpecification="100"
-                              HorizontalAlignment="Center"
-                              VerticalAlignment="Center"
-                              PointSize="20"
-                              />
-              <comp:Button x:Name="dateButton"
-                              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                              HeightSpecification="80"
-                              Text="Date Picker"
-                              PointSize="20"
-                              />
-              <comp:Button x:Name="setMinButton"
-                              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                              HeightSpecification="80"
-                              Text="Set Min Date"
-                              PointSize="20"
-                              />
-              <comp:Button x:Name="setMaxButton"
-                              WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
-                              HeightSpecification="80"
-                              Text="Set Max Date"
-                              PointSize="20"
-                              />
-        </base:View>
-    </comp:ContentPage.Content>
-</comp:ContentPage>
\ No newline at end of file
diff --git a/test/NUITizenGallery/res/layout/FlexTest5Page.xaml b/test/NUITizenGallery/res/layout/FlexTest5Page.xaml
new file mode 100644
index 0000000..c34d576
--- /dev/null
+++ b/test/NUITizenGallery/res/layout/FlexTest5Page.xaml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<b:View x:Class="NUITizenGallery.FlexTest5Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:b="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
+  xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+
+    <b:View x:Name="rootView"
+            HeightResizePolicy="FillToParent"
+            WidthResizePolicy="FillToParent"
+            BackgroundColor="#ffffff">
+        <View.Layout>
+            <FlexLayout Direction="Column" Justification="FlexStart" Alignment="FlexStart"/>
+
+        </View.Layout>
+
+        <b:TextLabel x:Name="text" Text="Basic Grids" PointSize="12" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" SizeHeight="100" VerticalAlignment="Center" />
+        <b:View x:Name="view1" BackgroundColor="#ff0000" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" SizeHeight="100">
+            <View.Layout>
+                <FlexLayout Direction="Row" Justification="SpaceBetween" Alignment="Center" />
+            </View.Layout>
+
+            <b:TextLabel BackgroundColor="#444444" 
+                         TextColor="#ffffff" 
+                         Text="1/2" 
+                         PointSize="8" 
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
+                         SizeHeight="100" 
+                         VerticalAlignment="Center" 
+                         HorizontalAlignment="Center" />
+            <b:TextLabel BackgroundColor="#444444" 
+                         TextColor="#ffffff" 
+                         Text="1/2" 
+                         PointSize="8" 
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
+                         SizeHeight="100" 
+                         VerticalAlignment="Center" 
+                         HorizontalAlignment="Center" />
+        </b:View>
+
+        <b:View x:Name="view2" BackgroundColor="#ff0000" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" SizeHeight="100">
+            <View.Layout>
+                <FlexLayout Direction="Row" Justification="SpaceBetween" Alignment="Center" />
+            </View.Layout>
+
+            <b:TextLabel BackgroundColor="#555555" 
+                         TextColor="#ffffff" 
+                         Text="1/3" 
+                         PointSize="8" 
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
+                         SizeHeight="100" 
+                         VerticalAlignment="Center" 
+                         HorizontalAlignment="Center" />
+            <b:TextLabel BackgroundColor="#555555" 
+                         TextColor="#ffffff" 
+                         Text="1/3" 
+                         PointSize="8" 
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
+                         SizeHeight="100" 
+                         VerticalAlignment="Center" 
+                         HorizontalAlignment="Center" />
+            <b:TextLabel BackgroundColor="#555555" 
+                         TextColor="#ffffff" 
+                         Text="1/3" 
+                         PointSize="8" 
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
+                         SizeHeight="100" 
+                         VerticalAlignment="Center" 
+                         HorizontalAlignment="Center" />
+        </b:View>
+
+
+        <b:View x:Name="view3" BackgroundColor="#ff0000" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" SizeHeight="100">
+            <View.Layout>
+                <FlexLayout Direction="Row" Justification="SpaceBetween" Alignment="Center" />
+            </View.Layout>
+
+            <b:TextLabel BackgroundColor="#666666" 
+                         TextColor="#ffffff" 
+                         Text="1/4" 
+                         PointSize="8" 
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
+                         SizeHeight="100" 
+                         VerticalAlignment="Center" 
+                         HorizontalAlignment="Center" />
+            <b:TextLabel BackgroundColor="#666666" 
+                         TextColor="#ffffff" 
+                         Text="1/4" 
+                         PointSize="8" 
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
+                         SizeHeight="100" 
+                         VerticalAlignment="Center" 
+                         HorizontalAlignment="Center" />
+            <b:TextLabel BackgroundColor="#666666" 
+                         TextColor="#ffffff" 
+                         Text="1/4" 
+                         PointSize="8" 
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
+                         SizeHeight="100" 
+                         VerticalAlignment="Center" 
+                         HorizontalAlignment="Center" />
+            <b:TextLabel BackgroundColor="#666666" 
+                         TextColor="#ffffff" 
+                         Text="1/4" 
+                         PointSize="8" 
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
+                         SizeHeight="100" 
+                         VerticalAlignment="Center" 
+                         HorizontalAlignment="Center" />
+        </b:View>
+
+        <b:View x:Name="view4" BackgroundColor="#ff0000" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" SizeHeight="100">
+            <View.Layout>
+                <FlexLayout Direction="Row" Justification="SpaceBetween" Alignment="Center" />
+            </View.Layout>
+
+            <b:TextLabel BackgroundColor="#777777" 
+                         TextColor="#ffffff" 
+                         Text="1/5" 
+                         PointSize="8" 
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
+                         SizeHeight="100" 
+                         VerticalAlignment="Center" 
+                         HorizontalAlignment="Center" />
+            <b:TextLabel BackgroundColor="#777777" 
+                         TextColor="#ffffff" 
+                         Text="1/5" 
+                         PointSize="8" 
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
+                         SizeHeight="100" 
+                         VerticalAlignment="Center" 
+                         HorizontalAlignment="Center" />
+            <b:TextLabel BackgroundColor="#777777" 
+                         TextColor="#ffffff" 
+                         Text="1/5" 
+                         PointSize="8" 
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
+                         SizeHeight="100" 
+                         VerticalAlignment="Center" 
+                         HorizontalAlignment="Center" />
+            <b:TextLabel BackgroundColor="#777777" 
+                         TextColor="#ffffff" 
+                         Text="1/5" 
+                         PointSize="8" 
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
+                         SizeHeight="100" 
+                         VerticalAlignment="Center" 
+                         HorizontalAlignment="Center" />
+            <b:TextLabel BackgroundColor="#777777" 
+                         TextColor="#ffffff" 
+                         Text="1/5" 
+                         PointSize="8" 
+                         WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 
+                         SizeHeight="100" 
+                         VerticalAlignment="Center" 
+                         HorizontalAlignment="Center" />
+
+        </b:View>
+        
+
+
+
+    </b:View>
+</b:View>
+
diff --git a/test/NUITizenGallery/res/layout/FrameLayoutTest2Page.xaml b/test/NUITizenGallery/res/layout/FrameLayoutTest2Page.xaml
new file mode 100644
index 0000000..678751f
--- /dev/null
+++ b/test/NUITizenGallery/res/layout/FrameLayoutTest2Page.xaml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<base:View x:Class="NUITizenGallery.FrameLayoutTest2Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  BackgroundColor="White"
+  PositionUsesPivotPoint="True" 
+  ParentOrigin="Center"
+  PivotPoint="Center"
+  WidthResizePolicy="FillToParent"
+  HeightResizePolicy="FillToParent">
+
+    <View x:Name="layout"
+          BackgroundColor="White"
+          PositionUsesPivotPoint="True" 
+          ParentOrigin="Center" 
+          PivotPoint="Center" 
+          WidthResizePolicy="FillToParent" 
+          HeightResizePolicy="FillToParent">
+        
+        <View x:Name="leftBGBox"
+              WidthResizePolicy="SizeRelativeToParent"
+              HeightResizePolicy="SizeRelativeToParent"
+              SizeModeFactor="0.25, 0.8, 0.0"
+              ParentOrigin="0.2, 0.1, 0.0"
+              BackgroundColor="#808080"/>
+
+        <View x:Name="rightBGBox"
+              WidthResizePolicy="SizeRelativeToParent"
+              HeightResizePolicy="SizeRelativeToParent"
+              SizeModeFactor="0.25, 0.8, 0.0"
+              ParentOrigin="0.6, 0.1, 0.0"
+              BackgroundColor="#808080"/>
+
+        <View PositionUsesPivotPoint="true"
+              PivotPoint="TopLeft"
+              ParentOrigin="TopLeft"
+              BackgroundColor="Red"
+              Size2D="100,100"/>
+
+        <View x:Name="topCenterBox"
+              PositionUsesPivotPoint="true"
+              PivotPoint="TopCenter"
+              ParentOrigin="TopCenter"
+              BackgroundColor="Yellow"
+              Size2D="100,100"/>
+
+        <View PositionUsesPivotPoint="true"
+              PivotPoint="TopRight"
+              ParentOrigin="TopRight"
+              BackgroundColor="Green"
+              Size2D="100,100"/>
+
+        <View PositionUsesPivotPoint="true"
+              PivotPoint="BottomLeft"
+              ParentOrigin="BottomLeft"
+              BackgroundColor="Blue"
+              Size2D="100,100"/>
+
+        <View PositionUsesPivotPoint="true"
+              PivotPoint="BottomCenter"
+              ParentOrigin="BottomCenter"
+              BackgroundColor="#00FF00"
+              Size2D="100,100"/>
+
+        <View PositionUsesPivotPoint="true"
+              PivotPoint="BottomRight"
+              ParentOrigin="BottomRight"
+              BackgroundColor="#800080"
+              Size2D="100,100"/>
+
+    </View>
+
+</base:View>
diff --git a/test/NUITizenGallery/res/layout/GridTest3Page.xaml b/test/NUITizenGallery/res/layout/GridTest3Page.xaml
new file mode 100755
index 0000000..3c62e70
--- /dev/null
+++ b/test/NUITizenGallery/res/layout/GridTest3Page.xaml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<comp:ContentPage x:Class="NUITizenGallery.GridTest3Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
+  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+           WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+           HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+           BackgroundColor="White"
+           PositionUsesPivotPoint="True" 
+           ParentOrigin="Center"
+           PivotPoint="Center">
+
+    <comp:ContentPage.AppBar>
+        <comp:AppBar x:Name="appBar" Title="ScrollViewTest6"/>
+    </comp:ContentPage.AppBar>
+
+    <comp:ContentPage.Content>
+        <View x:Name="textView" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <base:View.Layout>
+                <LinearLayout LinearOrientation="Vertical" CellPadding="10,10" LinearAlignment="Top"/>
+            </base:View.Layout>
+
+            <base:View x:Name="operationView" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" Weight="0.5">
+                <base:View.Layout>
+                    <LinearLayout LinearOrientation="Vertical" LinearAlignment="Bottom" CellPadding="10,10"/>
+                </base:View.Layout>
+                <TextField x:Name="textPlaceholder" Text="0.00" />
+            </base:View>
+
+            <base:View x:Name="btnView" Weight="0.5" >
+                <base:View.Layout >
+                    <GridLayout Columns="4" Rows="5" GridOrientation="Horizontal" ColumnSpacing="2" RowSpacing="2" />
+                </base:View.Layout>
+                <comp:Button GridLayout.Column="0" Text="C"  x:Name="btnClear"     HeightSpecification="100" WidthSpecification="180"/>
+                <comp:Button GridLayout.Column="1" Text="^"  x:Name="btnUp"        HeightSpecification="100" WidthSpecification="180"/>
+                <comp:Button GridLayout.Column="2" Text="%"  x:Name="btnProc"      HeightSpecification="100" WidthSpecification="180"/>
+                <comp:Button GridLayout.Column="3" Text="/"  x:Name="btnDiv"       HeightSpecification="100" WidthSpecification="180"/>
+                <comp:Button GridLayout.Column="0" Text="7"  x:Name="btn7"         HeightSpecification="100" WidthSpecification="180"/>
+                <comp:Button GridLayout.Column="1" Text="8"  x:Name="btn8"         HeightSpecification="100" WidthSpecification="180"/>
+                <comp:Button GridLayout.Column="2" Text="9"  x:Name="btn9"         HeightSpecification="100" WidthSpecification="180"/>
+                <comp:Button GridLayout.Column="3" Text="*"  x:Name="btnMultiply"  HeightSpecification="100" WidthSpecification="180"/>
+                <comp:Button GridLayout.Column="0" Text="4"  x:Name="btn4"         HeightSpecification="100" WidthSpecification="180"/>
+                <comp:Button GridLayout.Column="1" Text="5"  x:Name="btn5"         HeightSpecification="100" WidthSpecification="180"/>
+                <comp:Button GridLayout.Column="2" Text="6"  x:Name="btn6"         HeightSpecification="100" WidthSpecification="180"/>
+                <comp:Button GridLayout.Column="3" Text="-"  x:Name="btnMinus"     HeightSpecification="100" WidthSpecification="180"/>
+                <comp:Button GridLayout.Column="0" Text="1"  x:Name="btn1"         HeightSpecification="100" WidthSpecification="180"/>
+                <comp:Button GridLayout.Column="1" Text="2"  x:Name="btn2"         HeightSpecification="100" WidthSpecification="180"/>
+                <comp:Button GridLayout.Column="2" Text="3"  x:Name="btn3"         HeightSpecification="100" WidthSpecification="180"/>
+                <comp:Button GridLayout.Column="3" Text="+"  x:Name="btnPlus"      HeightSpecification="100" WidthSpecification="180"/>
+                <comp:Button GridLayout.Column="0" Text="0"  x:Name="btn0"         HeightSpecification="100" WidthSpecification="360" GridLayout.ColumnSpan="2"/>
+                <comp:Button GridLayout.Column="2" Text="."  x:Name="btnDot"       HeightSpecification="100" WidthSpecification="180"/>
+                <comp:Button GridLayout.Column="3" Text="="  x:Name="btnEqual"     HeightSpecification="100" WidthSpecification="180"/>
+            </base:View>
+        </View>
+    </comp:ContentPage.Content>
+</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/GridTest4Page.xaml b/test/NUITizenGallery/res/layout/GridTest4Page.xaml
new file mode 100755
index 0000000..68371ac
--- /dev/null
+++ b/test/NUITizenGallery/res/layout/GridTest4Page.xaml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<comp:ContentPage x:Class="NUITizenGallery.GridTest4Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
+  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+           WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+           HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+           BackgroundColor="White"
+           PositionUsesPivotPoint="True"
+           ParentOrigin="Center"
+           PivotPoint="Center">
+
+	<comp:ContentPage.AppBar>
+		<comp:AppBar x:Name="appBar" Title="GridTest4"/>
+	</comp:ContentPage.AppBar>
+
+	<comp:ContentPage.Content>
+		<base:View x:Name="btnView" HeightSpecification="{Static LayoutParamPolicies.MatchParent}" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" >
+			<base:View.Layout >
+				<GridLayout Columns="3" Rows="3" ColumnSpacing="3" RowSpacing="3" />
+			</base:View.Layout>
+			<comp:Button x:Name="btn1"
+						 Text="Button1"
+						 GridLayout.Column="0"
+						 GridLayout.Row="0"
+						 GridLayout.ColumnSpan="3"
+						 HeightSpecification="100"
+						 WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+						 />
+			<comp:Button x:Name="btn2"
+						 Text="Button2"
+						 GridLayout.Column="0"
+						 GridLayout.Row="1"
+						 WidthSpecification="550"
+						 HeightSpecification="525"
+						 />
+			<comp:Button x:Name="btn3"
+						 Text="Button3"
+						 GridLayout.Column="1"
+						 GridLayout.Row="1"
+						 WidthSpecification="100"
+						 HeightSpecification="525"
+						 />
+			<comp:Button x:Name="btn4"
+						 Text="Button4"
+						 GridLayout.Column="0"
+						 GridLayout.Row="2"
+						 WidthSpecification="550"
+						 HeightSpecification="525"
+						 />
+			<comp:Button x:Name="btn5"
+						 Text="Button5"
+						 GridLayout.Column="1"
+						 GridLayout.Row="2"
+						 WidthSpecification="100"
+						 HeightSpecification="525"
+						 />
+			<comp:Button x:Name="btn6"
+						 Text="Button6"
+						 GridLayout.Column="2"
+						 GridLayout.Row="1"
+						 GridLayout.RowSpan="2"
+						 WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+						 HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+						 />
+		</base:View>
+	</comp:ContentPage.Content>
+</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/ImageTest5Page.xaml b/test/NUITizenGallery/res/layout/ImageTest5Page.xaml
index 50cb309..aba326d 100755
--- a/test/NUITizenGallery/res/layout/ImageTest5Page.xaml
+++ b/test/NUITizenGallery/res/layout/ImageTest5Page.xaml
@@ -1,39 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<base:View x:Class="NUITizenGallery.ImageTest5Page"
+<comp:ContentPage x:Class="NUITizenGallery.ImageTest5Page"
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
   xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
   xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    PositionUsesPivotPoint="True" 
-	ParentOrigin="Center" 
-    PivotPoint="Center" 
-	WidthResizePolicy="FillToParent" 
-    HeightResizePolicy="FillToParent" 
-	BackgroundColor="#FFFFFF">
+           WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+           HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+           BackgroundColor="White"
+           PositionUsesPivotPoint="True"
+           ParentOrigin="Center"
+           PivotPoint="Center">
 
-    <View.Layout>
-        <LinearLayout LinearOrientation="Vertical" CellPadding="10,10" LinearAlignment="Top"/>
-    </View.Layout>
+	<comp:ContentPage.AppBar>
+		<comp:AppBar x:Name="appBar" Title="ImageTest5"/>
+	</comp:ContentPage.AppBar>
 
-    <View x:Name="imgView" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" Weight="0.5">
-        <View.Layout>
-            <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterHorizontal" CellPadding="10,10"/>
-        </View.Layout>
-        <ImageView x:Name="imageView" ResourceUrl="*Resource*/images/a.jpg" />
-    </View>
-
-    <View x:Name="btnView" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" Weight="0.5">
-        <View.Layout>
-            <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="10,10" />
-        </View.Layout>
-        <base:TextLabel x:Name="desc1"  Text="" PointSize="5" TextColor="Black"/>
-        <comp:Button x:Name="image1Btn" Text="size + 100" WidthResizePolicy="FillToParent" />
-        <comp:Button x:Name="image2Btn" Text="size - 100" WidthResizePolicy="FillToParent" />
-        <comp:Button x:Name="image3Btn" Text="height + 100" WidthResizePolicy="FillToParent" />
-        <comp:Button x:Name="image4Btn" Text="height - 100" WidthResizePolicy="FillToParent" />
-        <comp:Button x:Name="image5Btn" Text="change mode" WidthResizePolicy="FillToParent"/>
-    </View>
-    
-    
-</base:View>
+	<comp:ContentPage.Content>
+		<base:View x:Name="rootView" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+			<View.Layout>
+				<LinearLayout LinearOrientation="Vertical" CellPadding="10,10" LinearAlignment="CenterHorizontal"/>
+			</View.Layout>
+			<ImageView x:Name="imageView" ResourceUrl="*Resource*/images/a.jpg" />
+			<base:TextLabel x:Name="desc1"  Text="" PointSize="7" TextColor="Black" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+			<comp:Button x:Name="image1Btn" Text="size + 100" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}" />
+			<comp:Button x:Name="image2Btn" Text="size - 100" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}" />
+			<comp:Button x:Name="image3Btn" Text="height + 100" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}" />
+			<comp:Button x:Name="image4Btn" Text="height - 100" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}" />
+			<comp:Button x:Name="image5Btn" Text="change mode" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+		</base:View>
+	</comp:ContentPage.Content>
+</comp:ContentPage>
 
diff --git a/test/NUITizenGallery/res/layout/IndicatorViewTest2Page.xaml b/test/NUITizenGallery/res/layout/IndicatorViewTest2Page.xaml
new file mode 100644
index 0000000..1d04990
--- /dev/null
+++ b/test/NUITizenGallery/res/layout/IndicatorViewTest2Page.xaml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<comp:ContentPage x:Class="NUITizenGallery.IndicatorViewTest2Page"
+    xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+    xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
+    xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+      WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+      ParentOrigin="Center" PivotPoint="Center" PositionUsesPivotPoint="true"
+      BackgroundColor="White">
+
+    <comp:ContentPage.AppBar>
+      <comp:AppBar x:Name="appBar" Title="CollectionViewTest1"/>
+    </comp:ContentPage.AppBar>
+
+    <comp:ContentPage.Content>
+      <base:View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+          BackgroundColor="White">
+
+        <base:View.Layout>
+          <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top" CellPadding="10,10"/>
+        </base:View.Layout>
+
+        <comp:ScrollableBase x:Name="Scroller" SnapToPage="true"
+            HeightSpecification="{Static LayoutParamPolicies.MatchParent}" WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+            ScrollingDirection="Horizontal" BackgroundColor="White" >
+
+          <comp:ScrollableBase.Layout>
+            <LinearLayout LinearOrientation="Horizontal" LinearAlignment="CenterHorizontal" CellPadding="5,5"/>
+          </comp:ScrollableBase.Layout>
+
+          <base:View x:Name="Page0" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size}"
+               HeightSpecification="{Static LayoutParamPolicies.MatchParent}" BackgroundColor="#ff0000">
+            <base:TextLabel Text="Page 0" PositionUsesPivotPoint="True" ParentOrigin="Center"
+                PivotPoint="Center" HeightSpecification="{Static LayoutParamPolicies.WrapContent}" WidthSpecification="{Static LayoutParamPolicies.WrapContent}"/>
+          </base:View>
+          <base:View x:Name="Page1" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size}"
+              HeightSpecification="{Static LayoutParamPolicies.MatchParent}" BackgroundColor="#00ff00">
+            <base:TextLabel Text="Page 1" PositionUsesPivotPoint="True" ParentOrigin="Center"
+                PivotPoint="Center" HeightSpecification="{Static LayoutParamPolicies.WrapContent}" WidthSpecification="{Static LayoutParamPolicies.WrapContent}"/>
+          </base:View>
+          <base:View x:Name="Page2" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size}"
+              HeightSpecification="{Static LayoutParamPolicies.MatchParent}" BackgroundColor="#0000ff">
+            <base:TextLabel Text="Page 2" PositionUsesPivotPoint="True" ParentOrigin="Center"
+                PivotPoint="Center" HeightSpecification="{Static LayoutParamPolicies.WrapContent}" WidthSpecification="{Static LayoutParamPolicies.WrapContent}"/>
+          </base:View>
+          <base:View x:Name="Page3" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size}"
+              HeightSpecification="{Static LayoutParamPolicies.MatchParent}" BackgroundColor="#ff00ff">
+            <base:TextLabel Text="Page 3" PositionUsesPivotPoint="True" ParentOrigin="Center"
+                PivotPoint="Center" HeightSpecification="{Static LayoutParamPolicies.WrapContent}" WidthSpecification="{Static LayoutParamPolicies.WrapContent}"/>
+          </base:View>
+          <base:View x:Name="Page4" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size}"
+              HeightSpecification="{Static LayoutParamPolicies.MatchParent}" BackgroundColor="#00ff00">
+            <base:TextLabel Text="Page 4" PositionUsesPivotPoint="True" ParentOrigin="Center"
+                PivotPoint="Center" HeightSpecification="{Static LayoutParamPolicies.WrapContent}" WidthSpecification="{Static LayoutParamPolicies.WrapContent}"/>
+          </base:View>
+
+        </comp:ScrollableBase>
+
+        <comp:Pagination x:Name="Index" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size}"
+            HeightSpecification="50"/>
+      </base:View>
+    </comp:ContentPage.Content>
+</comp:ContentPage>
\ No newline at end of file
diff --git a/test/NUITizenGallery/res/layout/IndicatorViewTest3Page.xaml b/test/NUITizenGallery/res/layout/IndicatorViewTest3Page.xaml
new file mode 100644
index 0000000..ab3ccee
--- /dev/null
+++ b/test/NUITizenGallery/res/layout/IndicatorViewTest3Page.xaml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<comp:ContentPage x:Class="NUITizenGallery.IndicatorViewTest3Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
+  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+    HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+    ParentOrigin="Center"
+    PivotPoint="Center"
+    PositionUsesPivotPoint="true"
+    BackgroundColor="White">
+
+    <comp:ContentPage.AppBar>
+      <comp:AppBar x:Name="appBar"
+          Title="IndicatorViewTest3"/>
+    </comp:ContentPage.AppBar>
+
+    <comp:ContentPage.Content>
+      <base:View x:Name="ContentView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+        <base:View.Layout>
+          <AbsoluteLayout/>
+        </base:View.Layout>
+
+        <comp:ScrollableBase x:Name="Scroller" SnapToPage="true" ScrollingDirection="Horizontal" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+          <comp:ScrollableBase.Layout>
+            <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Center"/>
+          </comp:ScrollableBase.Layout>
+
+          <base:View x:Name="Page0" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="{Static LayoutParamPolicies.MatchParent}" BackgroundColor="#ff0000">
+            <base:TextLabel Text="Page 0" PositionUsesPivotPoint="True" ParentOrigin="Center" PivotPoint="Center"/>
+          </base:View>
+          <base:View x:Name="Page1" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="{Static LayoutParamPolicies.MatchParent}" BackgroundColor="#00ff00">
+            <base:TextLabel Text="Page 1" PositionUsesPivotPoint="True" ParentOrigin="Center" PivotPoint="Center"/>
+          </base:View>
+          <base:View x:Name="Page2" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="{Static LayoutParamPolicies.MatchParent}" BackgroundColor="#0000ff">
+            <base:TextLabel Text="Page 2" PositionUsesPivotPoint="True" ParentOrigin="Center" PivotPoint="Center"/>
+          </base:View>
+          <base:View x:Name="Page3" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="{Static LayoutParamPolicies.MatchParent}" BackgroundColor="#ff00ff">
+            <base:TextLabel Text="Page 3" PositionUsesPivotPoint="True" ParentOrigin="Center" PivotPoint="Center"/>
+          </base:View>
+          <base:View x:Name="Page4" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="{Static LayoutParamPolicies.MatchParent}" BackgroundColor="#00ff00">
+            <base:TextLabel Text="Page 4" PositionUsesPivotPoint="True" ParentOrigin="Center" PivotPoint="Center"/>
+          </base:View>
+        </comp:ScrollableBase>
+
+        <comp:Pagination x:Name="Index" Size2D="186,50"/>
+      </base:View>
+    </comp:ContentPage.Content>
+</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/KeyboardTest1Page.xaml b/test/NUITizenGallery/res/layout/KeyboardTest1Page.xaml
new file mode 100644
index 0000000..e8b1cdc
--- /dev/null
+++ b/test/NUITizenGallery/res/layout/KeyboardTest1Page.xaml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.KeyboardTest1Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  BackgroundColor="White"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <ContentPage.AppBar>
+        <AppBar Title="KeyboardTest1Page"/>
+    </ContentPage.AppBar>
+
+    <ContentPage.Content>
+
+        <ScrollableBase WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                    HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" CellPadding="10,10" LinearAlignment="Begin"/>
+            </View.Layout>
+
+            <TextLabel WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+               Text="TextField"
+               HorizontalAlignment="Center"/>
+
+
+            <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Horizontal" CellPadding="20,20"/>
+                </View.Layout>
+
+                <TextLabel Text="TextField"/>
+
+                <TextField x:Name="textField"
+                       Weight="1.0"
+                       PlaceholderText="Type Text Here"/>
+
+            </View>
+
+            <Button x:Name="dateTimeKeyboardButton"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                Text="Datetime keyboard"/>
+
+            <Button x:Name="emailKeyboardButton"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                Text="Email keyboard"/>
+
+            <Button x:Name="emoticonKeyboardButton"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                Text="Emoticon keyboard"/>
+
+            <Button x:Name="hexKeyboardButton"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                Text="Hexadecimal keyboard"/>
+
+            <Button x:Name="ipLayoutKeyboardButton"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                Text="IP keyboard"/>
+
+            <Button x:Name="monthKeyboardButton"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                Text="Month keyboard"/>
+
+            <Button x:Name="normalKeyboardButton"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                Text="Default keyboard"/>
+
+            <Button x:Name="numberKeyboardButton"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                Text="Number keyboard"/>
+
+            <Button x:Name="numberOnlyKeyboardButton"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                Text="Number only keyboard"/>
+
+            <Button x:Name="passworKeyboarddButton"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                Text="Password keyboard"/>
+
+            <Button x:Name="phoneNumberKeyboardButton"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                Text="Phone number keyboard"/>
+
+            <Button x:Name="terminalKeyboardButton"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                Text="Terminal keyboard"/>
+
+            <Button x:Name="urlKeyboarddButton"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                Text="URL keyboard"/>
+
+        </ScrollableBase>
+
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/res/layout/LayoutAddRemoveTest1Page.xaml b/test/NUITizenGallery/res/layout/LayoutAddRemoveTest1Page.xaml
new file mode 100644
index 0000000..5d37348
--- /dev/null
+++ b/test/NUITizenGallery/res/layout/LayoutAddRemoveTest1Page.xaml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.LayoutAddRemoveTest1Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  BackgroundColor="White"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <ContentPage.AppBar>
+        <AppBar Title="LayoutAddRemoveTest1"/>
+    </ContentPage.AppBar>
+
+    <ContentPage.Content>
+        <ScrollableBase x:Name="rootView"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" CellPadding="10,10"/>
+            </View.Layout>
+
+            <View x:Name="linear"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Vertical" CellPadding="10,10"/>
+                </View.Layout>
+
+            </View>
+
+            <Button x:Name="addButton"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                Text="Add"/>
+
+            <Button x:Name="removeButton"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                Text="Remove"/>
+
+        </ScrollableBase>
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/res/layout/LayoutAddRemoveTest2Page.xaml b/test/NUITizenGallery/res/layout/LayoutAddRemoveTest2Page.xaml
new file mode 100644
index 0000000..44af23f
--- /dev/null
+++ b/test/NUITizenGallery/res/layout/LayoutAddRemoveTest2Page.xaml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.LayoutAddRemoveTest2Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  BackgroundColor="White"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <ContentPage.AppBar>
+        <AppBar Title="LayoutAddRemoveTest2"/>
+    </ContentPage.AppBar>
+
+    <ContentPage.Content>
+        
+        <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+            HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" CellPadding="10,10"/>
+            </View.Layout>
+            
+            <View x:Name="linear"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Horizontal" CellPadding="10,10" LinearAlignment="Begin"/>
+                </View.Layout>
+
+            </View>
+
+            <Button x:Name="addButton"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                Text="Add"/>
+
+            <Button x:Name="addTaskButton"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                Text="Add with task"/>
+
+            <Button x:Name="removeButton"
+                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                Text="Remove"/>
+
+        </View>
+        
+    </ContentPage.Content>
+
+</ContentPage>
diff --git a/test/NUITizenGallery/res/layout/RefreshViewTest1Page.xaml b/test/NUITizenGallery/res/layout/RefreshViewTest1Page.xaml
index d2f92f4..dd9d976 100755
--- a/test/NUITizenGallery/res/layout/RefreshViewTest1Page.xaml
+++ b/test/NUITizenGallery/res/layout/RefreshViewTest1Page.xaml
@@ -4,8 +4,8 @@
   xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
   xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-           WidthSpecification="-1"
-           HeightSpecification="-1"
+           WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+           HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
            BackgroundColor="White"
            PositionUsesPivotPoint="True"
            ParentOrigin="Center"
@@ -16,13 +16,13 @@
 	</comp:ContentPage.AppBar>
 
 	<comp:ContentPage.Content>
-		<base:View x:Name="rootView" WidthSpecification="-1" HeightSpecification="-1">
+		<base:View x:Name="rootView" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
 
 			<base:View.Layout>
 				<LinearLayout LinearOrientation="Vertical" LinearAlignment="Begin" CellPadding="10, 10"/>
 			</base:View.Layout>
 
-			<comp:Button x:Name="btn1" Text="Change" WidthSpecification="-1" HeightSpecification="100" CellHorizontalAlignment="Left"/>
+			<comp:Button x:Name="btn1" Text="Change" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="100" CellHorizontalAlignment="Left"/>
 			<base:View x:Name="lblView">
 				<comp:ScrollableBase x:Name="Scroller" ScrollingDirection="Vertical" HideScrollbar="false" >
 					<comp:ScrollableBase.Layout>
diff --git a/test/NUITizenGallery/res/layout/ScrollViewTest2Page.xaml b/test/NUITizenGallery/res/layout/ScrollViewTest2Page.xaml
index 7cabbaf..459959e 100755
--- a/test/NUITizenGallery/res/layout/ScrollViewTest2Page.xaml
+++ b/test/NUITizenGallery/res/layout/ScrollViewTest2Page.xaml
@@ -4,8 +4,8 @@
   xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
   xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-           WidthSpecification="-1"
-           HeightSpecification="-1"
+           WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+           HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
            BackgroundColor="White"
            PositionUsesPivotPoint="True"
            ParentOrigin="Center"
@@ -16,7 +16,7 @@
 	</comp:ContentPage.AppBar>
 
 	<comp:ContentPage.Content>
-		<base:View x:Name="rootView" WidthSpecification="-1" HeightSpecification="-1">
+		<base:View x:Name="rootView" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
 
 			<base:View.Layout>
 				<LinearLayout LinearOrientation="Vertical" LinearAlignment="Begin" CellPadding="10, 10"/>
diff --git a/test/NUITizenGallery/res/layout/ScrollViewTest3Page.xaml b/test/NUITizenGallery/res/layout/ScrollViewTest3Page.xaml
index 5291f25..735e76b 100755
--- a/test/NUITizenGallery/res/layout/ScrollViewTest3Page.xaml
+++ b/test/NUITizenGallery/res/layout/ScrollViewTest3Page.xaml
@@ -4,8 +4,8 @@
   xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
   xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-           WidthSpecification="-1"
-           HeightSpecification="-1"
+           WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+           HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
            BackgroundColor="White"
            PositionUsesPivotPoint="True"
            ParentOrigin="Center"
@@ -16,7 +16,7 @@
 	</comp:ContentPage.AppBar>
 
 	<comp:ContentPage.Content>
-		<base:View x:Name="rootView" WidthSpecification="-1" HeightSpecification="-1">
+		<base:View x:Name="rootView" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
 
 			<base:View.Layout>
 				<LinearLayout LinearOrientation="Vertical" LinearAlignment="Begin" CellPadding="10, 10"/>
diff --git a/test/NUITizenGallery/res/layout/ScrollViewTest4Page.xaml b/test/NUITizenGallery/res/layout/ScrollViewTest4Page.xaml
index c295163..178fc7f 100755
--- a/test/NUITizenGallery/res/layout/ScrollViewTest4Page.xaml
+++ b/test/NUITizenGallery/res/layout/ScrollViewTest4Page.xaml
@@ -4,8 +4,8 @@
   xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
   xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-           WidthSpecification="-1"
-           HeightSpecification="-1"
+           WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+           HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
            BackgroundColor="White"
            PositionUsesPivotPoint="True"
            ParentOrigin="Center"
@@ -16,7 +16,7 @@
 	</comp:ContentPage.AppBar>
 
 	<comp:ContentPage.Content>
-		<base:View x:Name="rootView" WidthSpecification="-1" HeightSpecification="-1">
+		<base:View x:Name="rootView" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
 
 			<base:View.Layout>
 				<LinearLayout LinearOrientation="Vertical" LinearAlignment="Begin" CellPadding="10, 10"/>
diff --git a/test/NUITizenGallery/res/layout/ScrollViewTest6Page.xaml b/test/NUITizenGallery/res/layout/ScrollViewTest6Page.xaml
new file mode 100644
index 0000000..cd70523
--- /dev/null
+++ b/test/NUITizenGallery/res/layout/ScrollViewTest6Page.xaml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<comp:ContentPage x:Class="NUITizenGallery.ScrollViewTest6Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
+  xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"                  
+  BackgroundColor="White"
+  PositionUsesPivotPoint="True" 
+  ParentOrigin="Center"
+  PivotPoint="Center">
+
+    <comp:ContentPage.AppBar>
+        <comp:AppBar x:Name="appBar" Title="ScrollViewTest6"/>
+    </comp:ContentPage.AppBar>
+
+    <comp:ContentPage.Content>
+        <View x:Name="textView" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+            <comp:ScrollableBase x:Name="ScrollAreaMain" HideScrollbar="True" ScrollingDirection="Vertical" HeightSpecification="{Static LayoutParamPolicies.MatchParent}" WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+                <comp:ScrollableBase.Layout>
+                    <LinearLayout LinearOrientation="Vertical" CellPadding="10, 10" LinearAlignment="Begin"/>
+                </comp:ScrollableBase.Layout>
+                <comp:ScrollableBase x:Name="ScrollArea" HideScrollbar="True" ScrollingDirection="Horizontal" >
+                    <comp:ScrollableBase.Layout>
+                        <LinearLayout LinearOrientation="Vertical" CellPadding="10, 10" LinearAlignment="Begin"/>
+                    </comp:ScrollableBase.Layout>
+                    <base:TextLabel x:Name="txtLbl1" Text="This is what a ScrollView widget looks like." TextColor="Blue" CellHorizontalAlignment="Left"/>
+                    <base:TextLabel x:Name="txtLbl2" Text="Please use the widgets to test ScrollView's behavior." TextColor="Green" CellHorizontalAlignment="Left" />
+                    <base:TextLabel x:Name="txtLbl3" Text="This is long horizontal text." TextColor="Cyan" CellHorizontalAlignment="Left" FontSizeScale="0.8"/>
+                </comp:ScrollableBase>
+                <base:TextLabel x:Name="widthLbl" Text="Width:400.00" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HorizontalAlignment="Begin" VerticalAlignment="Center" PointSize="8"/>
+                <comp:Slider x:Name="slider1" MinValue="50" MaxValue="800" CurrentValue="400" HeightSpecification="50" WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+                <base:TextLabel x:Name="heightLbl" Text="Height:300.00" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HorizontalAlignment="Begin" VerticalAlignment="Center" PointSize="8"/>
+                <comp:Slider x:Name="slider2" MinValue="50" MaxValue="600" CurrentValue="400" HeightSpecification="50" WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+                <comp:Button x:Name="btn1" HeightSpecification="100" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" Text="Add more horizontal text"/>
+                <comp:Button x:Name="btn2" HeightSpecification="100" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" Text="Add more vertical text"/>
+                <comp:Button x:Name="btn3" HeightSpecification="100" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" Text="Remove more vertical text"/>
+                <base:TextLabel x:Name="scrollLbl" Text="ScrollX: 0, ScrollY: 0" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HorizontalAlignment="Begin" VerticalAlignment="Center" PointSize="8"/>
+                <comp:Button x:Name="btn4" HeightSpecification="100" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" Text="Async scroll to (0, 0) without animation"/>
+                <comp:Button x:Name="btn5" HeightSpecification="100" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" Text="Async scroll to (0, 0) with animation"/>
+                <base:TextLabel x:Name="orientLbl" Text="Orientation: Horizontal" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HorizontalAlignment="Begin" VerticalAlignment="Center" PointSize="8"/>
+                <comp:Button x:Name="btn6" HeightSpecification="100" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" Text="Set Orientation to Vertical"/>
+            </comp:ScrollableBase>
+        </View>
+    </comp:ContentPage.Content>
+</comp:ContentPage>
diff --git a/test/NUITizenGallery/res/layout/ScrollViewTest7Page.xaml b/test/NUITizenGallery/res/layout/ScrollViewTest7Page.xaml
index 7f9705a..05ed361 100755
--- a/test/NUITizenGallery/res/layout/ScrollViewTest7Page.xaml
+++ b/test/NUITizenGallery/res/layout/ScrollViewTest7Page.xaml
@@ -4,8 +4,8 @@
   xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
   xmlns:comp="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-           WidthSpecification="-1"
-           HeightSpecification="-1"
+           WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+           HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
            BackgroundColor="White"
            PositionUsesPivotPoint="True"
            ParentOrigin="Center"
@@ -16,14 +16,14 @@
 	</comp:ContentPage.AppBar>
 
 	<comp:ContentPage.Content>
-		<base:View x:Name="rootView" WidthSpecification="-1" HeightSpecification="-1">
+		<base:View x:Name="rootView" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
 			<base:View.Layout>
 				<LinearLayout LinearOrientation="Vertical" LinearAlignment="Begin" CellPadding="10, 10"/>
 			</base:View.Layout>
 			<base:TextLabel x:Name="scrollInfo" Text="scroll X:0, Y:0" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="70" />
 			<comp:Button x:Name="btn" Text="Random vertical scroll" Size2D="{Binding Source={x:Static Window.Instance}, Path=Size }" HeightSpecification="100" />
 			<base:View x:Name="lblView">
-				<comp:ScrollableBase x:Name="Scroller" ScrollingDirection="Vertical" HideScrollbar="false" WidthSpecification="-1" HeightSpecification="-1">
+				<comp:ScrollableBase x:Name="Scroller" ScrollingDirection="Vertical" HideScrollbar="false" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
 					<comp:ScrollableBase.Layout>
 						<LinearLayout LinearOrientation="Vertical" CellPadding="10, 10"/>
 					</comp:ScrollableBase.Layout>
diff --git a/test/NUITizenGallery/res/layout/TimerTest1Page.xaml b/test/NUITizenGallery/res/layout/TimerTest1Page.xaml
new file mode 100644
index 0000000..ca7a083
--- /dev/null
+++ b/test/NUITizenGallery/res/layout/TimerTest1Page.xaml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="NUITizenGallery.TimerTest1Page"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:base="clr-namespace:Tizen.NUI.BaseComponents;assembly=Tizen.NUI"
+  xmlns:vm="clr-namespace:NUITizenGallery.ViewModels"
+  xmlns:converters="clr-namespace:NUITizenGallery.Converters"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  BackgroundColor="White"
+  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+  HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+    <ContentPage.AppBar>
+        <AppBar Title="TimerTest1Page"/>
+    </ContentPage.AppBar>
+
+    <ContentPage.Content>
+        
+        <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+            
+            <View.BindingContext>
+                <vm:TimerTest1ViewModel x:Name="context"/>
+            </View.BindingContext>
+            
+            <View.Layout>
+                <LinearLayout LinearOrientation="Vertical" CellPadding="10,10" LinearAlignment="Top"/>
+            </View.Layout>
+
+            <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Horizontal" LinearAlignment="CenterHorizontal" CellPadding="20,20"/>
+                </View.Layout>
+
+                <Button BindingContext="{Binding Source={x:Reference context}}"
+                    Text="Start"
+                    Command="{Binding StartTimer}"
+                    IsEnabled="{Binding TimerStarted, Converter={Static converters:InverseBoolConverter.Converter}}"/>
+
+                <Button BindingContext="{Binding Source={x:Reference context}}"
+                    Text="Stop"
+                    Command="{Binding StopTimer}"/>
+
+            </View>
+
+            <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Horizontal" LinearAlignment="CenterHorizontal" CellPadding="20,20"/>
+                </View.Layout>
+
+                <TextLabel BindingContext="{Binding Source={x:Reference context}}"
+                    Text="{Binding HoursMinutesSeconds}"/>
+
+                <TextLabel x:Name="msLabel"
+                    BindingContext="{Binding Source={x:Reference context}}"
+                    Text="{Binding Miliseconds}"/>
+
+            </View>
+            
+        </View>
+
+    </ContentPage.Content>
+
+</ContentPage>