diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index b254d4a22..3f6a20a01 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -208,8 +208,10 @@
     </TypeScriptCompile>
     <TypeScriptCompile Include="apps\editable-text-demo\model.ts" />
     <TypeScriptCompile Include="apps\tests\weak-event-listener-tests.ts" />
-    <TypeScriptCompile Include="apps\ui-tests-app\bindings\dbxmlbasics.ts" />
-    <TypeScriptCompile Include="apps\ui-tests-app\bindings\dbbasics.ts" />
+    <TypeScriptCompile Include="apps\ui-tests-app\bindings\xmlbasics.ts">
+      <DependentUpon>xmlbasics.xml</DependentUpon>
+    </TypeScriptCompile>
+	<TypeScriptCompile Include="apps\ui-tests-app\bindings\basics.ts" />
     <TypeScriptCompile Include="apps\ui-tests-app\layouts\absolute.ts" />
     <TypeScriptCompile Include="apps\ui-tests-app\layouts\dock.ts" />
     <TypeScriptCompile Include="apps\ui-tests-app\layouts\grid.ts" />
@@ -701,7 +703,7 @@
     <Content Include="apps\tests\xml-declaration\mymodulewithxml\my-control-no-js.xml">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="apps\ui-tests-app\bindings\dbxmlbasics.xml" />
+    <Content Include="apps\ui-tests-app\bindings\xmlbasics.xml" />
     <Content Include="apps\ui-tests-app\layouts\absolute.xml" />
     <Content Include="apps\ui-tests-app\layouts\dock.xml" />
     <Content Include="apps\ui-tests-app\layouts\grid.xml" />
diff --git a/apps/gallery-app/views/dialogs.ts b/apps/gallery-app/views/dialogs.ts
index 0a9ff31d8..54913adc1 100644
--- a/apps/gallery-app/views/dialogs.ts
+++ b/apps/gallery-app/views/dialogs.ts
@@ -6,7 +6,7 @@ export function alertTapped(args) {
 
 export function alertWithOptionsTapped(args) {
     dialogs.alert({
-        title: "Alert",
+        title: "Alert Title",
         message: "Hi there!",
         okButtonText: "Close"
     });
@@ -18,7 +18,7 @@ export function confirmTapped(args) {
 
 export function confirmWithOptionsTapped(args) {
     dialogs.confirm({
-        title: "Confirm",
+        title: "Confirm Title",
         message: "Are you sure?",
         okButtonText: "OK",
         cancelButtonText: "Cancel",
@@ -27,13 +27,13 @@ export function confirmWithOptionsTapped(args) {
 }
 
 export function promptTapped(args) {
-    dialogs.prompt("Enter name", "John Doe");
+    dialogs.prompt("Enter name:", "John Doe");
 }
 
 export function promptWithOptionsTapped(args) {
     dialogs.prompt({
-        title: "Prompt",
-        message: "Enter name",
+        title: "Prompt Title",
+        message: "Enter name:",
         okButtonText: "OK",
         cancelButtonText: "Cancel",
         neutralButtonText: "Ignore",
@@ -44,8 +44,8 @@ export function promptWithOptionsTapped(args) {
 
 export function promptWithOptionsPasswordTapped(args) {
     dialogs.prompt({
-        title: "Prompt",
-        message: "Enter name",
+        title: "Prompt Title",
+        message: "Enter name:",
         okButtonText: "OK",
         cancelButtonText: "Cancel",
         neutralButtonText: "Ignore",
@@ -55,19 +55,18 @@ export function promptWithOptionsPasswordTapped(args) {
 }
 
 export function loginTapped(args) {
-    dialogs.login("Login:", "username", "pwd").then(r=> console.log(`Login result: ${r.result}, user: ${r.userName}, pwd: ${r.password}`));
+    dialogs.login("Enter user/pass:", "username", "password").then(r=> console.log(`Login result: ${r.result}, user: ${r.userName}, pwd: ${r.password}`));
 }
 
 export function loginWithOptionsTapped(args) {
     dialogs.login({
-        title: "Login",
-        message: "Enter user/pwd",
+        title: "Login Title",
+        message: "Enter user/pass:",
         okButtonText: "OK",
         cancelButtonText: "Cancel",
         neutralButtonText: "Ignore",
-        defaultText: "John Doe",
-        userName: "USER",
-        password: "PWD"
+        userName: "username",
+        password: "password"
     }).then(r=> console.log(`Login result: ${r.result}, user: ${r.userName}, pwd: ${r.password}`));
 }
 
diff --git a/apps/gallery-app/views/dialogs.xml b/apps/gallery-app/views/dialogs.xml
index b552bbe91..d809819b4 100644
--- a/apps/gallery-app/views/dialogs.xml
+++ b/apps/gallery-app/views/dialogs.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Page>
-  <StackLayout>
-    <Button text="alert" tap="alertTapped"/>
-    <Button text="alert with options" tap="alertWithOptionsTapped"/>
-    <Button text="confirm" tap="confirmTapped"/>
-    <Button text="confirm with options" tap="confirmWithOptionsTapped"/>
-    <Button text="prompt" tap="promptTapped"/>
-    <Button text="prompt with options" tap="promptWithOptionsTapped"/>
-    <Button text="prompt with options password" tap="promptWithOptionsPasswordTapped"/>
-    <Button text="login" tap="loginTapped"/>
-    <Button text="login with options" tap="loginWithOptionsTapped"/>
-    <Button text="action" tap="actionTapped"/>
-    <Button text="action with options" tap="actionWithOptionsTapped"/>
-  </StackLayout>
+  <ScrollView>
+    <StackLayout>
+      <Button text="alert" tap="alertTapped"/>
+      <Button text="alert with options" tap="alertWithOptionsTapped"/>
+      <Button text="confirm" tap="confirmTapped"/>
+      <Button text="confirm with options" tap="confirmWithOptionsTapped"/>
+      <Button text="prompt" tap="promptTapped"/>
+      <Button text="prompt with options" tap="promptWithOptionsTapped"/>
+      <Button text="prompt with options password" tap="promptWithOptionsPasswordTapped"/>
+      <Button text="login" tap="loginTapped"/>
+      <Button text="login with options" tap="loginWithOptionsTapped"/>
+      <Button text="action" tap="actionTapped"/>
+      <Button text="action with options" tap="actionWithOptionsTapped"/>
+    </StackLayout>
+  </ScrollView>
 </Page>
\ No newline at end of file
diff --git a/apps/ui-tests-app/bindings/dbbasics.ts b/apps/ui-tests-app/bindings/basics.ts
similarity index 87%
rename from apps/ui-tests-app/bindings/dbbasics.ts
rename to apps/ui-tests-app/bindings/basics.ts
index 62b6cb4e1..5bcef2bed 100644
--- a/apps/ui-tests-app/bindings/dbbasics.ts
+++ b/apps/ui-tests-app/bindings/basics.ts
@@ -14,12 +14,21 @@ export function createPage() {
     var targetTwoWay = new textFieldModule.TextField();
     var buttonOneWay = new buttonModule.Button();
     var buttonTwoWay = new buttonModule.Button();
-    
+    var buttonSetText = new buttonModule.Button();
+
     targetOneWay.id = "textFieldOneWay";
     targetTwoWay.id = "textFieldTwoWay";
     buttonOneWay.id = "buttonOneWay";
     buttonTwoWay.id = "buttonTwoWay";
 
+    buttonSetText.id = "buttonSetText";
+    buttonSetText.text = "SetText";
+    buttonSetText.on(buttonModule.Button.tapEvent, function () {
+        targetOneWay.text = "Test";
+        targetTwoWay.text = "Test";
+    });
+    stack.addChild(buttonSetText);
+
     // OneWay Binding
     var bindingOptionOneWay = {
         sourceProperty: "textSource",
diff --git a/apps/ui-tests-app/bindings/dbxmlbasics.ts b/apps/ui-tests-app/bindings/xmlbasics.ts
similarity index 100%
rename from apps/ui-tests-app/bindings/dbxmlbasics.ts
rename to apps/ui-tests-app/bindings/xmlbasics.ts
diff --git a/apps/ui-tests-app/bindings/dbxmlbasics.xml b/apps/ui-tests-app/bindings/xmlbasics.xml
similarity index 84%
rename from apps/ui-tests-app/bindings/dbxmlbasics.xml
rename to apps/ui-tests-app/bindings/xmlbasics.xml
index 0c26426b2..6e33b99ae 100644
--- a/apps/ui-tests-app/bindings/dbxmlbasics.xml
+++ b/apps/ui-tests-app/bindings/xmlbasics.xml
@@ -1,8 +1,8 @@
 <Page>
   <StackLayout>
     <StackLayout loaded="stack0Loaded" orientation="horizontal">
-      <TextField id="tf" text="{{ textSource }}" />
-      <Button id="btn" />
+      <TextField id="tf" text="{{ textSource }}" width="150" />
+      <Button id="btn" width="150" />
     </StackLayout>
     <StackLayout loaded="stack1Loaded">
       <Label id="label" text="{{ text }}" />