diff --git a/DefaultControls/Button.xaml b/DefaultControls/Button.xaml
index 5985375..4a1ce96 100644
--- a/DefaultControls/Button.xaml
+++ b/DefaultControls/Button.xaml
@@ -35,5 +35,38 @@
                 <Setter Property="Foreground" Value="White" />
             </Trigger>
         </Style.Triggers>
-    </Style>                  
+    </Style>
+
+    <Style x:Key="ButtonGameEdit" TargetType="{x:Type Button}" BasedOn="{StaticResource BaseStyle}">
+        <Setter Property="Background" Value="#BF3c3f47"/>
+        <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource ControlBorderThickness}" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border x:Name="Border" BorderThickness="0" Background="{TemplateBinding Background}"
+                            CornerRadius="5" Style="{DynamicResource HighlightBorder}">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter Property="Background" Value="#4a4e56"/>
+                            <Setter Property="Opacity" Value="1"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="#4a4e56"/>
+                <Setter Property="Opacity" Value="1"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/DefaultControls/ListView.xaml b/DefaultControls/ListView.xaml
index 97bceae..fcdf9cb 100644
--- a/DefaultControls/ListView.xaml
+++ b/DefaultControls/ListView.xaml
@@ -124,8 +124,8 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListViewItem}">
                     <Grid>
-                        <Rectangle x:Name="HoverRectangle" Visibility="Collapsed" Fill="{DynamicResource HoverBrush}" />
-                        <Rectangle x:Name="SelectedRectangle" Visibility="Collapsed" Fill="{DynamicResource GlyphBrush}" />
+                        <Rectangle x:Name="HoverRectangle" Visibility="Collapsed" Fill="#2f3036" />
+                        <Rectangle x:Name="SelectedRectangle" Visibility="Collapsed" Fill="#5d6c95" />
                         <Border Padding="{TemplateBinding Padding}" Background="Transparent">
                             <GridViewRowPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Stretch" />
                         </Border>
@@ -136,6 +136,7 @@
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="Visibility" Value="Visible" TargetName="HoverRectangle" />
+                            <Setter Property="Cursor" Value="Hand"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/DerivedStyles/DetailsViewItemStyle.xaml b/DerivedStyles/DetailsViewItemStyle.xaml
index a976c31..a61b304 100644
--- a/DerivedStyles/DetailsViewItemStyle.xaml
+++ b/DerivedStyles/DetailsViewItemStyle.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style x:Key="DetailsViewItemStyle" TargetType="{x:Type ListBoxItem}">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}" />
+        <Setter Property="Foreground" Value="White" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="FontSize" Value="{DynamicResource FontSize}" />
@@ -10,10 +10,8 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBoxItem}">
                     <Grid>
-                        <Border x:Name="SelectedRectangle" IsHitTestVisible="False" Visibility="Collapsed"
-                                                        BorderThickness="500,0,0,0" BorderBrush="#5d6c95"/>
-                        <Border x:Name="HoverRectangle" IsHitTestVisible="False" Visibility="Collapsed"
-                                                        BorderThickness="500,0,0,0" BorderBrush="#2f3036"/>
+                        <Rectangle x:Name="HoverRectangle" Visibility="Collapsed" Fill="#2f3036" />
+                        <Rectangle x:Name="SelectedRectangle" Visibility="Collapsed" Fill="#5d6c95" />
                         <Border Padding="{TemplateBinding Padding}" Background="Transparent">
                             <ContentPresenter />
                         </Border>
@@ -24,14 +22,13 @@
                         </DataTrigger>
                         <DataTrigger Binding="{Binding IsInstalled}" Value="False">
                             <Setter Property="Foreground" Value="{StaticResource TextBrushDarker}" />
-                        </DataTrigger>                        
-                        <Trigger Property="IsSelected" Value="True">
+                        </DataTrigger>
+                        <Trigger Property="Selector.IsSelected" Value="True">
                             <Setter Property="Visibility" Value="Visible" TargetName="SelectedRectangle" />
-                            <Setter Property="Foreground" Value="White" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="Visibility" Value="Visible" TargetName="HoverRectangle" />
-                            <Setter Property="Foreground" Value="White" />
+                            <Setter Property="Cursor" Value="Hand"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/DerivedStyles/GridViewItemTemplate.xaml b/DerivedStyles/GridViewItemTemplate.xaml
index 51c3f81..6b28b7a 100644
--- a/DerivedStyles/GridViewItemTemplate.xaml
+++ b/DerivedStyles/GridViewItemTemplate.xaml
@@ -32,7 +32,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type GameListItem}">
-                    <Border BorderThickness="{Settings GridItemMargin}" BorderBrush="Transparent">
+                    <Border BorderThickness="{Settings GridItemMargin}" BorderBrush="Transparent" Cursor="Hand">
                         <StackPanel Name="PART_PanelHost"
                                     d:DataContext="{x:Static DesignMainViewModel.DesignSelectedGameIntance}">
 
@@ -49,7 +49,7 @@
                                            TextTrimming="CharacterEllipsis" TextAlignment="Center"
                                            HorizontalAlignment="Center" VerticalAlignment="Center"/>
                                 </Border>
-                                <Border Background="#0EFFFFFF" x:Name="BorderMouseOver" Visibility="Collapsed" />
+                                <Border Background="#1DFFFFFF" x:Name="BorderMouseOver" Visibility="Collapsed" />
                                 <Border Background="#AA000000" x:Name="BorderDarken" Visibility="Collapsed" />
                                 <Viewbox Name="GameControls"  Visibility="Collapsed">
                                     <StackPanel Width="200" Height="267">
diff --git a/DerivedStyles/HighlightBorder.xaml b/DerivedStyles/HighlightBorder.xaml
index 257a285..bc09b84 100644
--- a/DerivedStyles/HighlightBorder.xaml
+++ b/DerivedStyles/HighlightBorder.xaml
@@ -13,5 +13,22 @@
                 <Setter Property="BorderBrush" Value="{DynamicResource GlyphBrush}" />
             </Trigger>
         </Style.Triggers>
-    </Style>                  
+    </Style>
+
+    <Style x:Key="HighlightBackground" TargetType="Border" BasedOn="{StaticResource {x:Type Border}}">
+        <Setter Property="Background" Value="#3F000000"/>
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource ControlBorderThickness}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="#3e4047" />
+            </Trigger>
+            <Trigger Property="IsFocused" Value="True">
+                <Setter Property="Background" Value="#3e4047" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    
 </ResourceDictionary>
\ No newline at end of file
diff --git a/DerivedStyles/PlayButton.xaml b/DerivedStyles/PlayButton.xaml
index 3c6c77c..8ee09bf 100644
--- a/DerivedStyles/PlayButton.xaml
+++ b/DerivedStyles/PlayButton.xaml
@@ -3,6 +3,7 @@
     
     <Style x:Key="PlayButton" TargetType="{x:Type Button}" BasedOn="{StaticResource BaseStyle}">
         <Setter Property="FontFamily" Value="Corbel"/>
+        <Setter Property="Cursor" Value="Hand"/>
         <Setter Property="Typography.Capitals" Value="AllSmallCaps"/>
         <Setter Property="FontSize" Value="25"/>
         <Setter Property="Width" Value="Auto"/>
diff --git a/Images/info.png b/Images/info.png
new file mode 100644
index 0000000..39bf451
Binary files /dev/null and b/Images/info.png differ
diff --git a/Images/infohovered.png b/Images/infohovered.png
new file mode 100644
index 0000000..01920ed
Binary files /dev/null and b/Images/infohovered.png differ
diff --git a/Images/settings.png b/Images/settings.png
new file mode 100644
index 0000000..314046e
Binary files /dev/null and b/Images/settings.png differ
diff --git a/Images/settingshovered.png b/Images/settingshovered.png
new file mode 100644
index 0000000..5968f45
Binary files /dev/null and b/Images/settingshovered.png differ
diff --git a/Views/DetailsViewGameOverview.xaml b/Views/DetailsViewGameOverview.xaml
index aee60aa..2526a0d 100644
--- a/Views/DetailsViewGameOverview.xaml
+++ b/Views/DetailsViewGameOverview.xaml
@@ -12,7 +12,7 @@
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="530"/>
                                 <RowDefinition Height="599*"/>
-                                <RowDefinition Height="661*"/>
+                                <RowDefinition Height="561*"/>
                             </Grid.RowDefinitions>
                             <FadeImage x:Name="PART_ImageBackground" Stretch="UniformToFill" HorizontalAlignment="Stretch" VerticalAlignment="Top">
                                 <FadeImage.ImageOpacityMask>
@@ -53,7 +53,7 @@
                                                 <ColumnDefinition Width="Auto"/>
                                                 <ColumnDefinition Width="Auto"/>
                                             </Grid.ColumnDefinitions>
-                                            <Button Grid.Column="0" Name="PART_ButtonPlayAction" 
+                                            <Button Grid.Column="0" Name="PART_ButtonPlayAction" Cursor="Hand"
                                                     HorizontalAlignment="Left" Style="{DynamicResource PlayButton}" Margin="0,15,0,0"/>
                                             <Button Grid.Column="0" Name="PART_ButtonContextAction" 
                                                     HorizontalAlignment="Left" Style="{DynamicResource ContextButton}" Margin="0,15,0,0"/>
@@ -176,8 +176,45 @@
                                     </StackPanel>
                                 </DockPanel>
                             </Grid>
-                            <Button x:Name="PART_ButtonMoreActions" Content="ⓘ" FontSize="25" Padding="0,0,0,0" Width="35" Height="35" Margin="0,450,20,0" HorizontalAlignment="Right"/>
-                            <Button x:Name="PART_ButtonEditGame" Content="⚙" FontSize="18" Width="35" Height="35" Margin="0,450,70,0" Padding="0,0,0,0" HorizontalAlignment="Right"/>
+                            <StackPanel Width="Auto" Orientation="Horizontal" Margin="0,0,20,0" HorizontalAlignment="Stretch" FlowDirection="RightToLeft">
+                                <Button Style="{DynamicResource ButtonGameEdit}" x:Name="PART_ButtonMoreActions" Opacity="0.85" Padding="0" Width="35" Height="35" Margin="0,450,10,0" Cursor="Hand">
+                                    <Button.Content>
+                                        <Image Width="20" RenderOptions.BitmapScalingMode="NearestNeighbor">
+                                            <Image.Style>
+                                                <Style TargetType="Image">
+                                                    <Setter Property="Source" Value="../Images/info.png"/>
+                                                    <Setter Property="Opacity" Value="0.75"/>
+                                                    <Style.Triggers>
+                                                        <Trigger Property="IsMouseOver" Value="True">
+                                                            <Setter Property="Source" Value="../Images/infohovered.png"/>
+                                                            <Setter Property="Opacity" Value="1"/>
+                                                        </Trigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </Image.Style>
+                                        </Image>
+                                    </Button.Content>
+                                </Button>
+                                <Button Style="{DynamicResource ButtonGameEdit}" x:Name="PART_ButtonEditGame" Opacity="0.85" Focusable="False" FontSize="18" Width="35" Height="35" Margin="0,450,0,0" Padding="0" Cursor="Hand">
+                                    <Button.Content>
+                                        <Image Height="20" Width="18">
+                                            <Image.Style>
+                                                <Style TargetType="Image">
+                                                    <Setter Property="Source" Value="../Images/settings.png"/>
+                                                    <Setter Property="Opacity" Value="0.75"/>
+                                                    <Style.Triggers>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                            <Setter Property="Source" Value="../Images/settingshovered.png"/>
+                                                            <Setter Property="Opacity" Value="1"/>
+                                                        </Trigger>
+                                            </Style.Triggers>
+                                                </Style>
+                                            </Image.Style>
+                                        </Image>
+                                    </Button.Content>
+                                </Button>
+                                <Canvas Width="700"/>
+                            </StackPanel>
                         </Grid>
                     </ScrollViewer>
                 </ControlTemplate>
diff --git a/Views/ExplorerPanel.xaml b/Views/ExplorerPanel.xaml
index 024edca..2c58b6f 100644
--- a/Views/ExplorerPanel.xaml
+++ b/Views/ExplorerPanel.xaml
@@ -25,9 +25,9 @@
                             </Style>
                         </Border.Style>
                         <DockPanel Background="#24282f">
-                            <ComboBox Name="PART_SelectFields"
+                            <ComboBox Name="PART_SelectFields" Cursor="Hand"
                                   DockPanel.Dock="Top" Margin="5,8,5,8" />
-                            <ListBox Name="PART_SelectItems"
+                            <ListBox Name="PART_SelectItems"  Cursor="Hand"
                                  DockPanel.Dock="Top" Margin="5,0,5,8"                                      
                                  BorderThickness="0"
                                  ScrollViewer.HorizontalScrollBarVisibility="Disabled">
diff --git a/Views/FilterPanel.xaml b/Views/FilterPanel.xaml
index 73c3eed..833a1f0 100644
--- a/Views/FilterPanel.xaml
+++ b/Views/FilterPanel.xaml
@@ -30,7 +30,7 @@
                                         DockPanel.Dock="Right" Margin="0,-5,5,0" FontSize="25"
                                         Name="PART_ButtonClose"/>
                                 <Button DockPanel.Dock="Left" Content="{StaticResource LOCClearFilters}"                                        
-                                        HorizontalAlignment="Left"
+                                        HorizontalAlignment="Left" Cursor="Hand"
                                         Style="{StaticResource SimpleButton}"
                                         Name="PART_ButtonClear"/>
                             </DockPanel>
@@ -41,6 +41,7 @@
                                         <Style x:Key="FilterCheck" TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
                                             <Setter Property="Margin" Value="8,2,6,8" />
                                             <Setter Property="BorderThickness" Value="0" />
+                                            <Setter Property="Cursor" Value="Hand"/>
                                             <Style.Triggers>
                                                 <Trigger Property="IsChecked" Value="{StaticResource False}">
                                                     <Setter Property="Opacity" Value="0.6" />
@@ -49,6 +50,10 @@
                                         </Style>
                                         <Style x:Key="FilterLabel" TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
                                             <Setter Property="Margin" Value="8,10,6,4" />
+                                            <Setter Property="FontWeight" Value="Bold" />
+                                            <Setter Property="FontSize" Value="16"/>
+                                            <Setter Property="FontFamily" Value="Corbel"/>
+                                            <Setter Property="Typography.Capitals" Value="AllSmallCaps"/>
                                             <Style.Triggers>
                                                 <Trigger Property="Tag" Value="{StaticResource False}">
                                                     <Setter Property="Opacity" Value="0.6"/>
@@ -74,28 +79,28 @@
                                         </Style>
                                     </StackPanel.Resources>
 
-                                    <CheckBox Name="PART_ToggleInstalled" Style="{StaticResource FilterCheck}">
+                                    <CheckBox Name="PART_ToggleInstalled" Style="{StaticResource FilterCheck}" Cursor="Hand">
                                         <StackPanel Orientation="Horizontal">
                                             <TextBlock Text="{StaticResource LOCGameIsInstalledTitle}" Margin="0,0,5,0"/>
                                             <ContentControl Name="PART_ContentInstalledCount" ContentStringFormat="({0})"/>
                                         </StackPanel>
                                     </CheckBox>
 
-                                    <CheckBox Name="PART_ToggleUnInstalled" Style="{StaticResource FilterCheck}">
+                                    <CheckBox Name="PART_ToggleUnInstalled" Style="{StaticResource FilterCheck}" Cursor="Hand">
                                         <StackPanel Orientation="Horizontal">
                                             <TextBlock Text="{StaticResource LOCGameIsUnInstalledTitle}" Margin="0,0,5,0"/>
                                             <ContentControl Name="PART_ContentUnInstalledCount" ContentStringFormat="({0})"/>
                                         </StackPanel>
                                     </CheckBox>
 
-                                    <CheckBox Name="PART_ToggleHidden" Style="{StaticResource FilterCheck}">
+                                    <CheckBox Name="PART_ToggleHidden" Style="{StaticResource FilterCheck}" Cursor="Hand">
                                         <StackPanel Orientation="Horizontal">
                                             <TextBlock Text="{StaticResource LOCGameHiddenTitle}" Margin="0,0,5,0"/>
                                             <ContentControl Name="PART_ContentHiddenCount" ContentStringFormat="({0})"/>
                                         </StackPanel>
                                     </CheckBox>
 
-                                    <CheckBox Name="PART_ToggleFavorite" Style="{StaticResource FilterCheck}">
+                                    <CheckBox Name="PART_ToggleFavorite" Style="{StaticResource FilterCheck}" Cursor="Hand">
                                         <StackPanel Orientation="Horizontal">
                                             <TextBlock Text="{StaticResource LOCGameFavoriteTitle}" Margin="0,0,5,0"/>
                                             <ContentControl Name="PART_ContentFavoriteCount" ContentStringFormat="({0})"/>
@@ -110,12 +115,12 @@
                                     <!--Library-->
                                     <Label Name="PART_ElemLibraryLabel" Content="{StaticResource LOCLibrary}"  Foreground="#FF00E8FF"
                                        Style="{StaticResource FilterLabel}" />
-                                    <FilterSelectionBox x:Name="PART_FilterLibrary" />
+                                    <FilterSelectionBox x:Name="PART_FilterLibrary"/>
 
                                     <!--Name-->
                                     <Label Name="PART_ElemNameLabel" Content="{StaticResource LOCNameLabel}" Foreground="#FF00E8FF"
                                        Style="{StaticResource FilterLabel}" />
-                                    <SearchBox x:Name="PART_FilterName" />
+                                    <SearchBox x:Name="PART_FilterName"/>
 
                                     <!--Genre-->
                                     <Label Name="PART_ElemGenreLabel" Content="{StaticResource LOCGenreLabel}" Foreground="#FF00E8FF"
diff --git a/Views/GridViewGameOverview.xaml b/Views/GridViewGameOverview.xaml
index b455986..72eb102 100644
--- a/Views/GridViewGameOverview.xaml
+++ b/Views/GridViewGameOverview.xaml
@@ -63,13 +63,31 @@
 
                                 <StackPanel DockPanel.Dock="Top" Orientation="Horizontal"
                                             Margin="0,10,0,10">
-                                    <Button Name="PART_ButtonPlayAction" 
+                                    <Button Name="PART_ButtonPlayAction" Cursor="Hand"
                                              Style="{DynamicResource PlayButton}" />
                                     <Button Name="PART_ButtonContextAction" 
                                             Style="{DynamicResource ContextButton}"/>
-                                    <Button Name="PART_ButtonMoreActions" Margin="120,0,0,0" VerticalAlignment="Top"
-                                            Content="ⓘ" FontSize="18"
-                                            Width="35" Height="35"/>
+                                    <Button Style="{DynamicResource ButtonGameEdit}" Name="PART_ButtonMoreActions" Margin="120,0,0,0" VerticalAlignment="Top" Width="35" Height="35" Padding="0" Cursor="Hand">
+                                        <Button.Content>
+                                            <Image Width="20" RenderOptions.BitmapScalingMode="NearestNeighbor" Margin="0,0,-40,0">
+                                                <Image.Style>
+                                                    <Style TargetType="Image">
+                                                        <Setter Property="Source" Value="../Images/info.png"/>
+                                                        <Setter Property="Opacity" Value="0.75"/>
+                                                        <Style.Triggers>
+                                                            <Trigger Property="IsMouseOver" Value="True">
+                                                                <Setter Property="Source" Value="../Images/infohovered.png"/>
+                                                                <Setter Property="Opacity" Value="1"/>
+                                                            </Trigger>
+                                                        </Style.Triggers>
+                                                    </Style>
+                                                </Image.Style>
+                                                <Image.RenderTransform>
+                                                    <ScaleTransform ScaleX="-1"/>
+                                                </Image.RenderTransform>
+                                            </Image>
+                                        </Button.Content>
+                                    </Button>
                                 </StackPanel>
 
                                 <ScrollViewer DockPanel.Dock="Top" HorizontalAlignment="Stretch"
diff --git a/Views/LibraryGridView.xaml b/Views/LibraryGridView.xaml
index e8b2e2f..008ba43 100644
--- a/Views/LibraryGridView.xaml
+++ b/Views/LibraryGridView.xaml
@@ -13,7 +13,7 @@
                                d:DataContext="{x:Static DesignMainViewModel.DesignIntance}">
                         <GridViewGameOverview x:Name="PART_ControlGameView"
                                               Width="{Settings GrdiDetailsWitdh}"
-                                              DockPanel.Dock="{Settings GridViewDetailsPosition}" />                   
+                                              DockPanel.Dock="{Settings GridViewDetailsPosition}" />
                         <Grid DockPanel.Dock="Left">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="*" />
@@ -32,9 +32,41 @@
                                     </DataTemplate>
                                 </ExtendedListBox.ItemTemplate>
                             </ExtendedListBox>
-                            <StackPanel Margin="5" Orientation="Horizontal" Grid.Row="1">
-                                <Label Content="{DynamicResource LOCZoomLabel}" Margin="10,0,10,0"/>
-                                <SliderWithPopup x:Name="PART_SliderZoom" />
+                            <StackPanel Orientation="Horizontal" Grid.Row="1" Background="#B323282e" VerticalAlignment="Center" Height="30">
+                                <Label Content="{DynamicResource LOCZoomLabel}" Margin="10,0,10,0" VerticalAlignment="Center"/>
+                                <SliderWithPopup x:Name="PART_SliderZoom" VerticalAlignment="Center"/>
+                                <Label Content="{DynamicResource LOCLibrary}" Margin="20,0,0,0" Foreground="White" FontSize="15" VerticalAlignment="Center"/>
+                                <TextBlock Text=":" Foreground="White" FontSize="15" Margin="5,0,5,0" VerticalAlignment="Center"/>
+                                <TextBlock x:Name="PART_TextLastActivity" Background="Transparent" Text="{Binding SelectedGame.Library}" HorizontalAlignment="Left" Foreground="#e6e6e6" FontSize="15" VerticalAlignment="Center"/>
+                                <Rectangle Height="15" Width="3" Fill="White" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                                <Label Content="{DynamicResource LOCPlatformTitle}" Margin="10,0,0,0" Foreground="White" FontSize="15" VerticalAlignment="Center"/>
+                                <TextBlock Text=":" Foreground="White" FontSize="15" Margin="5,0,5,0" VerticalAlignment="Center"/>
+                                <TextBlock Background="Transparent" Name="PART_ButtonPlatform" Text="{Binding SelectedGame.Platform}" HorizontalAlignment="Left" Foreground="#e6e6e6" FontSize="15" VerticalAlignment="Center"/>
+                                <Rectangle Height="15" Width="3" Fill="White" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                                <Label Content="{DynamicResource LOCDeveloperLabel}" Margin="10,0,0,0" Foreground="White" FontSize="15" VerticalAlignment="Center"/>
+                                <TextBlock Text=":" Foreground="White" FontSize="15" Margin="5,0,5,0" VerticalAlignment="Center"/>
+                                <TextBlock Background="Transparent" Text="{Binding SelectedGame.Developers[0]}" HorizontalAlignment="Left" Foreground="#e6e6e6" FontSize="15" VerticalAlignment="Center"/>
+                                <Rectangle Height="15" Width="3" Fill="White" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                                <Label Content="{DynamicResource LOCPublisherLabel}" Margin="10,0,0,0" Foreground="White" FontSize="15" VerticalAlignment="Center"/>
+                                <TextBlock Text=":" Foreground="White" FontSize="15" Margin="5,0,5,0" VerticalAlignment="Center"/>
+                                <TextBlock Background="Transparent" Text="{Binding SelectedGame.Publishers[0]}" HorizontalAlignment="Left" Foreground="#e6e6e6" FontSize="15" VerticalAlignment="Center"/>
+                                <Rectangle Height="15" Width="3" Fill="White" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                                <Label Content="{DynamicResource LOCGenreLabel}" Margin="10,0,0,0" Foreground="White" FontSize="15" VerticalAlignment="Center"/>
+                                <TextBlock Text=":" Foreground="White" FontSize="15" Margin="5,0,5,0" VerticalAlignment="Center"/>
+                                <TextBlock Background="Transparent" Text="{Binding SelectedGame.Genres[0]}" HorizontalAlignment="Left" Foreground="#e6e6e6" FontSize="15" VerticalAlignment="Center"/>
+                                <Rectangle Height="15" Width="3" Fill="White" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                                <Label Content="{DynamicResource LOCGameReleaseDateTitle}" Margin="10,0,0,0" Foreground="White" FontSize="15" VerticalAlignment="Center"/>
+                                <TextBlock Text=":" Foreground="White" FontSize="15" Margin="5,0,5,0" VerticalAlignment="Center"/>
+                                <TextBlock Background="Transparent" Text="{Binding SelectedGame.ReleaseYear}" HorizontalAlignment="Left" Foreground="#e6e6e6" FontSize="15" VerticalAlignment="Center"/>
+                                <Rectangle Height="15" Width="3" Fill="White" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                                <Label Content="{DynamicResource LOCAgeRatingLabel}" Margin="10,0,0,0" Foreground="White" FontSize="15" VerticalAlignment="Center"/>
+                                <TextBlock Text=":" Foreground="White" FontSize="15" Margin="5,0,5,0" VerticalAlignment="Center"/>
+                                <TextBlock Background="Transparent" Text="{Binding SelectedGame.AgeRating}" HorizontalAlignment="Left" Foreground="#e6e6e6" FontSize="15" VerticalAlignment="Center"/>
+                                <Rectangle Height="15" Width="3" Fill="White" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                                <Label Content="{DynamicResource LOCVersionLabel}" Margin="10,0,0,0" Foreground="White" FontSize="15" VerticalAlignment="Center"/>
+                                <TextBlock Text=":" Foreground="White" FontSize="15" Margin="5,0,5,0" VerticalAlignment="Center"/>
+                                <TextBlock Background="Transparent" Text="{Binding SelectedGame.Version}" HorizontalAlignment="Left" Foreground="#e6e6e6" FontSize="15" VerticalAlignment="Center"/>
+                                <Rectangle Height="15" Width="3" Fill="White" VerticalAlignment="Center" Margin="10,0,0,0"/>
                             </StackPanel>
                         </Grid>
                     </DockPanel>
diff --git a/Views/MainPanel.xaml b/Views/MainPanel.xaml
index 5b82857..7b32575 100644
--- a/Views/MainPanel.xaml
+++ b/Views/MainPanel.xaml
@@ -24,65 +24,62 @@
                         </Border.Style>
                         <DockPanel Margin="0,3,110,3">
                             <Border x:Name="PART_ElemMainMenu" Background="Transparent" Width="19"
-                                    DockPanel.Dock="Left" Margin="10,0,10,0" Cursor="Hand"
+                                    DockPanel.Dock="Left" Margin="10,0,10,0"
                                     WindowChrome.IsHitTestVisibleInChrome="True">
                                 <StackPanel>
-                                <Rectangle Fill="White" Width="16" Height="1" Margin="0,10,0,4"/>
-                                <Rectangle Fill="White" Width="16" Height="1" Margin="0,0,0,4"/>
-                                <Rectangle Fill="White" Width="16" Height="1" Margin="0,0,0,0"/>
+                                    <Rectangle Fill="White" Width="16" Height="1" Margin="0,10,0,4"/>
+                                    <Rectangle Fill="White" Width="16" Height="1" Margin="0,0,0,4"/>
+                                    <Rectangle Fill="White" Width="16" Height="1" Margin="0,0,0,0"/>
                                 </StackPanel>
                             </Border>
 
                             <SearchBox x:Name="PART_TextMainSearch"
                                         Margin="5,1,-30,1" DockPanel.Dock="Left"
                                         WindowChrome.IsHitTestVisibleInChrome="True"
-                                        Width="290" Background="#3F000000" BorderBrush="Transparent"
-                                       />
+                                        Width="290" Background="#3F000000" BorderBrush="Transparent"/>
 
-
-                            <CheckBox x:Name="PART_ToggleFilter"
+                            <Border MinWidth="25"  Padding="5" MaxWidth="200" Margin="40,0,-27.5,0" Height="34" CornerRadius="5" Style="{DynamicResource HighlightBackground}" BorderThickness="0" Cursor="Hand">
+                                <CheckBox x:Name="PART_ToggleFilter" Cursor="Hand"
                                       WindowChrome.IsHitTestVisibleInChrome="True"
-                                      DockPanel.Dock="Left" Margin="0,1,0,1" MinWidth="35">
-                                <CheckBox.Style>
-                                    <Style TargetType="CheckBox">
-                                        <Setter Property="Template">
-                                            <Setter.Value>
-                                                <ControlTemplate>
-                                                    <!--<Border Style="{DynamicResource HighlightBorder}"-->
-                                                    <!--Background="Transparent">-->
-                                                    <StackPanel Orientation="Horizontal" Margin="0,0,0,0">
-                                                        <Image Source="{ThemeFile 'Images/searchsettings.png'}"
-                                                                    Height="15" RenderOptions.BitmapScalingMode="Fant"
-                                                                    Margin="0,0,0,0" Name="Tweakbutton"  Cursor="Hand"/>
-                                                        <TextBlock Text="{StaticResource LOCFilterActiveLabel}"
+                                      DockPanel.Dock="Left" MinWidth="20">
+                                    <CheckBox.Style>
+                                        <Style TargetType="CheckBox">
+                                            <Setter Property="Template">
+                                                <Setter.Value>
+                                                    <ControlTemplate>
+                                                        <StackPanel Orientation="Horizontal" Height="25">
+                                                            <Image Source="{ThemeFile 'Images/searchsettings.png'}"
+                                                                    Height="15" RenderOptions.BitmapScalingMode="Fant" 
+                                                                      Name="Tweakbutton" Cursor="Hand"/>
+                                                            <TextBlock Text="{StaticResource LOCFilterActiveLabel}"
                                                                        Style="{StaticResource BaseTextBlockStyle}"
-                                                                       Margin="15,0,0,0" VerticalAlignment="Center"
+                                                                       Margin="10,0,0,0" VerticalAlignment="Center"
                                                                        Name="TextFilter" />
-                                                    </StackPanel>
-                                                    <!--</Border>-->
-                                                    <ControlTemplate.Triggers>
-                                                        <Trigger Property="Tag" Value="{StaticResource True}">
-                                                            <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
-                                                            <Setter Property="Visibility" Value="Visible" TargetName="TextFilter" />
-                                                        </Trigger>
-                                                        <Trigger Property="Tag" Value="{StaticResource False}">
-                                                            <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-                                                            <Setter Property="Visibility" Value="Collapsed" TargetName="TextFilter" />
-                                                        </Trigger>
-                                                    </ControlTemplate.Triggers>
-                                                </ControlTemplate>
-                                            </Setter.Value>
-                                        </Setter>
-                                    </Style>
-                                </CheckBox.Style>
-                            </CheckBox>
-                            <Border x:Name="PART_ElemViewMenu" Background="#3F000000" BorderThickness="0"
-                                    DockPanel.Dock="Left" Margin="12,0,0,0" Width="36"
+                                                        </StackPanel>
+                                                        <ControlTemplate.Triggers>
+                                                            <Trigger Property="Tag" Value="{StaticResource True}">
+                                                                <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
+                                                                <Setter Property="Visibility" Value="Visible" TargetName="TextFilter" />
+                                                            </Trigger>
+                                                            <Trigger Property="Tag" Value="{StaticResource False}">
+                                                                <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+                                                                <Setter Property="Visibility" Value="Collapsed" TargetName="TextFilter" />
+                                                            </Trigger>
+                                                        </ControlTemplate.Triggers>
+                                                    </ControlTemplate>
+                                                </Setter.Value>
+                                            </Setter>
+                                        </Style>
+                                    </CheckBox.Style>
+                                </CheckBox>
+                            </Border>
+                            <Border x:Name="PART_ElemViewMenu" BorderThickness="0" Cursor="Hand"
+                                    DockPanel.Dock="Left" Margin="35,0,0,0" Width="33" Height="34" CornerRadius="5"
                                     WindowChrome.IsHitTestVisibleInChrome="True"
-                                    Style="{DynamicResource HighlightBorder}">
+                                    Style="{DynamicResource HighlightBackground}">
                                 <Image Source="{ThemeFile 'Images/views.png'}"
                                        Height="27" RenderOptions.BitmapScalingMode="NearestNeighbor"
-                                       Margin="-1,-1,1,0" Name="Tweakbutton"  Cursor="Hand"/>
+                                       Margin="0,-1,1,0" Name="Tweakbutton"/>
                             </Border>
 
                             <CheckBox x:Name="PART_ToggleNotifications"
diff --git a/theme.yaml b/theme.yaml
index 2c7c22b..0ac0413 100644
--- a/theme.yaml
+++ b/theme.yaml
@@ -1,4 +1,4 @@
 Name: SteamNite High-Res
 Author: Le Malgache
-Version: 2.2
+Version: 2.3
 ThemeApiVersion: 1.4.1