diff --git a/src/ConnectedMode/UI/ManageBinding/ManageBindingDialog.xaml b/src/ConnectedMode/UI/ManageBinding/ManageBindingDialog.xaml
index 5c6292a94..511c0cea8 100644
--- a/src/ConnectedMode/UI/ManageBinding/ManageBindingDialog.xaml
+++ b/src/ConnectedMode/UI/ManageBinding/ManageBindingDialog.xaml
@@ -102,9 +102,9 @@
                         </Grid.ColumnDefinitions>
 
                         <Button Grid.Column="0" Content="{x:Static res:UiResources.UnbindButton}" IsEnabled="{Binding Path=IsUnbindButtonEnabled}" 
-                           Visibility="{Binding  Path=IsCurrentProjectBound, Converter={StaticResource TrueToVisibleConverter}}" VerticalAlignment="Center"
+                           Visibility="Collapsed" VerticalAlignment="Center"
                            Click="Unbind_OnClick"/>
-                        <Button Grid.Column="1" Content="{x:Static res:UiResources.ExportButton}" ToolTip="{x:Static res:UiResources.ExportBindingConfigurationTooltip}"
+                        <Button Grid.Column="1" Visibility="Collapsed" Content="{x:Static res:UiResources.ExportButton}" ToolTip="{x:Static res:UiResources.ExportBindingConfigurationTooltip}"
                            IsEnabled="{Binding Path=IsExportButtonEnabled}" VerticalAlignment="Center"
                            Click="ExportBindingConfigurationButton_OnClick"/>
                     </Grid>
diff --git a/src/ConnectedMode/UI/ManageConnections/ManageConnectionsDialog.xaml b/src/ConnectedMode/UI/ManageConnections/ManageConnectionsDialog.xaml
index 94d748e8c..70f10367c 100644
--- a/src/ConnectedMode/UI/ManageConnections/ManageConnectionsDialog.xaml
+++ b/src/ConnectedMode/UI/ManageConnections/ManageConnectionsDialog.xaml
@@ -80,8 +80,8 @@
                                    <RowDefinition Height="*"/>
                                </Grid.RowDefinitions>
 
-                               <TextBlock Grid.Row="0" Text="{Binding Path=Name, Mode=OneWay}" VerticalAlignment="Center" />
-                               <CheckBox Grid.Row="1" Content="{x:Static res:UiResources.SmartNotificationsCheckboxLabel}" IsChecked="{Binding Path=EnableSmartNotifications}"
+                               <TextBlock Grid.Row="0" Grid.RowSpan="2" Text="{Binding Path=Name, Mode=OneWay}" VerticalAlignment="Center" />
+                               <CheckBox Visibility="Collapsed" Grid.Row="1" Content="{x:Static res:UiResources.SmartNotificationsCheckboxLabel}" IsChecked="{Binding Path=EnableSmartNotifications}"
                                          VerticalContentAlignment="Center"/>
                             </Grid>
 
@@ -91,7 +91,7 @@
                                    <ColumnDefinition Width="Auto"/>
                                </Grid.ColumnDefinitions>
 
-                               <Button Grid.Column="0" Style="{StaticResource IconButtonStyle}" ToolTip="{x:Static res:UiResources.EditConnectionToolTip}" Click="EditConnection_Clicked">
+                               <Button Grid.Column="0" Style="{StaticResource IconButtonStyle}" ToolTip="{x:Static res:UiResources.EditConnectionToolTip}" Click="EditConnection_Clicked" Visibility="Collapsed">
                                    <imaging:CrispImage Width="20" Height="20" VerticalAlignment="Center" Cursor="Hand" Moniker="{x:Static vsimagecatalog:KnownMonikers.Settings}"
                                                        Margin="10,0" />
                                 </Button>
diff --git a/src/ConnectedMode/UI/ProjectSelection/ProjectSelectionDialog.xaml b/src/ConnectedMode/UI/ProjectSelection/ProjectSelectionDialog.xaml
index ee5b6c53e..442ea8664 100644
--- a/src/ConnectedMode/UI/ProjectSelection/ProjectSelectionDialog.xaml
+++ b/src/ConnectedMode/UI/ProjectSelection/ProjectSelectionDialog.xaml
@@ -53,9 +53,10 @@
                        Margin="0,10"/>
             <TextBox Grid.Row="1"
                      x:Name="ProjectSearchTextBox"
+                     Visibility="Collapsed"
                      VerticalAlignment="Top"
                      Text="{Binding ProjectSearchTerm, UpdateSourceTrigger=PropertyChanged}" />
-            <TextBlock Grid.Row="1" IsHitTestVisible="False"
+            <TextBlock Grid.Row="1" IsHitTestVisible="False" Visibility="Collapsed"
                        Text="{x:Static res:UiResources.SearchForProjectPlaceholder}" VerticalAlignment="Center"
                        HorizontalAlignment="Left" Margin="5,0,0,0" Foreground="DarkGray">
                 <TextBlock.Style>