diff --git a/Aurora/Aurora.csproj b/Aurora/Aurora.csproj
index 9a68ccd..d12e469 100644
--- a/Aurora/Aurora.csproj
+++ b/Aurora/Aurora.csproj
@@ -43,6 +43,9 @@
         <Folder Include="Design\Views\Profile\" />
         <Folder Include="Design\Components\DataGrid\" />
     </ItemGroup>
+    <ItemGroup>
+      <Compile Remove="Design\Behaviors\DeselectItemBehaviorBase.cs" />
+    </ItemGroup>
     <ItemGroup>
         <Compile Update="Design\Components\MusicPlayer\Player.xaml.cs">
             <DependentUpon>Player.xaml</DependentUpon>
diff --git a/Aurora/Design/Components/Library/Library.css b/Aurora/Design/Components/Library/Library.css
index a5bbdb6..60618b0 100644
--- a/Aurora/Design/Components/Library/Library.css
+++ b/Aurora/Design/Components/Library/Library.css
@@ -1,3 +1,6 @@
 Label {
     margin-left: 25;
+    text-align: left;
+    vertical-align: middle;
+    word-wrap: break-word;
 }
diff --git a/Aurora/Design/Components/Library/Library.xaml b/Aurora/Design/Components/Library/Library.xaml
index 805c643..568b717 100644
--- a/Aurora/Design/Components/Library/Library.xaml
+++ b/Aurora/Design/Components/Library/Library.xaml
@@ -14,7 +14,6 @@
              SelectionEnabled="True"
              RowHeight="30"
              BorderColor="#3a3a3a"
-             BorderThickness="0"
              HeaderFontSize="14"
              HeaderHeight="45"
              HeaderTextColor="White"
@@ -27,7 +26,7 @@
                 <dg:DataGridColumn
                      Title=""
                      PropertyName="Icon"
-                     Width="5">
+                     Width="15">
                     <dg:DataGridColumn.CellTemplate>
                         <DataTemplate>
                             <Image Source="../../Resources/unselected.png" />
@@ -43,9 +42,7 @@
                         <DataTemplate>
                             <Label
                                 LineBreakMode="TailTruncation"
-                                Text="{Binding .}"
-                                HorizontalOptions="Start"
-                                VerticalOptions="Center"/>
+                                Text="{Binding .}"/>
                         </DataTemplate>
                     </dg:DataGridColumn.CellTemplate>
                 </dg:DataGridColumn>
@@ -58,9 +55,7 @@
                         <DataTemplate>
                             <Label
                                 LineBreakMode="TailTruncation"
-                                Text="{Binding .}"
-                                HorizontalOptions="Start"
-                                VerticalOptions="Center"/>
+                                Text="{Binding .}"/>
                         </DataTemplate>
                     </dg:DataGridColumn.CellTemplate>
                 </dg:DataGridColumn>
@@ -72,19 +67,18 @@
                         <DataTemplate>
                             <Label
                                 LineBreakMode="TailTruncation"
-                                Text="{Binding .}"
-                                HorizontalOptions="Start"
-                                VerticalOptions="Center"
-                                TextColor="White"/>
+                                Text="{Binding .}"/>
                         </DataTemplate>
                     </dg:DataGridColumn.CellTemplate>
                 </dg:DataGridColumn>
             </dg:DataGrid.Columns>
+
             <dg:DataGrid.RowsTextColorPalette>
                 <dg:PaletteCollection>
                     <Color>White</Color>
                 </dg:PaletteCollection>
             </dg:DataGrid.RowsTextColorPalette>
+
             <dg:DataGrid.RowsBackgroundColorPalette>
                 <dg:PaletteCollection>
                     <Color>Transparent</Color>
diff --git a/Aurora/Design/Components/NavigationMenu/NavigationMenu.css b/Aurora/Design/Components/NavigationMenu/NavigationMenu.css
index a320db9..7044720 100644
--- a/Aurora/Design/Components/NavigationMenu/NavigationMenu.css
+++ b/Aurora/Design/Components/NavigationMenu/NavigationMenu.css
@@ -17,11 +17,12 @@ ListView {
     font-size: 12;
     font-family: Courier New, Courier, monospace;
     font-style: italic;
-    padding-top: 18;
+    padding-top: 20;
 }
 
-#ItemCell label {
+#ItemCell Label {
     color: white;
+    background-color: #232323;
     font-size: 15;
     font-family: Courier New, Courier, monospace;
     font-style: normal;
diff --git a/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml b/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml
index de69dae..41cc5ac 100644
--- a/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml
+++ b/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml
@@ -2,6 +2,7 @@
 <ContentView
      xmlns="http://xamarin.com/schemas/2014/forms"
      xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+     xmlns:behaviors="clr-namespace:Aurora.Design.Behaviors"
      x:Class="Aurora.Design.Components.NavigationMenu.NavigationMenu">
     <ContentView.Resources>
         <StyleSheet
@@ -12,6 +13,7 @@
             <ListView
                  x:Name="MenuItemsListView"
                  HasUnevenRows="true"
+                 SeparatorVisibility="None"
                  IsGroupingEnabled="true"
                  RowHeight="35"
                  CachingStrategy="RecycleElement">
diff --git a/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml.cs b/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml.cs
index 5f7942f..f33b698 100644
--- a/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml.cs
+++ b/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml.cs
@@ -11,8 +11,13 @@ namespace Aurora.Design.Components.NavigationMenu
         {
             InitializeComponent();
             ListView = MenuItemsListView;
+
         }
 
+        private void ListView_ItemSelected(object sender, SelectedItemChangedEventArgs e)
+        {
+            throw new NotImplementedException();
+        }
 
         public ListView ListView;
 
diff --git a/Aurora/Services/ClientService/ClientService.cs b/Aurora/Services/ClientService/ClientService.cs
index 6aeb47b..a3c0c58 100644
--- a/Aurora/Services/ClientService/ClientService.cs
+++ b/Aurora/Services/ClientService/ClientService.cs
@@ -140,7 +140,7 @@ namespace Aurora.Services.ClientService
 
         public void StopEvents()
         {
-            if (!_eventCancellationTokenSource.IsCancellationRequested)
+            if (_eventCancellationTokenSource != null && !_eventCancellationTokenSource.IsCancellationRequested)
             {
                 _eventCancellationTokenSource.Cancel();
             }