From 0da764ec392ce5401efd9232e108f2eb3914ad2b Mon Sep 17 00:00:00 2001
From: Arcestelis <arcestelis@gmail.com>
Date: Fri, 20 Oct 2023 19:11:47 +0200
Subject: [PATCH] Customization

---
 source/Constants.xaml                         |   6 +-
 source/DefaultControls/ListView.xaml          |   2 +-
 source/DefaultControls/Menu.xaml              |  10 +-
 source/DefaultControls/TabControl.xaml        |   1 -
 source/DerivedStyles/DetailsScrollViewer.xaml |   2 +-
 .../DerivedStyles/DetailsViewItemStyle.xaml   |   6 +-
 .../DetailsViewItemTemplate.xaml              |   5 +-
 source/DerivedStyles/MainWindowStyle.xaml     |   2 +-
 source/DerivedStyles/StandardWindowStyle.xaml |   2 +-
 source/LocSource.xaml                         |   2 +-
 source/Views/DetailsViewGameOverview.xaml     | 758 +++++++++---------
 source/Views/FilterPanelView.xaml             |   2 +-
 source/Views/GridViewGameOverview.xaml        |   8 +-
 source/Views/TopPanel.xaml                    |  60 +-
 source/theme.yaml                             |   4 +-
 15 files changed, 451 insertions(+), 419 deletions(-)

diff --git a/source/Constants.xaml b/source/Constants.xaml
index a629154..0ca5a10 100644
--- a/source/Constants.xaml
+++ b/source/Constants.xaml
@@ -53,11 +53,11 @@
     <sys:Double x:Key="BackgroundImageNoiseBackgroundOpacity">0.015</sys:Double>
     <FontFamily x:Key="FontFamily">Segoe UI</FontFamily>
     <FontFamily x:Key="MonospaceFontFamily">Consolas</FontFamily>
-    <Thickness x:Key="PopupMenuPadding">0,10,0,10</Thickness>
+    <Thickness x:Key="PopupMenuPadding">0</Thickness>
     <Thickness x:Key="PopupBorderThickness">1</Thickness>
     <Thickness x:Key="ControlBorderThickness">0</Thickness>
     <sys:Double x:Key="EllipseBorderThickness">1</sys:Double>
-    <sys:Double x:Key="ControlCornerRadiusValue">3</sys:Double>
+    <sys:Double x:Key="ControlCornerRadiusValue">0</sys:Double>
     <CornerRadius x:Key="ControlCornerRadius"
                   TopLeft="{StaticResource ControlCornerRadiusValue}" 
                   TopRight="{StaticResource ControlCornerRadiusValue}"
@@ -105,7 +105,7 @@
     <Color x:Key="PopupBorderColor">#63676869</Color>
     <Color x:Key="BackgroundToneColor">#262c38</Color>
     <Color x:Key="GridItemBackgroundColor">Transparent</Color>
-    <Color x:Key="PopupSeparatorColor">#5f6062</Color>
+    <Color x:Key="PopupSeparatorColor">#282a2e</Color>
     <Color x:Key="PanelSeparatorColor">#24262a</Color>
     <Color x:Key="WindowPanelSeparatorColor">Transparent</Color>
 
diff --git a/source/DefaultControls/ListView.xaml b/source/DefaultControls/ListView.xaml
index 780e416..0f9b59d 100644
--- a/source/DefaultControls/ListView.xaml
+++ b/source/DefaultControls/ListView.xaml
@@ -120,7 +120,7 @@
         <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
         <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
         <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Padding" Value="0,1,0,1" />
+        <Setter Property="Padding" Value="0,9,0,9" />
         <Setter Property="Cursor" Value="Hand"/>
         <Setter Property="Template">
             <Setter.Value>
diff --git a/source/DefaultControls/Menu.xaml b/source/DefaultControls/Menu.xaml
index 520429b..e634680 100644
--- a/source/DefaultControls/Menu.xaml
+++ b/source/DefaultControls/Menu.xaml
@@ -43,7 +43,7 @@
         <Border x:Name="Border">
             <Grid>
                 <Border x:Name="HoverBorder" Background="{DynamicResource HoverBrush}" Visibility="Collapsed"  />
-                <TextBlock VerticalAlignment="Center" Padding="5" Style="{DynamicResource BaseTextBlockStyle}"
+                <TextBlock VerticalAlignment="Center" Padding="6" Style="{DynamicResource BaseTextBlockStyle}"
                            Foreground="{TemplateBinding Foreground}">
                     <ContentPresenter ContentSource="Header" RecognizesAccessKey="True" />
                 </TextBlock>
@@ -115,14 +115,14 @@
             </Grid.ColumnDefinitions>
             <Border x:Name="HoverBorder" Grid.Column="0" Grid.ColumnSpan="4"
                     Background="{DynamicResource HoverBrush}" Visibility="Collapsed"  />
-            <ContentPresenter x:Name="Icon" Grid.Column="0" Margin="4,0,-5,0"
+            <ContentPresenter x:Name="Icon" Grid.Column="0" Margin="10,0,0,0"
                               MaxHeight="16" MaxWidth="16"
                               VerticalAlignment="Center" ContentSource="Icon" />
             <Grid x:Name="GlyphPanel" Grid.Column="0" Visibility="Collapsed"
                   Margin="5,0,-5,0" VerticalAlignment="Center">
                 <TextBlock FontFamily="Marlett" Text="a" VerticalAlignment="Center" Style="{DynamicResource BaseTextBlockStyle}" />
             </Grid>
-            <TextBlock Grid.Column="1" Padding="5" VerticalAlignment="Center" Style="{DynamicResource BaseTextBlockStyle}"
+            <TextBlock Grid.Column="1" Padding="6" VerticalAlignment="Center" Style="{DynamicResource BaseTextBlockStyle}"
                        Foreground="{TemplateBinding Foreground}">
                 <ContentPresenter RecognizesAccessKey="True" Margin="5,0,5,0" ContentSource="Header"/>
             </TextBlock>
@@ -177,13 +177,13 @@
                     <ColumnDefinition Width="*" SharedSizeGroup="MenuItemIGTColumnGroup" />
                     <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemShortcutColumnGroup" />
                 </Grid.ColumnDefinitions>
-                <ContentPresenter x:Name="Icon" Grid.Column="0" Margin="4,0,-5,0"
+                <ContentPresenter x:Name="Icon" Grid.Column="0" Margin="10,0,-5,0"
                                   MaxHeight="16" MaxWidth="16"
                                   VerticalAlignment="Center" ContentSource="Icon" />
                 <Grid x:Name="GlyphPanel" Grid.Column="0" Visibility="Collapsed" Margin="5,0,-5,0" VerticalAlignment="Center">
                     <TextBlock FontFamily="Marlett" Text="a" VerticalAlignment="Center" Style="{DynamicResource BaseTextBlockStyle}" />
                 </Grid>
-                <TextBlock VerticalAlignment="Center" Grid.Column="1" Margin="5,0,5,0" Padding="5" Style="{DynamicResource BaseTextBlockStyle}"
+                <TextBlock VerticalAlignment="Center" Grid.Column="1" Margin="5,0,15,0" Padding="6" Style="{DynamicResource BaseTextBlockStyle}"
                            Foreground="{TemplateBinding Foreground}">
                     <ContentPresenter RecognizesAccessKey="True" ContentSource="Header"/>
                 </TextBlock>
diff --git a/source/DefaultControls/TabControl.xaml b/source/DefaultControls/TabControl.xaml
index 9c6bcfd..e28c75e 100644
--- a/source/DefaultControls/TabControl.xaml
+++ b/source/DefaultControls/TabControl.xaml
@@ -112,7 +112,6 @@
                         <Border x:Name="HeaderBorder" Background="Transparent"
                                 BorderThickness="0,0,0,0">
                             <TabPanel x:Name="HeaderPanel" IsItemsHost="True" Panel.ZIndex="1" Width="Auto" Height="Auto"
-                                      HorizontalAlignment="Center"
                                       KeyboardNavigation.TabIndex="1" RenderTransformOrigin="0.5,0.5">
                                 <TabPanel.LayoutTransform>
                                     <TransformGroup>
diff --git a/source/DerivedStyles/DetailsScrollViewer.xaml b/source/DerivedStyles/DetailsScrollViewer.xaml
index b16c3e4..f77bb7d 100644
--- a/source/DerivedStyles/DetailsScrollViewer.xaml
+++ b/source/DerivedStyles/DetailsScrollViewer.xaml
@@ -20,7 +20,7 @@
                                    Margin="-17,0,0,0"/>
             
                         <ScrollBar x:Name="PART_VerticalScrollBar" Grid.Column="1" Grid.Row="0"
-                                   Margin="-17,0,0,0"
+                                   Margin="-17,10,2,10"
                                    Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
                                    Value="{Binding Path=VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
                                    ViewportSize="{TemplateBinding ViewportHeight}"
diff --git a/source/DerivedStyles/DetailsViewItemStyle.xaml b/source/DerivedStyles/DetailsViewItemStyle.xaml
index fa9ca30..5a957fc 100644
--- a/source/DerivedStyles/DetailsViewItemStyle.xaml
+++ b/source/DerivedStyles/DetailsViewItemStyle.xaml
@@ -6,10 +6,13 @@
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="FontSize" Value="{DynamicResource FontSize}" />
+        <Setter Property="Padding" Value="{DynamicResource FontSize}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                    <Grid>
+                    <Grid Margin="10,0,10,0">
+                        <Border x:Name="HoverRectangle" IsHitTestVisible="False" Visibility="Collapsed"
+                                                        BorderThickness="5,0,0,0" BorderBrush="{DynamicResource SecondaryBrush}"/>
                         <Border x:Name="SelectedRectangle" IsHitTestVisible="False" Visibility="Collapsed"
                                 BorderThickness="0,0,0,0" BorderBrush="{DynamicResource GlyphBrush}"/>
                         <Border x:Name="ItemBackground" Padding="{TemplateBinding Padding}" Background="Transparent"
@@ -40,6 +43,7 @@
                             <Setter Property="Background" Value="{DynamicResource DetailsViewLibrarySelectedBackgroundBrush}" TargetName="ItemBackground" />
                             <Setter Property="BorderBrush" Value="{DynamicResource GlyphBrush}" TargetName="SelectedRectangle" />
                             <Setter Property="Visibility" Value="Visible" TargetName="SelectedRectangle" />
+                            <Setter Property="Visibility" Value="Visible" TargetName="HoverRectangle" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/source/DerivedStyles/DetailsViewItemTemplate.xaml b/source/DerivedStyles/DetailsViewItemTemplate.xaml
index 7b6182d..207b1ae 100644
--- a/source/DerivedStyles/DetailsViewItemTemplate.xaml
+++ b/source/DerivedStyles/DetailsViewItemTemplate.xaml
@@ -9,7 +9,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type GameListItem}">
-                    <Border Name="PART_PanelHost" Padding="10,3,0,3" Background="Transparent"
+                    <Border Name="PART_PanelHost" Padding="11,5,0,5" Background="Transparent"
                             d:DataContext="{x:Static DesignMainViewModel.DesignSelectedGameIntance}">
                         <DockPanel>
                             <TextBlock Text="&#xF000;" Foreground="{DynamicResource GlyphBrush}"
@@ -17,6 +17,7 @@
                                        VerticalAlignment="Center"
                                        DockPanel.Dock="Right"
                                        FontFamily="{DynamicResource FontIcoFont}"
+                                       Padding="0,0,20,0"
                                        Tag="{DynamicResource DetailsViewLibraryGameShowFavorite}">
                                 <TextBlock.Style>
                                     <Style TargetType="TextBlock" >
@@ -46,7 +47,7 @@
                                    RenderOptions.BitmapScalingMode="Fant"
                                    DockPanel.Dock="Left" Margin="0,0,8,0" />
                             <TextBlock Text="{Binding DisplayName}" TextTrimming="CharacterEllipsis" x:Name="DisplayName"
-                                       VerticalAlignment="Center" DockPanel.Dock="Left">
+                                       VerticalAlignment="Center" DockPanel.Dock="Left" Padding="0,0,10,0">
                             </TextBlock>
                         </DockPanel>
                     </Border>
diff --git a/source/DerivedStyles/MainWindowStyle.xaml b/source/DerivedStyles/MainWindowStyle.xaml
index 4b891c4..2d15e26 100644
--- a/source/DerivedStyles/MainWindowStyle.xaml
+++ b/source/DerivedStyles/MainWindowStyle.xaml
@@ -10,7 +10,7 @@
         <Setter Property="WindowChrome.WindowChrome">
             <Setter.Value>
                 <WindowChrome CaptionHeight="25" CornerRadius="0" ResizeBorderThickness="4"
-                              NonClientFrameEdges ="None" UseAeroCaptionButtons="False" GlassFrameThickness="0"/>
+                              NonClientFrameEdges ="None" UseAeroCaptionButtons="False" GlassFrameThickness="1"/>
             </Setter.Value>
         </Setter>
         <Setter Property="Template">
diff --git a/source/DerivedStyles/StandardWindowStyle.xaml b/source/DerivedStyles/StandardWindowStyle.xaml
index 5f020c8..b11220c 100644
--- a/source/DerivedStyles/StandardWindowStyle.xaml
+++ b/source/DerivedStyles/StandardWindowStyle.xaml
@@ -33,7 +33,7 @@
                                 <Border Background="{DynamicResource NoiseBrush}"
                                         CornerRadius="8"
                                         Opacity="{DynamicResource StandardWindowNoiseBackgroundOpacity}"/>
-                                <ContentPresenter Margin="0,50,0,0"/>
+                                <ContentPresenter Margin="10,50,10,10"/>
                                 <DockPanel DockPanel.Dock="Top" LastChildFill="False">
                                     <DockPanel DockPanel.Dock="Top" LastChildFill="False">
                                         <TextBlock Text="{TemplateBinding Title}" FontWeight="SemiBold" DockPanel.Dock="Left" Margin="10,15,0,15" VerticalAlignment="Center"
diff --git a/source/LocSource.xaml b/source/LocSource.xaml
index 0f71bae..41209b1 100644
--- a/source/LocSource.xaml
+++ b/source/LocSource.xaml
@@ -869,7 +869,7 @@ Application restart is requred to finish the process. Do you want to reset setti
     <sys:String x:Key="LOCItemAlreadyExists">An item with the same name already exists.</sys:String>
     <sys:String x:Key="LOCRandomGameLimistToFilter">Limit selection to current filter</sys:String>
     <sys:String x:Key="LOCRandomGamePickAnother">Pick another</sys:String>
-    <sys:String x:Key="LOCMenuAddons">Add-ons…</sys:String>
+    <sys:String x:Key="LOCMenuAddons">Add-ons</sys:String>
     <sys:String x:Key="LOCExtensionsInstalled">Installed</sys:String>
     <sys:String x:Key="LOCExtensionsSettings">Extensions settings</sys:String>
     <sys:String x:Key="LOCExtensionsBrowse">Browse</sys:String>
diff --git a/source/Views/DetailsViewGameOverview.xaml b/source/Views/DetailsViewGameOverview.xaml
index 67ccfcb..c933dc2 100644
--- a/source/Views/DetailsViewGameOverview.xaml
+++ b/source/Views/DetailsViewGameOverview.xaml
@@ -72,7 +72,7 @@
                                 </Grid>
                                 
                                 <Border Visibility="{Binding ElementName=PART_ImageBackground, Path=Source, Converter={StaticResource NullToVisibilityConverter}}"
-                                        Background="{DynamicResource NoiseBrush}" Opacity="{DynamicResource BackgroundImageNoiseBackgroundOpacity}"/>
+                                        Background="{DynamicResource NoiseBrush}" Opacity="{DynamicResource BackgroundImageNoiseBackgroundOpacity}" Height="840"/>
                             </Grid>
 
                             <Grid HorizontalAlignment="Stretch">
@@ -85,7 +85,7 @@
                                 <StackPanel Grid.Row="0" Name="TopHeader">
                                     <Border Visibility="Hidden" Height="{Settings CalculatedGameDetailsIndentation}"
                                             MinHeight="{DynamicResource PanelTopPanelSeparatorHeight}" />
-                                    <Grid Margin="40,0,40,0" MaxWidth="{DynamicResource DetailsViewDetailsMaxWidth}">
+                                    <Grid Margin="40,-10,40,0" MaxWidth="{DynamicResource DetailsViewDetailsMaxWidth}">
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="5*" />
                                             <ColumnDefinition Width="1*" />
@@ -105,14 +105,16 @@
                                                 <RowDefinition Height="Auto" />
                                             </Grid.RowDefinitions>
 
-                                            <WrapPanel Grid.Row="0">
-                                                <DockPanel>
-                                                    <Image Name="PART_ImageIcon" MaxHeight="48" MaxWidth="48" DockPanel.Dock="Left" 
-                                                           Margin="0,0,10,0" VerticalAlignment="Center" RenderOptions.BitmapScalingMode="Fant">
-                                                        <Image.Effect>
-                                                            <DropShadowEffect BlurRadius="15" ShadowDepth="0" Color="#0d0d0d" Opacity="0.20"/>
-                                                        </Image.Effect>
-                                                    </Image>
+                                            <StackPanel>
+
+                                                <WrapPanel Grid.Row="0" Margin="0 0 0 20">
+                                                    <DockPanel>
+                                                        <Image Name="PART_ImageIcon" MaxHeight="48" MaxWidth="48" DockPanel.Dock="Left" 
+                                                            Margin="0,0,10,0" VerticalAlignment="Center" RenderOptions.BitmapScalingMode="Fant">
+                                                            <Image.Effect>
+                                                                <DropShadowEffect BlurRadius="15" ShadowDepth="0" Color="#0d0d0d" Opacity="0.20"/>
+                                                            </Image.Effect>
+                                                        </Image>
 
                                                     <Border DockPanel.Dock="Left"
                                                             Tag="{DynamicResource DetailsViewDisplayGameNameIfLogoVisible}">
@@ -138,81 +140,74 @@
                                                     </Border>
 
 
+                                                    </DockPanel>
+
+                                                    <!-- <ContentControl x:Name="DuplicateHider_SourceSelector" 
+                                                                DockPanel.Dock="Left" VerticalAlignment="Center"
+                                                                VerticalContentAlignment="Center"   
+                                                                Margin="0,0,10,0"  
+                                                                Height="24"
+                                                                Visibility="{PluginSettings Plugin=DuplicateHider, Path=EnableUiIntegration, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                                                RenderOptions.BitmapScalingMode="Fant" /> -->
+
+                                                    <ContentControl x:Name="NewsViewer_PlayersInGameViewerControl"
+                                                                Visibility="{PluginSettings Plugin=NewsViewer, Path=PlayersCountAvailable, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                                                Margin="0,0,10,0"
+                                                                DockPanel.Dock="Left" HorizontalAlignment="Left" VerticalAlignment="Center">
+                                                        <ContentControl.Resources>
+                                                            <Style TargetType="Button" BasedOn="{StaticResource PlayersCountButtonStyle}" />
+                                                        </ContentControl.Resources>
+                                                    </ContentControl>
+
+                                                </WrapPanel>
+
+                                                <DockPanel Grid.Row="1" Name="PART_ElemDevelopers"
+                                                        VerticalAlignment="Top">
+                                                    <Label Margin="0,4,10,0"
+                                                    FontWeight="Medium"
+                                                    Content="{DynamicResource LOCDeveloperLabel}"
+                                                    Foreground="White" VerticalAlignment="Top" MinWidth="75"/>
+                                                    <ItemsControl VerticalAlignment="Center" Name="PART_ItemsDevelopers">
+                                                        <ItemsControl.ItemsPanel>
+                                                            <ItemsPanelTemplate>
+                                                                <WrapPanel Orientation="Horizontal" VerticalAlignment="Center"/>
+                                                            </ItemsPanelTemplate>
+                                                        </ItemsControl.ItemsPanel>
+                                                    </ItemsControl>
+                                                </DockPanel>
+
+                                                <DockPanel Grid.Row="2" Name="PART_ElemPublishers"
+                                                        VerticalAlignment="Top">
+                                                    <Label Margin="0,4,10,0"
+                                                    FontWeight="Medium"
+                                                    Content="{DynamicResource LOCPublisherLabel}"
+                                                    Foreground="White" VerticalAlignment="Top" MinWidth="75"/>
+                                                    <ItemsControl VerticalAlignment="Center" Name="PART_ItemsPublishers">
+                                                        <ItemsControl.ItemsPanel>
+                                                            <ItemsPanelTemplate>
+                                                                <WrapPanel Orientation="Horizontal" VerticalAlignment="Center"/>
+                                                            </ItemsPanelTemplate>
+                                                        </ItemsControl.ItemsPanel>
+                                                    </ItemsControl>
                                                 </DockPanel>
 
-                                                <ContentControl x:Name="DuplicateHider_SourceSelector" 
-                                                            DockPanel.Dock="Left" VerticalAlignment="Center"
-                                                            VerticalContentAlignment="Center"   
-                                                            Margin="0,0,10,0"  
-                                                            Height="24"
-                                                            Visibility="{PluginSettings Plugin=DuplicateHider, Path=EnableUiIntegration, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                                            RenderOptions.BitmapScalingMode="Fant" />
-
-                                                <ContentControl x:Name="NewsViewer_PlayersInGameViewerControl"
-                                                            Visibility="{PluginSettings Plugin=NewsViewer, Path=PlayersCountAvailable, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                                            Margin="0,0,10,0"
-                                                            DockPanel.Dock="Left" HorizontalAlignment="Left" VerticalAlignment="Center">
-                                                    <ContentControl.Resources>
-                                                        <Style TargetType="Button" BasedOn="{StaticResource PlayersCountButtonStyle}" />
-                                                    </ContentControl.Resources>
-                                                </ContentControl>
+                                                <DockPanel Grid.Row="3" Name="PART_ElemPlatform"
+                                                        VerticalAlignment="Top">
+                                                    <Label Margin="0,4,10,0"
+                                                    FontWeight="Medium"
+                                                    Content="{DynamicResource LOCGamePlatformTitle}"
+                                                    Foreground="White" VerticalAlignment="Top"  MinWidth="75"/>
+                                                    <ItemsControl VerticalAlignment="Center" Name="PART_ItemsPlatforms">
+                                                        <ItemsControl.ItemsPanel>
+                                                            <ItemsPanelTemplate>
+                                                                <WrapPanel Orientation="Horizontal" VerticalAlignment="Center"/>
+                                                            </ItemsPanelTemplate>
+                                                        </ItemsControl.ItemsPanel>
+                                                    </ItemsControl>
+                                                </DockPanel>
 
-                                            </WrapPanel>
+                                            </StackPanel>
 
-                                            <DockPanel Grid.Row="1" Name="PART_ElemDevelopers"
-                                                       VerticalAlignment="Top">
-                                                <Label Margin="0,4,10,0"
-                                                   FontWeight="Medium"
-                                                   Content="{DynamicResource LOCDeveloperLabel}"
-                                                   Foreground="White" VerticalAlignment="Top"/>
-                                                <ItemsControl VerticalAlignment="Center" Name="PART_ItemsDevelopers">
-                                                    <ItemsControl.ItemsPanel>
-                                                        <ItemsPanelTemplate>
-                                                            <WrapPanel Orientation="Horizontal" VerticalAlignment="Center"/>
-                                                        </ItemsPanelTemplate>
-                                                    </ItemsControl.ItemsPanel>
-                                                </ItemsControl>
-                                            </DockPanel>
-
-                                            <DockPanel Grid.Row="2" Name="PART_ElemPublishers"
-                                                       VerticalAlignment="Top">
-                                                <Label Margin="0,4,10,0"
-                                                   FontWeight="Medium"
-                                                   Content="{DynamicResource LOCPublisherLabel}"
-                                                   Foreground="White" VerticalAlignment="Top"/>
-                                                <ItemsControl VerticalAlignment="Center" Name="PART_ItemsPublishers">
-                                                    <ItemsControl.ItemsPanel>
-                                                        <ItemsPanelTemplate>
-                                                            <WrapPanel Orientation="Horizontal" VerticalAlignment="Center"/>
-                                                        </ItemsPanelTemplate>
-                                                    </ItemsControl.ItemsPanel>
-                                                </ItemsControl>
-                                            </DockPanel>
-                                            <DockPanel Grid.Row="3" Name="PART_ElemPlatform"
-                                                       VerticalAlignment="Top">
-                                                <Label Margin="0,4,10,0"
-                                                   FontWeight="Medium"
-                                                   Content="{DynamicResource LOCGamePlatformTitle}"
-                                                   Foreground="White" VerticalAlignment="Top"/>
-                                                <ItemsControl VerticalAlignment="Center" Name="PART_ItemsPlatforms">
-                                                    <ItemsControl.ItemsPanel>
-                                                        <ItemsPanelTemplate>
-                                                            <WrapPanel Orientation="Horizontal" VerticalAlignment="Center"/>
-                                                        </ItemsPanelTemplate>
-                                                    </ItemsControl.ItemsPanel>
-                                                </ItemsControl>
-                                            </DockPanel>
-                                            <ScrollViewer Grid.Row="5" Height="110"
-                                                      VerticalScrollBarVisibility="Auto">
-                                                <HtmlTextView
-                                                    Name="PART_HtmlDescription"
-                                                    HtmlFontSize="{DynamicResource FontSize}"
-                                                    HtmlFontFamily="{DynamicResource FontFamily}"
-                                                    HtmlForeground="#afafaf"
-                                                    LinkForeground="{DynamicResource PropertyItemButtonTextColor}"                                      
-                                                    ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                                    ScrollViewer.VerticalScrollBarVisibility="Disabled"/>
-                                            </ScrollViewer>
                                             <ContentControl Grid.Row="6" x:Name="CheckLocalizations_PluginFlags" Height="30" Margin="0,10,0,0"
                                                             Visibility="{PluginSettings Plugin=CheckLocalizations, Path=EnableIntegrationFlags, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}"
                                                             HorizontalAlignment="Left" VerticalAlignment="Center"
@@ -343,7 +338,7 @@
                                                         <Setter Property="HorizontalContentAlignment" Value="Left"/>
                                                     </Style>
                                                 </WrapPanel.Resources>
-                                                <DockPanel Visibility="{Binding Visibility, ElementName=PART_ElemLibrary, Mode=OneWay}" Margin="0,0,15,0">
+                                                <DockPanel Visibility="{Binding Visibility, ElementName=PART_ElemLibrary, Mode=OneWay}" Margin="0,0,30,0">
                                                     <Viewbox Stretch="Uniform" Height="40">
                                                         <TextBlock Text="&#xE1D3;" Style="{DynamicResource Icon}" />
                                                     </Viewbox>
@@ -353,7 +348,7 @@
                                                     </StackPanel>
                                                 </DockPanel>
 
-                                                <DockPanel Visibility="{Binding Visibility, ElementName=PART_ElemCompletionStatus, Mode=OneWay}" Margin="0,0,15,0">
+                                                <DockPanel Visibility="{Binding Visibility, ElementName=PART_ElemCompletionStatus, Mode=OneWay}" Margin="0,0,30,0">
                                                     <Viewbox Stretch="Uniform" Height="40">
                                                         <TextBlock Text="&#xF16A;" Style="{DynamicResource Icon}" />
                                                     </Viewbox>
@@ -363,8 +358,8 @@
                                                     </StackPanel>
                                                 </DockPanel>
                                                 
-                                                <DockPanel Visibility="{Binding Visibility, ElementName=PART_ElemLastPlayed, Mode=OneWay}" Margin="0,0,15,0">
-                                                    <Viewbox Stretch="Uniform" Height="35">
+                                                <DockPanel Visibility="{Binding Visibility, ElementName=PART_ElemLastPlayed, Mode=OneWay}" Margin="0,0,30,0">
+                                                    <Viewbox Stretch="Uniform" Height="35" Margin="0,0,5,0">
                                                         <TextBlock Text="&#xE163;" Style="{DynamicResource Icon}" />
                                                     </Viewbox>
                                                     <StackPanel Margin="10,0,0,0" VerticalAlignment="Center">
@@ -372,7 +367,7 @@
                                                         <TextBlock Name="PART_TextLastActivity" MinWidth="85"/>
                                                     </StackPanel>
                                                 </DockPanel>
-                                                <DockPanel Visibility="{Binding Visibility, ElementName=PART_ElemPlayTime, Mode=OneWay}" Margin="0,0,15,0">
+                                                <DockPanel Visibility="{Binding Visibility, ElementName=PART_ElemPlayTime, Mode=OneWay}" Margin="0,0,30,0">
                                                     <Viewbox Stretch="Uniform" Height="35">
                                                         <TextBlock Text="&#xE121;" Style="{DynamicResource Icon}" />
                                                     </Viewbox>
@@ -382,7 +377,7 @@
                                                     </StackPanel>
                                                 </DockPanel>
  
-                                                <DockPanel Margin="0,0,15,0">
+                                                <DockPanel Margin="0,0,30,0">
                                                     <DockPanel.Style>
                                                         <Style TargetType="{x:Type DockPanel}">
                                                             <Setter Property="Visibility" Value="Collapsed" />
@@ -393,11 +388,11 @@
                                                             </Style.Triggers>
                                                         </Style>
                                                     </DockPanel.Style>
-                                                    <Viewbox Stretch="Uniform" Height="30">
+                                                    <Viewbox Stretch="Uniform" Height="30" Margin="0,0,-15,0">
                                                         <TextBlock Text="&#xE728;" Style="{DynamicResource Icon}" />
                                                     </Viewbox>
 
-                                                    <StackPanel Margin="15,0,0,0" VerticalAlignment="Center">
+                                                    <StackPanel Margin="30,0,0,0" VerticalAlignment="Center">
                                                         <Label Content="{DynamicResource LOCSuccessStoryAchievements}" Style="{DynamicResource LabelHeaderStyle}" />
                                                         <DockPanel>
                                                             <DockPanel MinWidth="40">
@@ -477,7 +472,7 @@
                                             Opacity="{DynamicResource PanelsNoiseBackgroundOpacity}"/>
 
                                     <TabControl Style="{DynamicResource TabControlDetailsView}" Margin="40,20,40,0"
-                                                Focusable="False">
+                                                Focusable="False" MaxWidth="{DynamicResource DetailsViewDetailsMaxWidth}">
                                         <TabControl.Resources>
                                             <Style x:Key="PanelLabel" TargetType="Label">
                                                 <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}" />
@@ -485,267 +480,297 @@
                                                 <Setter Property="FontWeight" Value="Medium" />
                                                 <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}" />
                                             </Style>
+                                            <Style TargetType="TabPanel">
+                                                <Setter Property="HorizontalAlignment" Value="Left"/>
+                                            </Style>
                                         </TabControl.Resources>
                                         <TabItem Header="{DynamicResource LOCSettingsGameDetailsLabel}">
-                                            <Grid Margin="0,32,0,0" MaxWidth="{DynamicResource DetailsViewDetailsMaxWidth}">
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="*" />
-                                                    <ColumnDefinition Width="32" />
-                                                    <ColumnDefinition Width="*" />
-                                                </Grid.ColumnDefinitions>
-                                                <StackPanel Grid.Column="0">
-                                                    <StackPanel.Resources>
-                                                        <Style TargetType="StackPanel">
-                                                            <Setter Property="Margin" Value="0,0,20,0" />
-                                                        </Style>
-                                                        <Style TargetType="Label">
-                                                            <Setter Property="Foreground" Value="{DynamicResource DetailsViewPanelTextForegroundBrush}" />
-                                                            <Setter Property="FontWeight" Value="Normal" />
-                                                            <Setter Property="HorizontalAlignment" Value="Left" />
-                                                            <Setter Property="Padding" Value="0" />
-                                                            <Setter Property="Margin" Value="0,3,0,0" />
-                                                        </Style>
-                                                    </StackPanel.Resources>
-                                                    <Border Style="{DynamicResource DetailsPanelRoundedBorder}">
-                                                        <Border.Resources>
-                                                            <Style TargetType="Button" BasedOn="{StaticResource PropertyItemButton}" />
-                                                        </Border.Resources>
-                                                        <WrapPanel>
-
-                                                            <StackPanel Name="PART_ElemSource">
-                                                                <Label Content="{DynamicResource LOCSourceLabel}" />
-                                                                <Button Name="PART_ButtonSource" />
-                                                            </StackPanel>
-
-                                                            <StackPanel Name="PART_ElemReleaseDate">
-                                                                <Label Content="{DynamicResource LOCGameReleaseDateTitle}" />
-                                                                <Button Name="PART_ButtonReleaseDate" />
-                                                            </StackPanel>
-
-                                                            <StackPanel Name="PART_ElemSeries">
-                                                                <Label Content="{DynamicResource LOCSeriesLabel}" />
-                                                                <ItemsControl Name="PART_ItemsSeries" />
-                                                            </StackPanel>
-
-                                                            <StackPanel Name="PART_ElemVersion">
-                                                                <Label Content="{DynamicResource LOCVersionLabel}" />
-                                                                <Button Name="PART_ButtonVersion" VerticalAlignment="Center" />
-                                                            </StackPanel>
-
-                                                            <StackPanel Name="PART_ElemCommunityScore">
-                                                                <Label Content="{DynamicResource LOCCommunityScore}" />
-                                                                <TextBlock Name="PART_TextCommunityScore" VerticalAlignment="Center" Style="{DynamicResource TextBlockGameScore}" />
-                                                            </StackPanel>
-
-                                                            <StackPanel Name="PART_ElemCriticScore">
-                                                                <Label Content="{DynamicResource LOCCriticScore}" />
-                                                                <TextBlock Name="PART_TextCriticScore" VerticalAlignment="Center" Style="{DynamicResource TextBlockGameScore}" />
-                                                            </StackPanel>
-
-                                                            <StackPanel Name="PART_ElemUserScore">
-                                                                <Label Content="{DynamicResource LOCUserScore}" />
-                                                                <TextBlock Name="PART_TextUserScore" VerticalAlignment="Center" Style="{DynamicResource TextBlockGameScore}" />
-                                                            </StackPanel>
-
-                                                            <StackPanel Name="PART_ElemAgeRating">
-                                                                <Label Content="{DynamicResource LOCAgeRatingLabel}" />
-                                                                <ItemsControl Name="PART_ItemsAgeRatings" />
-                                                            </StackPanel>
-
-                                                            <StackPanel Name="PART_ElemRegion">
-                                                                <Label Content="{DynamicResource LOCRegionLabel}" />
-                                                                <ItemsControl Name="PART_ItemsRegions" />
-                                                            </StackPanel>
-                                                        </WrapPanel>
-                                                    </Border>
-
-                                                    <Border Style="{DynamicResource DetailsPanelRoundedBorder}">
-                                                        <Border.Resources>
-                                                            <Style TargetType="Button" BasedOn="{StaticResource PropertyItemButton}" />
-                                                        </Border.Resources>
-                                                        <WrapPanel>
-                                                            <StackPanel Name="PART_ElemRecentActivity">
-                                                                <Label Content="{DynamicResource LOCRecentActivityLabel}" />
-                                                                <TextBlock Name="PART_TextRecentActivity" VerticalAlignment="Center" Style="{DynamicResource TextBlockGameScore}" />
-                                                            </StackPanel>
-
-                                                            <StackPanel Name="PART_ElemAdded">
-                                                                <Label Content="{DynamicResource LOCDateAddedLabel}" />
-                                                                <TextBlock Name="PART_TextAdded" VerticalAlignment="Center" Style="{DynamicResource TextBlockGameScore}" />
-                                                            </StackPanel>
 
-                                                            <StackPanel Name="PART_ElemInstallSize">
-                                                                <Label Content="{DynamicResource LOCInstallSizeLabel}" />
-                                                                <TextBlock Name="PART_TextInstallSize" VerticalAlignment="Center" Style="{DynamicResource TextBlockGameScore}" />
-                                                            </StackPanel>
+                                            <Grid Margin="0,32,0,0" MaxWidth="{DynamicResource DetailsViewDetailsMaxWidth}">
 
-                                                            <StackPanel Name="PART_ElemInstallDirectory">
-                                                                <Label Content="{DynamicResource LOCGameInstallDirTitle}" />
-                                                                <Button Name="PART_ButtonInstallDirectory" VerticalAlignment="Center" />
-                                                            </StackPanel>
+                                                <StackPanel>
 
-                                                        </WrapPanel>
-                                                    </Border>
+                                                    <Grid Margin="0,0,0,0" MaxWidth="{DynamicResource DetailsViewDetailsMaxWidth}">
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="*" />
+                                                            <ColumnDefinition Width="12" />
+                                                            <ColumnDefinition Width="*" />
+                                                        </Grid.ColumnDefinitions>
 
-                                                    <Border Style="{DynamicResource DetailsPanelRoundedBorder}">
-                                                        <Grid>
-                                                            <StackPanel>
-                                                                <StackPanel Name="PART_ElemCategories" Margin="0,0,0,20">
-                                                                    <Label FontSize="{DynamicResource FontSizeLarger}"
-                                                                           Foreground="{DynamicResource TextBrush}"
-                                                                           FontWeight="Medium"
-                                                                           Content="{DynamicResource LOCGameCategoriesTitle}" />
-                                                                    <Grid MinHeight="45">
-                                                                        <ItemsControl ItemsSource="{Binding Game.Categories}" Margin="0,0,0,3">
-                                                                            <ItemsControl.ItemsPanel>
-                                                                                <ItemsPanelTemplate>
-                                                                                    <WrapPanel Orientation="Horizontal" VerticalAlignment="Center"/>
-                                                                                </ItemsPanelTemplate>
-                                                                            </ItemsControl.ItemsPanel>
-                                                                            <ItemsControl.ItemTemplate>
-                                                                                <DataTemplate>
-                                                                                    <Button Content="{Binding Name}" Style="{StaticResource PropertyItemRoundedPanelButton}"
-                                                                                Command="{Binding RelativeSource={RelativeSource AncestorType=Grid}, Path=DataContext.SetCategoryFilterCommand}"
-                                                                                CommandParameter="{Binding}"/>
-                                                                                </DataTemplate>
-                                                                            </ItemsControl.ItemTemplate>
-                                                                        </ItemsControl>
-                                                                    </Grid>
-                                                                </StackPanel>
+                                                        <StackPanel Grid.Column="0">
+                                                            <StackPanel.Resources>
+                                                                <Style TargetType="StackPanel">
+                                                                    <Setter Property="Margin" Value="0,0,20,0" />
+                                                                </Style>
+                                                                <Style TargetType="Label">
+                                                                    <Setter Property="Foreground" Value="{DynamicResource DetailsViewPanelTextForegroundBrush}" />
+                                                                    <Setter Property="FontWeight" Value="Normal" />
+                                                                    <Setter Property="HorizontalAlignment" Value="Left" />
+                                                                    <Setter Property="Padding" Value="0" />
+                                                                    <Setter Property="Margin" Value="0,3,0,0" />
+                                                                </Style>
+                                                            </StackPanel.Resources>
 
-                                                                <StackPanel Name="PART_ElemGenres" Margin="0,0,0,20">
-                                                                    <Label FontSize="{DynamicResource FontSizeLarger}"
-                                                                           Foreground="{DynamicResource TextBrush}"
-                                                                           FontWeight="Medium"
-                                                                           Content="{DynamicResource LOCGenreLabel}" />
-                                                                    <Grid MinHeight="45">
-                                                                        <ItemsControl ItemsSource="{Binding Game.Genres}" Margin="0,0,0,3">
-                                                                            <ItemsControl.ItemsPanel>
-                                                                                <ItemsPanelTemplate>
-                                                                                    <WrapPanel Orientation="Horizontal" VerticalAlignment="Center"/>
-                                                                                </ItemsPanelTemplate>
-                                                                            </ItemsControl.ItemsPanel>
-                                                                            <ItemsControl.ItemTemplate>
-                                                                                <DataTemplate>
-                                                                                    <Button Content="{Binding Name}" Style="{StaticResource PropertyItemRoundedPanelButton}"
-                                                                                Command="{Binding RelativeSource={RelativeSource AncestorType=Grid}, Path=DataContext.SetGenreFilterCommand}"
-                                                                                CommandParameter="{Binding}"/>
-                                                                                </DataTemplate>
-                                                                            </ItemsControl.ItemTemplate>
-                                                                        </ItemsControl>
-                                                                    </Grid>
+                                                            <Border Style="{DynamicResource DetailsPanelRoundedBorder}">
+                                                                <Border.Resources>
+                                                                    <Style TargetType="Button" BasedOn="{StaticResource PropertyItemButton}" />
+                                                                </Border.Resources>
+                                                                <HtmlTextView
+                                                                            Padding="0"
+                                                                            Margin="0 10 0 -10"
+                                                                            Name="PART_HtmlDescription"
+                                                                            HtmlFontSize="{DynamicResource FontSize}"
+                                                                            HtmlFontFamily="{DynamicResource FontFamily}"
+                                                                            HtmlForeground="#afafaf"
+                                                                            LinkForeground="{DynamicResource PropertyItemButtonTextColor}"                                      
+                                                                            ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                                                            ScrollViewer.VerticalScrollBarVisibility="Disabled"/>
+                                                            </Border>
+
+                                                            <Border Style="{DynamicResource DetailsPanelRoundedBorder}">
+                                                                <Grid>
+                                                                    <StackPanel>
+                                                                        <StackPanel Name="PART_ElemCategories" Margin="0,0,0,20">
+                                                                            <Label FontSize="{DynamicResource FontSizeLarger}"
+                                                                               Foreground="{DynamicResource TextBrush}"
+                                                                               FontWeight="Medium"
+                                                                               Content="{DynamicResource LOCGameCategoriesTitle}" />
+                                                                            <Grid MinHeight="45">
+                                                                                <ItemsControl ItemsSource="{Binding Game.Categories}" Margin="0,0,0,3">
+                                                                                    <ItemsControl.ItemsPanel>
+                                                                                        <ItemsPanelTemplate>
+                                                                                            <WrapPanel Orientation="Horizontal" VerticalAlignment="Center"/>
+                                                                                        </ItemsPanelTemplate>
+                                                                                    </ItemsControl.ItemsPanel>
+                                                                                    <ItemsControl.ItemTemplate>
+                                                                                        <DataTemplate>
+                                                                                            <Button Content="{Binding Name}" Style="{StaticResource PropertyItemRoundedPanelButton}"
+                                                                                    Command="{Binding RelativeSource={RelativeSource AncestorType=Grid}, Path=DataContext.SetCategoryFilterCommand}"
+                                                                                    CommandParameter="{Binding}"/>
+                                                                                        </DataTemplate>
+                                                                                    </ItemsControl.ItemTemplate>
+                                                                                </ItemsControl>
+                                                                            </Grid>
+                                                                        </StackPanel>
+
+                                                                        <StackPanel Name="PART_ElemGenres" Margin="0,0,0,20">
+                                                                            <Label FontSize="{DynamicResource FontSizeLarger}"
+                                                                               Foreground="{DynamicResource TextBrush}"
+                                                                               FontWeight="Medium"
+                                                                               Content="{DynamicResource LOCGenreLabel}" />
+                                                                            <Grid MinHeight="45">
+                                                                                <ItemsControl ItemsSource="{Binding Game.Genres}" Margin="0,0,0,3">
+                                                                                    <ItemsControl.ItemsPanel>
+                                                                                        <ItemsPanelTemplate>
+                                                                                            <WrapPanel Orientation="Horizontal" VerticalAlignment="Center"/>
+                                                                                        </ItemsPanelTemplate>
+                                                                                    </ItemsControl.ItemsPanel>
+                                                                                    <ItemsControl.ItemTemplate>
+                                                                                        <DataTemplate>
+                                                                                            <Button Content="{Binding Name}" Style="{StaticResource PropertyItemRoundedPanelButton}"
+                                                                                    Command="{Binding RelativeSource={RelativeSource AncestorType=Grid}, Path=DataContext.SetGenreFilterCommand}"
+                                                                                    CommandParameter="{Binding}"/>
+                                                                                        </DataTemplate>
+                                                                                    </ItemsControl.ItemTemplate>
+                                                                                </ItemsControl>
+                                                                            </Grid>
+                                                                        </StackPanel>
+
+                                                                        <StackPanel Name="PART_ElemLinks" Margin="0,0,0,20">
+                                                                            <Label FontSize="{DynamicResource FontSizeLarger}"
+                                                                               Foreground="{DynamicResource TextBrush}"
+                                                                               FontWeight="Medium"
+                                                                               Content="{DynamicResource LOCLinksLabel}" />
+                                                                            <Grid MinHeight="45">
+                                                                                <ItemsControl ItemsSource="{Binding Game.Links}" Margin="0,0,0,3">
+                                                                                    <ItemsControl.ItemsPanel>
+                                                                                        <ItemsPanelTemplate>
+                                                                                            <WrapPanel Orientation="Horizontal" VerticalAlignment="Center"/>
+                                                                                        </ItemsPanelTemplate>
+                                                                                    </ItemsControl.ItemsPanel>
+                                                                                    <ItemsControl.ItemTemplate>
+                                                                                        <DataTemplate>
+                                                                                            <Button Content="{Binding Name}" Style="{StaticResource PropertyItemRoundedPanelButton}"
+                                                                                    Command="{Binding RelativeSource={RelativeSource AncestorType=Grid}, Path=DataContext.OpenLinkCommand}"
+                                                                                    CommandParameter="{Binding}"/>
+                                                                                        </DataTemplate>
+                                                                                    </ItemsControl.ItemTemplate>
+                                                                                </ItemsControl>
+                                                                            </Grid>
+                                                                        </StackPanel>
+                                                                    </StackPanel>
+                                                                </Grid>
+                                                            </Border>
+
+                                                            <Border Style="{DynamicResource DetailsPanelRoundedBorder}"
+                                                                Visibility="{PluginSettings Plugin=NewsViewer, Path=ReviewsAvailable, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                                <StackPanel Margin="0,15,0,0">
+                                                                    <Label Style="{DynamicResource PanelLabel}"
+                                                                       Content="{DynamicResource LOC_NewsViewer_NewsViewerControl_NewsLabel}" />
+                                                                    <ContentControl x:Name="NewsViewer_NewsViewerControl" Margin="0,5,0,5" FontWeight="Normal"/>
                                                                 </StackPanel>
+                                                            </Border>
 
-                                                                <StackPanel Name="PART_ElemLinks" Margin="0,0,0,20">
-                                                                    <Label FontSize="{DynamicResource FontSizeLarger}"
-                                                                           Foreground="{DynamicResource TextBrush}"
-                                                                           FontWeight="Medium"
-                                                                           Content="{DynamicResource LOCLinksLabel}" />
-                                                                    <Grid MinHeight="45">
-                                                                        <ItemsControl ItemsSource="{Binding Game.Links}" Margin="0,0,0,3">
-                                                                            <ItemsControl.ItemsPanel>
-                                                                                <ItemsPanelTemplate>
-                                                                                    <WrapPanel Orientation="Horizontal" VerticalAlignment="Center"/>
-                                                                                </ItemsPanelTemplate>
-                                                                            </ItemsControl.ItemsPanel>
-                                                                            <ItemsControl.ItemTemplate>
-                                                                                <DataTemplate>
-                                                                                    <Button Content="{Binding Name}" Style="{StaticResource PropertyItemRoundedPanelButton}"
-                                                                                Command="{Binding RelativeSource={RelativeSource AncestorType=Grid}, Path=DataContext.OpenLinkCommand}"
-                                                                                CommandParameter="{Binding}"/>
-                                                                                </DataTemplate>
-                                                                            </ItemsControl.ItemTemplate>
-                                                                        </ItemsControl>
-                                                                    </Grid>
-                                                                </StackPanel>
-                                                            </StackPanel>
-                                                        </Grid>
-                                                    </Border>
-
-                                                    <Border Style="{DynamicResource DetailsPanelRoundedBorder}"
-                                                            Visibility="{PluginSettings Plugin=NewsViewer, Path=ReviewsAvailable, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                                        <StackPanel Margin="0,15,0,0">
-                                                            <Label Style="{DynamicResource PanelLabel}"
-                                                                   Content="{DynamicResource LOC_NewsViewer_NewsViewerControl_NewsLabel}" />
-                                                            <ContentControl x:Name="NewsViewer_NewsViewerControl" Margin="0,5,0,5" FontWeight="Normal"/>
                                                         </StackPanel>
-                                                    </Border>
-                                                    
-                                                </StackPanel>
-
-                                                <StackPanel Grid.Column="2">
 
-                                                    <Border x:Name="VideoFeed" Visibility="{PluginSettings Plugin=ExtraMetadataLoader, Path=IsAnyVideoAvailable, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                                            Style="{DynamicResource DetailsPanelRoundedBorder}">
-                                                        <!-- ExtraMetadataLoader video player -->
-                                                        <Grid VerticalAlignment="Center">
-                                                            <!--Rectangle used to expand the panel while the video loads-->
-                                                            <Viewbox Stretch="Uniform" Visibility="{Binding ElementName=VideoFeed, Path=Visibility}">
-                                                                <Rectangle Width="16" Height="9" Fill="Transparent" IsHitTestVisible="False" />
-                                                            </Viewbox>
-                                                            <ContentControl x:Name="ExtraMetadataLoader_VideoLoaderControl" />
-                                                        </Grid>
-                                                    </Border>
-                                                    
-                                                    <Border Style="{DynamicResource DetailsPanelRoundedBorder}">
-                                                        <StackPanel>
-                                                            <StackPanel Name="PART_ElemFeatures">
-                                                                <Label Style="{DynamicResource PanelLabel}"
-                                                                       Content="{DynamicResource LOCFeaturesLabel}" />
-                                                                <Grid MinHeight="45">
-                                                                    <ItemsControl ItemsSource="{Binding Game.Features}" Margin="0,0,0,3">
-                                                                        <ItemsControl.ItemsPanel>
-                                                                            <ItemsPanelTemplate>
-                                                                                <WrapPanel Orientation="Horizontal" VerticalAlignment="Center"/>
-                                                                            </ItemsPanelTemplate>
-                                                                        </ItemsControl.ItemsPanel>
-                                                                        <ItemsControl.ItemTemplate>
-                                                                            <DataTemplate>
-                                                                                <Button Content="{Binding Name}" Style="{StaticResource PropertyItemRoundedPanelButton}"
-                                                                                Command="{Binding RelativeSource={RelativeSource AncestorType=Grid}, Path=DataContext.SetFeatureFilterCommand}"
-                                                                                CommandParameter="{Binding}"/>
-                                                                            </DataTemplate>
-                                                                        </ItemsControl.ItemTemplate>
-                                                                    </ItemsControl>
+                                                        <StackPanel Grid.Column="2">
+
+                                                            <Border Style="{DynamicResource DetailsPanelRoundedBorder}" Padding="0 10 0 10">
+                                                                <Border.Resources>
+                                                                    <Style TargetType="Button" BasedOn="{StaticResource PropertyItemButton}" />
+                                                                </Border.Resources>
+                                                                <WrapPanel>
+
+                                                                    <StackPanel Name="PART_ElemSource" Margin="20 10 20 10">
+                                                                        <Label Content="{DynamicResource LOCSourceLabel}" />
+                                                                        <Button Name="PART_ButtonSource" />
+                                                                    </StackPanel>
+
+                                                                    <StackPanel Name="PART_ElemReleaseDate" Margin="20 10 20 10">
+                                                                        <Label Content="{DynamicResource LOCGameReleaseDateTitle}" />
+                                                                        <Button Name="PART_ButtonReleaseDate" />
+                                                                    </StackPanel>
+
+                                                                    <StackPanel Name="PART_ElemSeries" Margin="20 10 20 10">
+                                                                        <Label Content="{DynamicResource LOCSeriesLabel}" />
+                                                                        <ItemsControl Name="PART_ItemsSeries" />
+                                                                    </StackPanel>
+
+                                                                    <StackPanel Name="PART_ElemVersion" Margin="20 10 20 10">
+                                                                        <Label Content="{DynamicResource LOCVersionLabel}" />
+                                                                        <Button Name="PART_ButtonVersion" VerticalAlignment="Center" />
+                                                                    </StackPanel>
+
+                                                                    <StackPanel Name="PART_ElemCommunityScore" Margin="20 10 20 10">
+                                                                        <Label Content="{DynamicResource LOCCommunityScore}" />
+                                                                        <TextBlock Margin="0 5 0 0" Name="PART_TextCommunityScore" VerticalAlignment="Center" Style="{DynamicResource TextBlockGameScore}" />
+                                                                    </StackPanel>
+
+                                                                    <StackPanel Name="PART_ElemCriticScore" Margin="20 10 20 10">
+                                                                        <Label Content="{DynamicResource LOCCriticScore}" />
+                                                                        <TextBlock Margin="0 5 0 0" Name="PART_TextCriticScore" VerticalAlignment="Center" Style="{DynamicResource TextBlockGameScore}" />
+                                                                    </StackPanel>
+
+                                                                    <StackPanel Name="PART_ElemUserScore" Margin="20 10 20 10">
+                                                                        <Label Content="{DynamicResource LOCUserScore}" />
+                                                                        <TextBlock Margin="0 5 0 0" Name="PART_TextUserScore" VerticalAlignment="Center" Style="{DynamicResource TextBlockGameScore}" />
+                                                                    </StackPanel>
+
+                                                                    <StackPanel Name="PART_ElemAgeRating" Margin="20 10 20 10">
+                                                                        <Label Content="{DynamicResource LOCAgeRatingLabel}" />
+                                                                        <ItemsControl Name="PART_ItemsAgeRatings" />
+                                                                    </StackPanel>
+
+                                                                    <StackPanel Name="PART_ElemRegion" Margin="20 10 20 10">
+                                                                        <Label Content="{DynamicResource LOCRegionLabel}" />
+                                                                        <ItemsControl Name="PART_ItemsRegions" />
+                                                                    </StackPanel>
+                                                                </WrapPanel>
+                                                            </Border>
+
+                                                            <Border Style="{DynamicResource DetailsPanelRoundedBorder}" Padding="0 10 0 10">
+                                                                <Border.Resources>
+                                                                    <Style TargetType="Button" BasedOn="{StaticResource PropertyItemButton}" />
+                                                                </Border.Resources>
+                                                                <WrapPanel>
+                                                                    <StackPanel Name="PART_ElemRecentActivity" Margin="20 10 20 10">
+                                                                        <Label Content="{DynamicResource LOCRecentActivityLabel}" />
+                                                                        <TextBlock Margin="0 5 0 0" Name="PART_TextRecentActivity" VerticalAlignment="Center" Style="{DynamicResource TextBlockGameScore}" />
+                                                                    </StackPanel>
+
+                                                                    <StackPanel Name="PART_ElemAdded" Margin="20 10 20 10">
+                                                                        <Label Content="{DynamicResource LOCDateAddedLabel}" />
+                                                                        <TextBlock Margin="0 5 0 0" Name="PART_TextAdded" VerticalAlignment="Center" Style="{DynamicResource TextBlockGameScore}" />
+                                                                    </StackPanel>
+
+                                                                    <StackPanel Name="PART_ElemInstallSize" Margin="20 10 20 10">
+                                                                        <Label Content="{DynamicResource LOCInstallSizeLabel}" />
+                                                                        <TextBlock Margin="0 5 0 0" Name="PART_TextInstallSize" VerticalAlignment="Center" Style="{DynamicResource TextBlockGameScore}" />
+                                                                    </StackPanel>
+
+                                                                    <StackPanel Name="PART_ElemInstallDirectory" Margin="20 10 20 10">
+                                                                        <Label Content="{DynamicResource LOCGameInstallDirTitle}" />
+                                                                        <Button Name="PART_ButtonInstallDirectory" VerticalAlignment="Center" />
+                                                                    </StackPanel>
+
+                                                                </WrapPanel>
+                                                            </Border>
+
+                                                            <!-- <Border x:Name="VideoFeed" Visibility="{PluginSettings Plugin=ExtraMetadataLoader, Path=IsAnyVideoAvailable, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                                                Style="{DynamicResource DetailsPanelRoundedBorder}">-->
+                                                                <!-- ExtraMetadataLoader video player -->
+                                                                <!--<Grid VerticalAlignment="Center">-->
+                                                                    <!--Rectangle used to expand the panel while the video loads-->
+                                                                    <!--<Viewbox Stretch="Uniform" Visibility="{Binding ElementName=VideoFeed, Path=Visibility}">
+                                                                        <Rectangle Width="16" Height="9" Fill="Transparent" IsHitTestVisible="False" />
+                                                                    </Viewbox>
+                                                                    <ContentControl x:Name="ExtraMetadataLoader_VideoLoaderControl" />
                                                                 </Grid>
-                                                            </StackPanel>
-
-                                                            <StackPanel Name="PART_ElemTags">
-                                                                <Label Style="{DynamicResource PanelLabel}"
-                                                                       Content="{DynamicResource LOCTagsLabel}" />
-                                                                <Grid Margin="0,0,0,10" MinHeight="45">
-                                                                    <ItemsControl ItemsSource="{Binding Game.Tags}" Margin="0,0,0,3">
-                                                                        <ItemsControl.ItemsPanel>
-                                                                            <ItemsPanelTemplate>
-                                                                                <WrapPanel Orientation="Horizontal" VerticalAlignment="Center"/>
-                                                                            </ItemsPanelTemplate>
-                                                                        </ItemsControl.ItemsPanel>
-                                                                        <ItemsControl.ItemTemplate>
-                                                                            <DataTemplate>
-                                                                                <Button Content="{Binding Name}" Style="{StaticResource PropertyItemRoundedPanelButton}"
-                                                                                Command="{Binding RelativeSource={RelativeSource AncestorType=Grid}, Path=DataContext.SetTagFilterCommand}"
-                                                                                CommandParameter="{Binding}"/>
-                                                                            </DataTemplate>
-                                                                        </ItemsControl.ItemTemplate>
-                                                                    </ItemsControl>
-                                                                </Grid>
-                                                            </StackPanel>
-                                                        </StackPanel>
-                                                    </Border>
+                                                            </Border> -->
+
+                                                            <Border Style="{DynamicResource DetailsPanelRoundedBorder}">
+                                                                <StackPanel>
+                                                                    <StackPanel Name="PART_ElemFeatures" Margin="0,0,0,20">
+                                                                        <Label Style="{DynamicResource PanelLabel}"
+                                                                           Content="{DynamicResource LOCFeaturesLabel}" />
+                                                                        <Grid MinHeight="45">
+                                                                            <ItemsControl ItemsSource="{Binding Game.Features}" Margin="0,0,0,3">
+                                                                                <ItemsControl.ItemsPanel>
+                                                                                    <ItemsPanelTemplate>
+                                                                                        <WrapPanel Orientation="Horizontal" VerticalAlignment="Center"/>
+                                                                                    </ItemsPanelTemplate>
+                                                                                </ItemsControl.ItemsPanel>
+                                                                                <ItemsControl.ItemTemplate>
+                                                                                    <DataTemplate>
+                                                                                        <Button Content="{Binding Name}" Style="{StaticResource PropertyItemRoundedPanelButton}"
+                                                                                    Command="{Binding RelativeSource={RelativeSource AncestorType=Grid}, Path=DataContext.SetFeatureFilterCommand}"
+                                                                                    CommandParameter="{Binding}"/>
+                                                                                    </DataTemplate>
+                                                                                </ItemsControl.ItemTemplate>
+                                                                            </ItemsControl>
+                                                                        </Grid>
+                                                                    </StackPanel>
+
+                                                                    <StackPanel Name="PART_ElemTags">
+                                                                        <Label Style="{DynamicResource PanelLabel}"
+                                                                           Content="{DynamicResource LOCTagsLabel}" />
+                                                                        <Grid Margin="0,0,0,10" MinHeight="45">
+                                                                            <ItemsControl ItemsSource="{Binding Game.Tags}" Margin="0,0,0,3">
+                                                                                <ItemsControl.ItemsPanel>
+                                                                                    <ItemsPanelTemplate>
+                                                                                        <WrapPanel Orientation="Horizontal" VerticalAlignment="Center"/>
+                                                                                    </ItemsPanelTemplate>
+                                                                                </ItemsControl.ItemsPanel>
+                                                                                <ItemsControl.ItemTemplate>
+                                                                                    <DataTemplate>
+                                                                                        <Button Content="{Binding Name}" Style="{StaticResource PropertyItemRoundedPanelButton}"
+                                                                                    Command="{Binding RelativeSource={RelativeSource AncestorType=Grid}, Path=DataContext.SetTagFilterCommand}"
+                                                                                    CommandParameter="{Binding}"/>
+                                                                                    </DataTemplate>
+                                                                                </ItemsControl.ItemTemplate>
+                                                                            </ItemsControl>
+                                                                        </Grid>
+                                                                    </StackPanel>
+                                                                </StackPanel>
+                                                            </Border>
+
+                                                            <Border Style="{DynamicResource DetailsPanelRoundedBorder}"
+                                                                        Visibility="{PluginSettings Plugin=ReviewViewer, Path=IsControlVisible, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                                <StackPanel>
+                                                                    <Label Style="{DynamicResource PanelLabel}"
+                                                                       Content="{DynamicResource LOCReview_Viewer_ReviewsLabel}" />
+                                                                    <ContentControl x:Name="ReviewViewer_ReviewsControl" Margin="0,5,0,5" FontWeight="Normal"/>
+                                                                </StackPanel>
+                                                            </Border>
 
-                                                    <Border Style="{DynamicResource DetailsPanelRoundedBorder}"
-                                                                    Visibility="{PluginSettings Plugin=ReviewViewer, Path=IsControlVisible, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                                        <StackPanel>
-                                                            <Label Style="{DynamicResource PanelLabel}"
-                                                                   Content="{DynamicResource LOCReview_Viewer_ReviewsLabel}" />
-                                                            <ContentControl x:Name="ReviewViewer_ReviewsControl" Margin="0,5,0,5" FontWeight="Normal"/>
                                                         </StackPanel>
-                                                    </Border>
-
+                                                    </Grid>
                                                 </StackPanel>
                                             </Grid>
+
+
                                         </TabItem>
-                                        <TabItem Header="{DynamicResource LOCMenuAddons}">
+                                        <TabItem Header="Add-ons">
  
                                             <Grid Margin="0,32,0,0" MaxWidth="{DynamicResource DetailsViewDetailsMaxWidth}">
                                                 <Grid.ColumnDefinitions>
@@ -754,8 +779,8 @@
                                                     <ColumnDefinition Width="*" />
                                                 </Grid.ColumnDefinitions>
                                                 <StackPanel Grid.Column="0">
-
-                                                    <Border>
+                                                
+                                                 <Border>
                                                         <Border.Style>
                                                             <Style TargetType="Border">
                                                                 <Setter Property="Visibility" Value="Collapsed" />
@@ -788,6 +813,36 @@
                                                         </Border>
                                                     </Border>
                                                     
+                                                    <Border Style="{DynamicResource DetailsPanelRoundedBorder}"
+                                                            Visibility="{PluginSettings Plugin=GameActivity, Path=HasData, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                        <StackPanel>
+                                                            <Label Style="{DynamicResource PanelLabel}"
+                                                                   Content="{DynamicResource LOCGameActivityTitle}" />
+                                                            <ContentControl x:Name="GameActivity_PluginChartTime" Margin="0,10,0,0" />
+                                                        </StackPanel>
+                                                    </Border>
+
+                                                    <Border Style="{DynamicResource DetailsPanelRoundedBorder}"
+                                                            Visibility="{PluginSettings Plugin=CheckDlc, Path=HasData, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                        <StackPanel>
+                                                            <StackPanel.Resources>
+                                                                <Style TargetType="ListBox">
+                                                                    <Setter Property="Background" Value="Transparent" />
+                                                                    <Setter Property="BorderThickness" Value="0" />
+                                                                </Style>
+                                                            </StackPanel.Resources>
+                                                            <Label Style="{DynamicResource PanelLabel}"
+                                                                   Content="DLC" />
+                                                            <ContentControl x:Name="CheckDlc_PluginListDlcAll" Height="700" Margin="0,5,0,5"/>
+                                                            <ContentControl x:Name="CheckDlc_PluginListDlcOwned" Height="700" Margin="0,5,0,5"/>
+                                                            <ContentControl x:Name="CheckDlc_PluginListDlcNotOwned" Height="700" Margin="0,5,0,5"/>
+                                                        </StackPanel>
+                                                    </Border>
+
+                                                </StackPanel>
+
+                                                <StackPanel Grid.Column="2">
+                                                
                                                     <Border Style="{DynamicResource DetailsPanelRoundedBorder}"
                                                             Visibility="{PluginSettings Plugin=SuccessStory, Path=HasData, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}">
                                                         <StackPanel>
@@ -802,10 +857,6 @@
                                                         </StackPanel>
                                                     </Border>
 
-                                                </StackPanel>
-
-                                                <StackPanel Grid.Column="2">
-
                                                     <Border Style="{DynamicResource DetailsPanelRoundedBorder}"
                                                             Visibility="{PluginSettings Plugin=HowLongToBeat, Path=HasData, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}">
                                                         <StackPanel>
@@ -857,32 +908,7 @@
                                                         </StackPanel>
                                                     </Border>
 
-                                                    
-                                                    <Border Style="{DynamicResource DetailsPanelRoundedBorder}"
-                                                            Visibility="{PluginSettings Plugin=GameActivity, Path=HasData, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                                        <StackPanel>
-                                                            <Label Style="{DynamicResource PanelLabel}"
-                                                                   Content="{DynamicResource LOCGameActivityTitle}" />
-                                                            <ContentControl x:Name="GameActivity_PluginChartTime" Margin="0,10,0,0" />
-                                                        </StackPanel>
-                                                    </Border>
-
-                                                    <Border Style="{DynamicResource DetailsPanelRoundedBorder}"
-                                                            Visibility="{PluginSettings Plugin=CheckDlc, Path=HasData, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                                        <StackPanel>
-                                                            <StackPanel.Resources>
-                                                                <Style TargetType="ListBox">
-                                                                    <Setter Property="Background" Value="Transparent" />
-                                                                    <Setter Property="BorderThickness" Value="0" />
-                                                                </Style>
-                                                            </StackPanel.Resources>
-                                                            <Label Style="{DynamicResource PanelLabel}"
-                                                                   Content="DLC" />
-                                                            <ContentControl x:Name="CheckDlc_PluginListDlcAll" Height="700" Margin="0,5,0,5"/>
-                                                            <ContentControl x:Name="CheckDlc_PluginListDlcOwned" Height="700" Margin="0,5,0,5"/>
-                                                            <ContentControl x:Name="CheckDlc_PluginListDlcNotOwned" Height="700" Margin="0,5,0,5"/>
-                                                        </StackPanel>
-                                                    </Border>
+                                                   
 
                                                     <Border Style="{DynamicResource DetailsPanelRoundedBorder}"
                                                             Visibility="{PluginSettings Plugin=ScreenshotsVisualizer, Path=HasData, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}">
diff --git a/source/Views/FilterPanelView.xaml b/source/Views/FilterPanelView.xaml
index d4c4f8b..788f51e 100644
--- a/source/Views/FilterPanelView.xaml
+++ b/source/Views/FilterPanelView.xaml
@@ -72,7 +72,7 @@
                             <Border Background="{DynamicResource NoiseBrush}"
                                     Opacity="{DynamicResource PanelsNoiseBackgroundOpacity}"/>
                             <DockPanel Background="{TemplateBinding Background}" Margin="{DynamicResource PanelTopPanelSeparator}">
-                                <DockPanel Margin="10,10,6,0" DockPanel.Dock="Top">
+                                <DockPanel Margin="10,0,6,0" DockPanel.Dock="Top">
                                     <Button Content="&#xE8BB;" FontFamily="Segoe MDL2 Assets"
                                             DockPanel.Dock="Right" Margin="0,0,5,0"
                                             Name="PART_ButtonClose"/>
diff --git a/source/Views/GridViewGameOverview.xaml b/source/Views/GridViewGameOverview.xaml
index 1064e14..40dd657 100644
--- a/source/Views/GridViewGameOverview.xaml
+++ b/source/Views/GridViewGameOverview.xaml
@@ -378,7 +378,7 @@
                                         </Expander>
                                         
                                         <!--#region ExtraMetadataLoader Video Control-->
-                                        <TextBlock x:Name="VideoFeedVisibilityProxy"
+                                        <!-- <TextBlock x:Name="VideoFeedVisibilityProxy"
                                                    Grid.Row="{DynamicResource GridViewSectionOrderVideo}">
                                             <TextBlock.Style>
                                                 <Style TargetType="TextBlock">
@@ -406,15 +406,15 @@
                                             </Expander.Header>
                                             <StackPanel Margin="0,0,0,25">
                                                 <Separator Background="{DynamicResource GridViewSeparatorBrush}" Margin="0,5,0,5"/>
-                                                <Grid>
+                                                <Grid>-->
                                                     <!--Rectangle used to expand the panel while the video loads-->
-                                                    <Viewbox Stretch="Uniform" Visibility="{Binding ElementName=VideoFeed, Path=Visibility}">
+                                                    <!--<Viewbox Stretch="Uniform" Visibility="{Binding ElementName=VideoFeed, Path=Visibility}">
                                                         <Rectangle Width="16" Height="9" Fill="Transparent" IsHitTestVisible="False" />
                                                     </Viewbox>
                                                     <ContentControl x:Name="ExtraMetadataLoader_VideoLoaderControl" />
                                                 </Grid>
                                             </StackPanel>
-                                        </Expander>
+                                        </Expander> -->
                                         <!--#endregion -->
 
                                         <Border Grid.Row="{DynamicResource GridViewSectionOrderNotes}">
diff --git a/source/Views/TopPanel.xaml b/source/Views/TopPanel.xaml
index 650dc26..e45213b 100644
--- a/source/Views/TopPanel.xaml
+++ b/source/Views/TopPanel.xaml
@@ -100,7 +100,7 @@
         <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="True" />
         <Setter Property="Background" Value="{DynamicResource TopPanelFilterToggleBackgroundBrush}" />
         <Setter Property="Focusable" Value="False" />
-        <Setter Property="Margin" Value="10,6,0,6" />
+        <Setter Property="Margin" Value="6,6,0,6" />
         <Setter Property="Foreground" Value="{DynamicResource TopPanelItemForegroundBrush}" />
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="FontWeight" Value="Normal" />
@@ -108,8 +108,8 @@
             <Setter.Value>
                 <ControlTemplate>
                     <Border Background="{TemplateBinding Background}" BorderThickness="0"
-                            CornerRadius="3">
-                        <StackPanel Orientation="Horizontal" Margin="6,0,6,0">
+                            CornerRadius="0">
+                        <StackPanel Orientation="Horizontal" Margin="7,0,6,0">
                             <TextBlock Text="&#xE16E;" FontFamily="Segoe MDL2 Assets" FontSize="20"
                                        Foreground="{TemplateBinding Foreground}"
                                        VerticalAlignment="Center" HorizontalAlignment="Center"/>
@@ -186,11 +186,10 @@
                             d:DataContext="{x:Static DesignMainViewModel.DesignIntance}">
                             <Grid>
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
                                     <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
-                                <DockPanel Grid.Column="0">
+                                <DockPanel Grid.Column="0" DockPanel.Dock="Left" Margin="15,0,0,0">
                                     <Border x:Name="PART_ElemMainMenu" Background="Transparent" Padding="5,2,5,8"
                                             DockPanel.Dock="Left" Width="40" Height="40" Margin="6,2,1,2" Cursor="Hand"
                                             WindowChrome.IsHitTestVisibleInChrome="True">
@@ -199,6 +198,31 @@
                                     </Border>
                                     <DockPanel LastChildFill="True" DockPanel.Dock="Left"
                                                HorizontalAlignment="Center" Margin="0,5,0,5">
+                                        <CheckBox x:Name="PART_ToggleNotifications"
+                                                Style="{DynamicResource TopPanelNotificationsToggle}"
+                                                DockPanel.Dock="Right" />
+
+                                        <StackPanel x:Name="PART_PanelMainPluginItems" Orientation="Horizontal"
+                                                    VerticalAlignment="Stretch" Margin="15,6,15,6"
+                                                    DockPanel.Dock="{Settings PluginTopPanelAlignment}"/>
+                                        <StackPanel x:Name="PART_PanelMainItems" Orientation="Horizontal"
+                                                    VerticalAlignment="Stretch" Margin="0,6,2,6"/>
+
+                                        <!-- <SearchBox x:Name="PART_TextMainSearch"
+                                                Margin="5,6,0,6" DockPanel.Dock="Left"
+                                                FontWeight="SemiBold"
+                                                WindowChrome.IsHitTestVisibleInChrome="True"
+                                                Style="{DynamicResource SearchBoxTopPanel}"
+                                                Width="120" Background="{DynamicResource TopPanelSearchBoxBackgroundBrush}"/> -->
+
+                                        <CheckBox x:Name="PART_ToggleFilter" ToolTip="{DynamicResource LOCFilters}"
+                                                Style="{DynamicResource TopPanelFilterToggle}"
+                                                DockPanel.Dock="Left" />
+                                    </DockPanel>
+                                </DockPanel>
+                                <DockPanel Grid.Column="1" Margin="0,3,0,3" DockPanel.Dock="Left">
+                                    <DockPanel LastChildFill="True" DockPanel.Dock="Left"
+                                               HorizontalAlignment="Center" Margin="30,5,0,5">
                                         <Button Name="PART_ButtonProgressCancel" DockPanel.Dock="Right"
                                                 Content="{DynamicResource LOCCancelLabel}"
                                                 WindowChrome.IsHitTestVisibleInChrome="True"
@@ -207,32 +231,10 @@
                                             <ProgressBar Name="PART_ProgressGlobal" />
                                             <TextBlock Name="PART_TextProgressText"
                                                VerticalAlignment="Center" HorizontalAlignment="Center"
-                                               Style="{DynamicResource BaseTextBlockStyle}" Margin="5,0,5,0" />
+                                               Style="{DynamicResource BaseTextBlockStyle}" Margin="5,0,5,0" MinWidth="250" TextAlignment="Center" />
                                         </Grid>
                                     </DockPanel>
                                 </DockPanel>
-                                <DockPanel Grid.Column="1" Margin="0,3,0,3">
-                                    <CheckBox x:Name="PART_ToggleNotifications"
-                                              Style="{DynamicResource TopPanelNotificationsToggle}"
-                                              DockPanel.Dock="Right" />
-
-                                    <StackPanel x:Name="PART_PanelMainPluginItems" Orientation="Horizontal"
-                                                VerticalAlignment="Stretch" Margin="15,6,15,6"
-                                                DockPanel.Dock="{Settings PluginTopPanelAlignment}"/>
-                                    <StackPanel x:Name="PART_PanelMainItems" Orientation="Horizontal"
-                                                VerticalAlignment="Stretch" Margin="0,6,0,6"/>
-
-                                    <SearchBox x:Name="PART_TextMainSearch"
-                                               Margin="5,6,0,6" DockPanel.Dock="Left"
-                                               FontWeight="SemiBold"
-                                               WindowChrome.IsHitTestVisibleInChrome="True"
-                                               Style="{DynamicResource SearchBoxTopPanel}"
-                                               Width="120" Background="{DynamicResource TopPanelSearchBoxBackgroundBrush}"/>
-
-                                    <CheckBox x:Name="PART_ToggleFilter" ToolTip="{DynamicResource LOCFilters}"
-                                              Style="{DynamicResource TopPanelFilterToggle}"
-                                              DockPanel.Dock="Left" />
-                                </DockPanel>
                             </Grid>
                         </Border>
                     </StackPanel>
diff --git a/source/theme.yaml b/source/theme.yaml
index 7cc2825..59a9a24 100644
--- a/source/theme.yaml
+++ b/source/theme.yaml
@@ -1,6 +1,6 @@
 ThemeApiVersion: 2.5.0
-Id: Nova_X_0a95b7a3-00e4-412d-b301-f2fa3f98dfad
-Name: Nova X
+Id: NovaZ
+Name: NovaZ
 Author: darklinkpower
 Version: 1.7
 Links: