diff --git a/SampleApplications/Samples/Client/ClientPage.xaml b/SampleApplications/Samples/Client/ClientPage.xaml
index 968a82b114..0993567a60 100644
--- a/SampleApplications/Samples/Client/ClientPage.xaml
+++ b/SampleApplications/Samples/Client/ClientPage.xaml
@@ -27,12 +27,19 @@
                 <ColumnDefinition Width="2*"/>
             </Grid.ColumnDefinitions>
             <local:SessionTreeCtrl Grid.Column="0" Grid.Row="0" x:Name="SessionsCTRL" Margin="10,10,10,10" />
-            <local:BrowseTreeCtrl Grid.Column="1" Grid.Row="0" x:Name="BrowseCTRL" Margin="10,10,100,10" />
+            <local:BrowseTreeCtrl Grid.Column="1" Grid.Row="0" x:Name="BrowseCTRL" Margin="10,10,10,10" />
         </Grid>
         <Grid Grid.Column="0" Grid.Row="2" BorderBrush="Gray" BorderThickness="1" HorizontalAlignment="Stretch" Height="80" Margin="10,10,10,10" VerticalAlignment="Bottom">
-            <TextBlock Text="None" x:Name="ServerUrlTB" HorizontalAlignment="Stretch" Height="30" Margin="10,10,10,0" VerticalAlignment="Top" />
-            <TextBlock x:Name="ServerStatusTB" HorizontalAlignment="Stretch" Height="30" Margin="10,50,10,10" VerticalAlignment="Top" />
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <TextBlock Grid.Column="0" Grid.Row="0" Text="None" x:Name="ServerUrlTB" HorizontalAlignment="Stretch" Height="30" Margin="10,10,10,0" VerticalAlignment="Top" />
+            <TextBlock Grid.Column="0" Grid.Row="0" x:Name="ServerStatusTB" HorizontalAlignment="Stretch" Height="30" Margin="10,50,10,10" VerticalAlignment="Top" />
+            <Button Grid.Column="1" Grid.Row="0" x:Name="CommandBTN" Width="100" Content="Command" Visibility="Collapsed" HorizontalAlignment="Right" Margin="10,10,10,10" VerticalAlignment="Center"/>
         </Grid>
-        <Button x:Name="CommandBTN" Width="100" Content="Command" Visibility="Collapsed" HorizontalAlignment="Right" Margin="0,10,10,0" Grid.Row="1" VerticalAlignment="Top"/>
     </Grid>
 </Page>
diff --git a/SampleApplications/Samples/ClientControls/Endpoints/DiscoveredServerListCtrl.xaml.cs b/SampleApplications/Samples/ClientControls/Endpoints/DiscoveredServerListCtrl.xaml.cs
index 2e31d9f93d..383c47c2bf 100644
--- a/SampleApplications/Samples/ClientControls/Endpoints/DiscoveredServerListCtrl.xaml.cs
+++ b/SampleApplications/Samples/ClientControls/Endpoints/DiscoveredServerListCtrl.xaml.cs
@@ -33,6 +33,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Windows.UI.Core;
 using Windows.UI.Xaml.Controls;
 
 namespace Opc.Ua.Client.Controls
@@ -190,12 +191,23 @@ namespace Opc.Ua.Client.Controls
             // return new item.
             return listItem;
         }
-        
+
         /// <summary>
         /// Updates the list of servers displayed in the control.
         /// </summary>
-        private void OnUpdateServers(object state)
+        private async void OnUpdateServers(object state)
         {
+            if (!Dispatcher.HasThreadAccess)
+            {
+                await Dispatcher.RunAsync(
+                CoreDispatcherPriority.Normal,
+                () =>
+                {
+                    OnUpdateServers(state);
+                });
+                return;
+            }
+
             ItemsLV.Items.Clear();
 
             ApplicationDescriptionCollection servers = state as ApplicationDescriptionCollection;
diff --git a/SampleApplications/Samples/ClientControls/Endpoints/EndpointSelectorCtrl.xaml b/SampleApplications/Samples/ClientControls/Endpoints/EndpointSelectorCtrl.xaml
index ee686335a6..a59fe170f1 100644
--- a/SampleApplications/Samples/ClientControls/Endpoints/EndpointSelectorCtrl.xaml
+++ b/SampleApplications/Samples/ClientControls/Endpoints/EndpointSelectorCtrl.xaml
@@ -7,8 +7,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" >
-        <ComboBox x:Name="EndpointCB" KeyDown="EndpointCB_KeyDown" HorizontalAlignment="Stretch" Margin="10,10,110,0" VerticalAlignment="Top" SelectionChanged="EndpointCB_SelectionChanged"  PointerPressed="EndpointCB_PointerPressed"/>
+        <ComboBox x:Name="EndpointCB" KeyDown="EndpointCB_KeyDown" HorizontalAlignment="Stretch" Margin="10,10,120,0" VerticalAlignment="Top" SelectionChanged="EndpointCB_SelectionChanged"  PointerPressed="EndpointCB_PointerPressed"/>
         <Button x:Name="ConnectB" Content="Connect" HorizontalAlignment="Right" Height="30" VerticalAlignment="Top" Width="100" Margin="0,10,10,0" Click="ConnectButton_Click" />
-        <TextBox x:Name="InputTB" HorizontalAlignment="Stretch" Margin="10,10,110,0" TextWrapping="Wrap" Text="TextBox" VerticalAlignment="Top" Visibility="Collapsed" LostFocus="InputTB_LostFocus" KeyDown="InputTB_KeyDown"/>
+        <TextBox x:Name="InputTB" HorizontalAlignment="Stretch" Margin="10,10,120,0" TextWrapping="Wrap" Text="TextBox" VerticalAlignment="Top" Visibility="Collapsed" LostFocus="InputTB_LostFocus" KeyDown="InputTB_KeyDown"/>
     </Grid>
 </UserControl>
diff --git a/SampleApplications/Samples/Publisher/ClientPage.xaml b/SampleApplications/Samples/Publisher/ClientPage.xaml
index a426865345..96f3367d7f 100644
--- a/SampleApplications/Samples/Publisher/ClientPage.xaml
+++ b/SampleApplications/Samples/Publisher/ClientPage.xaml
@@ -10,7 +10,6 @@
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" >
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
@@ -18,8 +17,8 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
-        <other:EndpointSelectorCtrl Grid.Column="0" Grid.Row="1" x:Name="EndpointSelectorCTRL" HorizontalAlignment="Stretch" Height="45" VerticalAlignment="Top" />
-        <Grid Grid.Column="0" Grid.Row="2" BorderBrush="Gray" BorderThickness="1" HorizontalAlignment="Stretch" Margin="10,10,10,10" VerticalAlignment="Stretch">
+        <other:EndpointSelectorCtrl Grid.Column="0" Grid.Row="0" x:Name="EndpointSelectorCTRL" HorizontalAlignment="Stretch" Height="50" VerticalAlignment="Top" />
+        <Grid Grid.Column="0" Grid.Row="1" BorderBrush="Gray" BorderThickness="1" HorizontalAlignment="Stretch" Margin="10,10,10,10" VerticalAlignment="Stretch">
             <Grid.RowDefinitions>
                 <RowDefinition />
             </Grid.RowDefinitions>
@@ -28,12 +27,19 @@
                 <ColumnDefinition Width="2*"/>
             </Grid.ColumnDefinitions>
             <local:SessionTreeCtrl Grid.Column="0" Grid.Row="0" x:Name="SessionsCTRL" Margin="10,10,10,10" />
-            <local:BrowseTreeCtrl Grid.Column="1" Grid.Row="0" x:Name="BrowseCTRL" Margin="10,10,100,10" />
+            <local:BrowseTreeCtrl Grid.Column="1" Grid.Row="0" x:Name="BrowseCTRL" Margin="10,10,10,10" />
         </Grid>
-        <Grid Grid.Column="0" Grid.Row="3" BorderBrush="Gray" BorderThickness="1" HorizontalAlignment="Stretch" Height="80" Margin="10,10,10,10" VerticalAlignment="Bottom">
-            <TextBlock Text="None" x:Name="ServerUrlTB" HorizontalAlignment="Stretch" Height="30" Margin="10,10,10,0" VerticalAlignment="Top" />
-            <TextBlock x:Name="ServerStatusTB" HorizontalAlignment="Stretch" Height="30" Margin="10,50,10,10" VerticalAlignment="Top" />
+        <Grid Grid.Column="0" Grid.Row="2" BorderBrush="Gray" BorderThickness="1" HorizontalAlignment="Stretch" Height="80" Margin="10,10,10,10" VerticalAlignment="Bottom">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <TextBlock Grid.Column="0" Grid.Row="0" Text="None" x:Name="ServerUrlTB" HorizontalAlignment="Stretch" Height="30" Margin="10,10,10,0" VerticalAlignment="Top" />
+            <TextBlock Grid.Column="0" Grid.Row="0" x:Name="ServerStatusTB" HorizontalAlignment="Stretch" Height="30" Margin="10,50,10,10" VerticalAlignment="Top" />
+            <Button Grid.Column="1" Grid.Row="0" x:Name="CommandBTN" Width="100" Content="Command" Visibility="Collapsed" HorizontalAlignment="Right" Margin="10,10,10,10" VerticalAlignment="Center"/>
         </Grid>
-        <Button Grid.Column="1" Grid.Row="2" x:Name="CommandBTN" Width="100" Content="Command" Visibility="Collapsed" HorizontalAlignment="Right" Margin="0,10,10,0" VerticalAlignment="Top"/>
     </Grid>
 </Page>
diff --git a/SampleApplications/Samples/Publisher/Opc.Ua.Publisher.Endpoints.xml b/SampleApplications/Samples/Publisher/Opc.Ua.Publisher.Endpoints.xml
index a828504cf2..d7b85ca188 100644
--- a/SampleApplications/Samples/Publisher/Opc.Ua.Publisher.Endpoints.xml
+++ b/SampleApplications/Samples/Publisher/Opc.Ua.Publisher.Endpoints.xml
@@ -21,21 +21,5 @@
       <ua:UpdateBeforeConnect>true</ua:UpdateBeforeConnect>
       <ua:SelectedUserTokenPolicy>0</ua:SelectedUserTokenPolicy>
     </ua:ConfiguredEndpoint>
-    <ua:ConfiguredEndpoint>
-      <ua:Endpoint>
-        <EndpointUrl>opc.tcp://192.168.2.101:51210/UA/SampleServer</EndpointUrl>
-        <SecurityMode>SignAndEncrypt_3</SecurityMode>
-        <SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15</SecurityPolicyUri>
-        <UserIdentityTokens>
-          <UserTokenPolicy>
-            <TokenType>Anonymous_0</TokenType>
-          </UserTokenPolicy>
-        </UserIdentityTokens>
-        <TransportProfileUri>http://opcfoundation.org/UA/profiles/transport/wsxmlorbinary</TransportProfileUri>
-        <SecurityLevel>0</SecurityLevel>
-      </ua:Endpoint>
-      <ua:UpdateBeforeConnect>true</ua:UpdateBeforeConnect>
-      <ua:SelectedUserTokenPolicy>0</ua:SelectedUserTokenPolicy>
-    </ua:ConfiguredEndpoint>
   </ua:Endpoints>
 </ua:ConfiguredEndpointCollection>
\ No newline at end of file