diff --git a/DesktopEdge/MainWindow.xaml b/DesktopEdge/MainWindow.xaml
index 31ac361c..4c212bb4 100644
--- a/DesktopEdge/MainWindow.xaml
+++ b/DesktopEdge/MainWindow.xaml
@@ -198,31 +198,7 @@
                     <Label Name="UploadSpeedLabel" MouseUp="UploadSpeedLabel_MouseUp" Foreground="White" Margin="0,-20,0,30" Content="KBps" FontSize="11" HorizontalAlignment="Center" FontFamily="pack://application:,,,/Assets/Fonts/#Open Sans" />
                 </StackPanel>
             </Grid>
-            <!--
-            <Canvas Name="DownButton" Width="400" Height="20" MouseUp="DownButton_MouseUp" Visibility="Collapsed" MouseEnter="DownButton_MouseEnter" MouseLeave="DownButton_MouseLeave" Cursor="Hand">
-                <Rectangle x:Name="DownOver" Width="400" Height="20" Fill="White" Opacity="0"></Rectangle>
-                <Grid Width="{Binding ActualWidth, ElementName=ConnectButton}" Height="20">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="40"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-                    <Image Source="/Assets/Images/closer.png" Height="20" HorizontalAlignment="Center" Grid.ColumnSpan="2" />
-                </Grid>
-            </Canvas>
-            <Canvas Name="UpButton" Width="400" Height="20" MouseUp="UpButton_MouseUp" Visibility="Visible" MouseEnter="UpButton_MouseEnter" MouseLeave="UpButton_MouseLeave" Cursor="Hand">
-                <Rectangle x:Name="UpOver" Width="400" Height="20" Fill="White" Opacity="0"></Rectangle>
-                <Grid Width="{Binding ActualWidth, ElementName=ConnectButton}" Height="20">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="40"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-                    <Image Source="/Assets/Images/open.png" Height="20" HorizontalAlignment="Center" Grid.ColumnSpan="2" />
-                </Grid>
-            </Canvas>
-            -->
-            
+
             <ScrollViewer Name="IdListScroller" MinHeight="60" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Auto" CanContentScroll="True" ClipToBounds="True" PanningMode="VerticalOnly" PanningRatio=".1">
                 <StackPanel Name="IdList" Orientation="Vertical" IsItemsHost="False" LayoutUpdated="IdList_LayoutUpdated"></StackPanel>
             </ScrollViewer>
diff --git a/DesktopEdge/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs
index 4a8079da..3bd6b655 100644
--- a/DesktopEdge/MainWindow.xaml.cs
+++ b/DesktopEdge/MainWindow.xaml.cs
@@ -717,15 +717,10 @@ namespace ZitiDesktopEdge {
 				DoubleAnimation animation = new DoubleAnimation((double)(ids.Length * 64), TimeSpan.FromSeconds(.3));
 				IdList.BeginAnimation(FrameworkElement.HeightProperty, animation);
 				IdListScroller.Visibility = Visibility.Visible;
-				AddIdButton.Visibility = Visibility.Visible;
-				AddIdAreaButton.Visibility = Visibility.Visible;
 			} else {
 				this.Height = 490;
 				MainMenu.IdentitiesButton.Visibility = Visibility.Collapsed;
 				IdListScroller.Visibility = Visibility.Collapsed;
-				AddIdButton.Visibility = Visibility.Visible;
-				AddIdAreaButton.Visibility = Visibility.Visible;
-				Debug.WriteLine("Height: " + this.Height + " " + this.ActualHeight);
 			}
 
 			Placement();
@@ -744,9 +739,19 @@ namespace ZitiDesktopEdge {
 			if (isConnected) {
 				ConnectButton.Visibility = Visibility.Collapsed;
 				DisconnectButton.Visibility = Visibility.Visible;
+				AddIdButton.Content = "Add Identity";
+				AddIdButton.IsEnabled = true;
+				SetNotifyIcon("green");
 			} else {
 				ConnectButton.Visibility = Visibility.Visible;
 				DisconnectButton.Visibility = Visibility.Collapsed;
+				SetNotifyIcon("white");
+				AddIdButton.Content = "Service is Not Connected";
+				AddIdButton.IsEnabled = false;
+				UploadSpeed.Content = "0.0";
+				UploadSpeedLabel.Content = "bps";
+				DownloadSpeed.Content = "0.0";
+				DownloadSpeedLabel.Content = "bps";
 			}
 		}