diff --git a/Constants.xaml b/Constants.xaml
index d0c45d5..18002fd 100644
--- a/Constants.xaml
+++ b/Constants.xaml
@@ -43,7 +43,7 @@
     <SolidColorBrush x:Key="TooltipBackgroundBrush" Color="{DynamicResource BackgroundToneColor}" />
     <SolidColorBrush x:Key="ButtonBackgroundBrush" Color="{DynamicResource ButtonBackgroundColor}"/>
     <SolidColorBrush x:Key="GridItemBackgroundBrush" Color="{DynamicResource GridItemBackgroundColor}" Opacity="0.7 "/>
-    <SolidColorBrush x:Key="PanelSeparatorBrush" Color="{DynamicResource PanelSeparatorColor}" Opacity="0.7"/>
+    <SolidColorBrush x:Key="PanelSeparatorBrush" Color="{DynamicResource PanelSeparatorColor}" Opacity="1"/>
     <SolidColorBrush x:Key="PopupBackgroundBrush" Color="{DynamicResource PopupBackgroundColor}" />
 
     <SolidColorBrush x:Key="PositiveRatingBrush" Color="#78ffa0" />
@@ -71,12 +71,13 @@
     <sys:Boolean x:Key="UseAbsoluteExtraMetadataPath">false</sys:Boolean>
     <sys:String x:Key="ExtraMetadataPath">..\..\..\..</sys:String>
     <sys:String x:Key="AboutGameText">About the Game</sys:String>
+    <sys:Boolean x:Key="BGModeOn">false</sys:Boolean>
     
     <sys:Double x:Key="ControlCornerRadiusDouble">0</sys:Double>
     <sys:Double x:Key="GroupSeparatorOpacity">1</sys:Double>
-    <FontFamily x:Key="SymbolFont">segoeuisym.ttf#Segoe UI Symbol</FontFamily>
+    <FontFamily x:Key="SymbolFont">seguisym.ttf#Segoe UI Symbol</FontFamily>
     <Visibility x:Key="TitleTextVisibility">Visible</Visibility>
-    <sys:Double x:Key="DetailsViewPanelWidth">1080</sys:Double>
+    <sys:Double x:Key="DetailsViewPanelWidth">1280</sys:Double>
     
     <!-- Magpie-Specific Colors -->
     <Color x:Key="ButtonBackgroundColor">#2b2b2b</Color>
@@ -84,6 +85,7 @@
     <Color x:Key="ContextButtonColor">#385DA2</Color>
     <Color x:Key="ContextButtonHighlightColor">#5C63BB</Color>
     <Color x:Key="ClearFilterButtonColor">#e34141</Color>
+    <Color x:Key="PopupBackgroundTransparent">#00121212</Color>
 
     <SolidColorBrush x:Key="CoverHighlightBrush" Color="#20FFFFFF" />
 
diff --git a/DerivedStyles/PlayButton.xaml b/DerivedStyles/PlayButton.xaml
index 299cd14..3198698 100644
--- a/DerivedStyles/PlayButton.xaml
+++ b/DerivedStyles/PlayButton.xaml
@@ -7,6 +7,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource PlayBorderBrush}" />
         <Setter Property="BorderThickness" Value="{DynamicResource ControlBorderThickness}" />
         <Setter Property="Padding" Value="10,5,10,5" />
+        <Setter Property="VerticalAlignment" Value="Stretch"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
diff --git a/Views/DetailsViewGameOverview.xaml b/Views/DetailsViewGameOverview.xaml
index 83e3769..52c2fc9 100644
--- a/Views/DetailsViewGameOverview.xaml
+++ b/Views/DetailsViewGameOverview.xaml
@@ -7,9 +7,11 @@
     <Style x:Key="ContextButton" TargetType="{x:Type Button}" BasedOn="{StaticResource BaseStyle}">
         <Setter Property="Background" Value="{DynamicResource PlayButtonBrush}" />
         <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="FontWeight" Value="SemiBold"/>
         <Setter Property="BorderBrush" Value="{DynamicResource PlayBorderBrush}" />
         <Setter Property="BorderThickness" Value="{DynamicResource ControlBorderThickness}" />
         <Setter Property="Padding" Value="10,5,10,5" />
+        <Setter Property="VerticalAlignment" Value="Stretch"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
@@ -51,6 +53,32 @@
         </Setter>
     </Style>
 
+    <Style x:Key="ExtraMetadataLogoLeftPath" TargetType="TextBlock">
+        <Setter Property="Text">
+            <Setter.Value>
+                <MultiBinding StringFormat="{}{0}{1}{2}{3}">
+                    <Binding RelativeSource="{RelativeSource Self}" Path="Tag" />
+                    <Binding Source="\ExtraMetadata\games\"/>
+                    <Binding Path="Game.Id"/>
+                    <Binding Source="\logo-l.png" />
+                </MultiBinding>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="ExtraMetadataLogoRightPath" TargetType="TextBlock">
+        <Setter Property="Text">
+            <Setter.Value>
+                <MultiBinding StringFormat="{}{0}{1}{2}{3}">
+                    <Binding RelativeSource="{RelativeSource Self}" Path="Tag" />
+                    <Binding Source="\ExtraMetadata\games\"/>
+                    <Binding Path="Game.Id"/>
+                    <Binding Source="\logo-r.png" />
+                </MultiBinding>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <Style x:Key="ExtraMetadataHeaderPath" TargetType="TextBlock">
         <Setter Property="Text">
             <Setter.Value>
@@ -71,59 +99,161 @@
                     <Grid d:DesignWidth="1520" d:DesignHeight="1080"
                         d:DataContext="{x:Static DesignMainViewModel.DesignSelectedGameDetailsIntance}"
                           HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="{Settings CalculatedGameDetailsIndentation}"/>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="*"/>
-                        </Grid.RowDefinitions>
 
                         <TextBlock Name="LogoPath" Style="{DynamicResource ExtraMetadataLogoPath}"
                                    Visibility="Collapsed" Tag="{DynamicResource ExtraMetadataPath}"/>
-                        <TextBlock Name="HeaderPath" Style="{DynamicResource ExtraMetaHeaderPath}" 
+                        <TextBlock Name="LogoLeftPath" Style="{DynamicResource ExtraMetadataLogoLeftPath}"
+                                   Visibility="Collapsed" Tag="{DynamicResource ExtraMetadataPath}"/>
+                        <TextBlock Name="LogoRightPath" Style="{DynamicResource ExtraMetadataLogoRightPath}"
+                                   Visibility="Collapsed" Tag="{DynamicResource ExtraMetadataPath}"/>
+                        <TextBlock Name="HeaderPath" Style="{DynamicResource ExtraMetadataHeaderPath}" 
                                    Visibility="Collapsed"  Tag="{DynamicResource ExtraMetadataPath}"/>
 
-                        <ScrollViewer Grid.RowSpan="3" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
-                            <FadeImage x:Name="PART_ImageBackground" Stretch="Uniform"
-                                   Grid.RowSpan="3" HorizontalAlignment="Center" VerticalAlignment="Top">
-                                <FadeImage.ImageOpacityMask>
-                                    <RadialGradientBrush GradientOrigin="0.5,0" Center="0.5,0" RadiusX="2" RadiusY="0.9">
-                                        <RadialGradientBrush.GradientStops>
-                                            <GradientStop Color="Black" Offset="0.3" />
-                                            <GradientStop Color="Transparent" Offset="1" />
-                                        </RadialGradientBrush.GradientStops>
-                                    </RadialGradientBrush>
-                                </FadeImage.ImageOpacityMask>
-                            </FadeImage>
-                        </ScrollViewer>
-                        <Grid Grid.Row="0" Grid.Column="1" VerticalAlignment="Stretch"
-                                    HorizontalAlignment="Stretch" Margin="0"
-                                    MaxWidth="1280" >
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="1*" />
-                                <ColumnDefinition Width="4*" />
-                                <ColumnDefinition Width="1*" />
-                            </Grid.ColumnDefinitions>
+                        <Grid>
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="1*" />
-                                <RowDefinition Height="4*" />
-                                <RowDefinition Height="1*" />
+                                <RowDefinition Tag="{Settings CalculatedGameDetailsIndentation}">
+                                    <RowDefinition.Style>
+                                        <Style TargetType="RowDefinition">
+                                            <Setter Property="MaxHeight" Value="{Binding RelativeSource={RelativeSource Self}, Path=Tag}"/>
+                                            <Setter Property="MinHeight" Value="{Binding RelativeSource={RelativeSource Self}, Path=Tag}"/>
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Settings IndentGameDetails}" Value="false">
+                                                    <Setter Property="MaxHeight" Value="0"/>
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </RowDefinition.Style>
+                                </RowDefinition>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="*"/>
                             </Grid.RowDefinitions>
-                            <Image Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center"
-                                   VerticalAlignment="Center" Stretch="Uniform"
-                                   Name="LogoImage" RenderOptions.BitmapScalingMode="Fant"
-                                   Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
-                                <Image.Style>
-                                    <Style TargetType="Image">
-                                        <Setter Property="Source" Value="{Binding ElementName=LogoPath, Path=Text}"/>
+                            <ScrollViewer Tag="{DynamicResource BGModeOn}" VerticalScrollBarVisibility="Hidden"
+                                          HorizontalScrollBarVisibility="Disabled" IsHitTestVisible="False">
+                                <FadeImage x:Name="PART_ImageBackground" Tag="{DynamicResource BGModeOn}"
+                                       Grid.Row="0" Grid.ColumnSpan="3" HorizontalAlignment="Center">
+                                    <FadeImage.Resources>
+                                        <Style TargetType="Image">
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Settings IndentGameDetails}" Value="false">
+                                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </FadeImage.Resources>
+                                    <FadeImage.Style>
+                                        <Style TargetType="FadeImage">
+                                            <Setter Property="Grid.RowSpan" Value="2"/>
+                                            <Setter Property="Stretch" Value="UniformToFill"/>
+                                            <Setter Property="VerticalAlignment" Value="Stretch"/>
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
+                                                    <Setter Property="Stretch" Value="Uniform"/>
+                                                    <Setter Property="VerticalAlignment" Value="Top"/>
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </FadeImage.Style>
+                                </FadeImage>
+                                <ScrollViewer.Style>
+                                    <Style TargetType="ScrollViewer">
+                                        <Setter Property="Grid.RowSpan" Value="2"/>
+                                        <Setter Property="VerticalScrollBarVisibility" Value="Disabled"/>
+                                        <Setter Property="OpacityMask">
+                                            <Setter.Value>
+                                                <LinearGradientBrush StartPoint="0,0.9" EndPoint="0,1">
+                                                    <GradientStop Offset="0" Color="{DynamicResource PopupBackgroundColor}"/>
+                                                    <GradientStop Offset="1" Color="{DynamicResource PopupBackgroundTransparent}" />
+                                                </LinearGradientBrush>
+                                            </Setter.Value>
+                                        </Setter>
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
+                                                <Setter Property="Grid.RowSpan" Value="3"/>
+                                                <Setter Property="OpacityMask">
+                                                    <Setter.Value>
+                                                        <RadialGradientBrush GradientOrigin="0.5,0" Center="0.5,0" RadiusX="2" RadiusY="0.9">
+                                                            <RadialGradientBrush.GradientStops>
+                                                                <GradientStop Color="Black" Offset="0.3" />
+                                                                <GradientStop Color="Transparent" Offset="1" />
+                                                            </RadialGradientBrush.GradientStops>
+                                                        </RadialGradientBrush>
+                                                    </Setter.Value>
+                                                </Setter>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </ScrollViewer.Style>
+                            </ScrollViewer>
+
+                            <Grid Grid.Column="1"  Grid.Row="0" Margin="0" Name="TitleGrid"
+                                  Width="{Binding ElementName=DetailsPanel, Path=ActualWidth}"
+                                  VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                                <Grid.Style>
+                                    <Style TargetType="Grid">
                                         <Style.Triggers>
-                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True">
-                                                <Setter Property="Source" Value="{Binding ElementName=LogoPath, Path=Text, Converter={StaticResource ImageStringToImageConverter}}"/>
+                                            <DataTrigger Binding="{Settings IndentGameDetails}" Value="false">
+                                                <Setter Property="Visibility" Value="Collapsed"/>
                                             </DataTrigger>
                                         </Style.Triggers>
                                     </Style>
-                                </Image.Style>
-                            </Image>
-                            <TextBlock Grid.Column="1" Grid.Row="1"
+                                </Grid.Style>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1*" />
+                                    <ColumnDefinition Width="1*" />
+                                    <ColumnDefinition Width="1*" />
+                                    <ColumnDefinition Width="1*" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="1*" />
+                                    <RowDefinition Height="4*" />
+                                    <RowDefinition Height="1*" />
+                                </Grid.RowDefinitions>
+                                <Image Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2"
+                                   HorizontalAlignment="Center" VerticalAlignment="Center" Stretch="Uniform"
+                                   Name="LogoImage" RenderOptions.BitmapScalingMode="Fant" Margin="0"
+                                   Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
+                                    <Image.Style>
+                                        <Style TargetType="Image">
+                                            <Setter Property="Source" Value="{Binding ElementName=LogoPath, Path=Text}"/>
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
+                                                    <Setter Property="Source" Value="{Binding ElementName=LogoPath, Path=Text, Converter={StaticResource ImageStringToImageConverter}}"/>
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </Image.Style>
+                                </Image>
+                                <Image Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
+                                   HorizontalAlignment="Left" VerticalAlignment="Center" Stretch="Uniform"
+                                   Name="LogoImageLeft" RenderOptions.BitmapScalingMode="Fant" Margin="20,0,-20,0"
+                                   Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
+                                    <Image.Style>
+                                        <Style TargetType="Image">
+                                            <Setter Property="Source" Value="{Binding ElementName=LogoPath, Path=Text}"/>
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True">
+                                                    <Setter Property="Source" Value="{Binding ElementName=LogoLeftPath, Path=Text, Converter={StaticResource ImageStringToImageConverter}}"/>
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </Image.Style>
+                                </Image>
+                                <Image Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2"
+                                   HorizontalAlignment="Right" VerticalAlignment="Center" Stretch="Uniform"
+                                   Name="LogoImageRight" RenderOptions.BitmapScalingMode="Fant" Margin="-20,0,20,0"
+                                   Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
+                                    <Image.Style>
+                                        <Style TargetType="Image">
+                                            <Setter Property="Source" Value="{Binding ElementName=LogoPath, Path=Text}"/>
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True">
+                                                    <Setter Property="Source" Value="{Binding ElementName=LogoRightPath, Path=Text, Converter={StaticResource ImageStringToImageConverter}}"/>
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </Image.Style>
+                                </Image>
+                                <TextBlock Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2"
                                        HorizontalAlignment="Center" VerticalAlignment="Center"
                                        TextAlignment="Center"
                                        FontFamily="{DynamicResource FontFamily}" TextOptions.TextRenderingMode="Aliased"
@@ -131,154 +261,364 @@
                                        FontSize="{DynamicResource FontSizeLargest}"
                                        TextWrapping="WrapWithOverflow"
                                        Foreground="White" Typography.Capitals="SmallCaps">
-                                <TextBlock.Effect>
-                                    <DropShadowEffect ShadowDepth="0"
+                                    <TextBlock.Effect>
+                                        <DropShadowEffect ShadowDepth="0"
                                                          Color="{DynamicResource MainColor}"
                                                          Opacity="1"
                                                          BlurRadius="5"/>
-                                </TextBlock.Effect>
-                                <TextBlock.Resources>
-                                    <Style TargetType="TextBlock">
-                                        <Setter Property="Visibility" Value="Collapsed"/>
+                                    </TextBlock.Effect>
+                                    <TextBlock.Resources>
+                                        <Style TargetType="TextBlock">
+                                            <Setter Property="Visibility" Value="Collapsed"/>
+                                            <Style.Triggers>
+                                                <MultiDataTrigger>
+                                                    <MultiDataTrigger.Conditions>
+                                                        <Condition Binding="{Binding ElementName=LogoImage, Path=Source}" Value="{x:Null}"/>
+                                                        <Condition Binding="{Binding ElementName=LogoImageLeft, Path=Source}" Value="{x:Null}"/>
+                                                        <Condition Binding="{Binding ElementName=LogoImageRight, Path=Source}" Value="{x:Null}"/>
+                                                    </MultiDataTrigger.Conditions>
+                                                    <Setter Property="Visibility" Value="{DynamicResource TitleTextVisibility}"/>
+                                                </MultiDataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </TextBlock.Resources>
+                                </TextBlock>
+                            </Grid>
+
+                            <Grid Grid.Row="1" Grid.RowSpan="2" Tag="{DynamicResource BGModeOn}">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <Grid.Style>
+                                    <Style TargetType="Grid">
                                         <Style.Triggers>
-                                            <DataTrigger Binding="{Binding ElementName=LogoImage, Path=Source}" Value="{x:Null}">
-                                                <Setter Property="Visibility" Value="{DynamicResource TitleTextVisibility}"/>
+                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
+                                                <Setter Property="HorizontalAlignment" Value="Center"/>
+                                                <Setter Property="Width" Value="{DynamicResource DetailsViewPanelWidth}"/>
                                             </DataTrigger>
                                         </Style.Triggers>
                                     </Style>
-                                </TextBlock.Resources>
-                            </TextBlock>
-                        </Grid>
-                        <Border Name="DetailsPane" Grid.Row="2" Grid.Column="1">
-                            <Border.Style>
-                                <Style TargetType="Border">
-                                    <Setter Property="Background" Value="{DynamicResource DetailsPanelBrush}"/>
-                                    <Setter Property="BorderBrush" Value="{DynamicResource PanelSeparatorBrush}"/>
-                                    <Setter Property="BorderThickness" Value="1"/>
-                                    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
-                                    <Setter Property="Margin" Value="-1,0,-1,-1" />
-                                    <Setter Property="HorizontalAlignment" Value="Center" />
-                                    <Setter Property="VerticalAlignment" Value="Stretch" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Settings ShowPanelSeparators}" Value="False">
-                                            <Setter Property="BorderThickness" Value="0" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </Border.Style>
-                            <DockPanel MaxWidth="{DynamicResource DetailsViewPanelWidth}">
-                                <Grid DockPanel.Dock="Top" HorizontalAlignment="Stretch" Background="Transparent" Margin="0">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="*"/>
-                                    </Grid.ColumnDefinitions>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="*" />
-                                    </Grid.RowDefinitions>
-                                    <Grid.Resources>
-                                        <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
-                                            <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}"/>
-                                            <Setter Property="TextOptions.TextRenderingMode" Value="Aliased" />
-                                            <Setter Property="Margin" Value="1,0,0,0" />
-                                            <Setter Property="MinWidth" Value="40" />
-                                            <Setter Property="MinHeight" Value="40" />
-                                            <Setter Property="Background" Value="Transparent" />
-                                            <Setter Property="BorderBrush" Value="Transparent" />
-                                            <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
+                                </Grid.Style>
+                                <Border Grid.Row="0" VerticalAlignment="Top" Tag="{DynamicResource BGModeOn}"
+                                    Height="{Binding ElementName=ControlButtons, Path=ActualHeight}" HorizontalAlignment="Stretch"
+                                    BorderBrush="{DynamicResource PanelSeparatorBrush}" Background="{DynamicResource PanelBackgroundBrush}">
+                                    <Border.Style>
+                                        <Style TargetType="Border">
+                                            <Setter Property="BorderThickness" Value="0,1,0,1"/>
+                                            <Setter Property="Margin" Value="0"/>
+                                            <Setter Property="Grid.Column" Value="0"/>
+                                            <Setter Property="Grid.ColumnSpan" Value="3"/>
                                             <Style.Triggers>
-                                                <Trigger Property="IsMouseOver" Value="True">
-                                                    <Setter Property="Background" Value="{DynamicResource DetailsButtonBrush}" />
-                                                </Trigger>
+                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
+                                                    <Setter Property="BorderThickness" Value="1"/>
+                                                    <Setter Property="Margin" Value="-1,0,-1,0"/>
+                                                    <Setter Property="Grid.Column" Value="1"/>
+                                                    <Setter Property="Grid.ColumnSpan" Value="1"/>
+                                                </DataTrigger>
+                                                <DataTrigger Binding="{Settings ShowPanelSeparators}" Value="False">
+                                                    <Setter Property="BorderThickness" Value="0"/>
+                                                </DataTrigger>
+                                                <MultiDataTrigger>
+                                                    <MultiDataTrigger.Conditions>
+                                                        <Condition Binding="{Settings ShowPanelSeparators}" Value="false"/>
+                                                        <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true"/>
+                                                    </MultiDataTrigger.Conditions>
+                                                    <Setter Property="Margin" Value="0"/>
+                                                </MultiDataTrigger>
+                                                <MultiDataTrigger>
+                                                    <MultiDataTrigger.Conditions>
+                                                        <Condition Binding="{Settings IndentGameDetails}" Value="false"/>
+                                                        <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="false"/>
+                                                    </MultiDataTrigger.Conditions>
+                                                    <Setter Property="BorderThickness" Value="0,0,0,1"/>
+                                                </MultiDataTrigger>
+                                                <MultiDataTrigger>
+                                                    <MultiDataTrigger.Conditions>
+                                                        <Condition Binding="{Settings IndentGameDetails}" Value="false"/>
+                                                        <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true"/>
+                                                    </MultiDataTrigger.Conditions>
+                                                    <Setter Property="BorderThickness" Value="1,0,1,1"/>
+                                                </MultiDataTrigger>
+                                                <MultiDataTrigger>
+                                                    <MultiDataTrigger.Conditions>
+                                                        <Condition Binding="{Settings ShowPanelSeparators}" Value="False"/>
+                                                        <Condition Binding="{Settings IndentGameDetails}" Value="false"/>
+                                                    </MultiDataTrigger.Conditions>
+                                                    <Setter Property="BorderThickness" Value="0"/>
+                                                </MultiDataTrigger>
                                             </Style.Triggers>
                                         </Style>
-                                    </Grid.Resources>
-                                    <StackPanel x:Name="ControlButtons" Grid.Column="0" Orientation="Horizontal" >
-                                        <Button Name="PART_ButtonPlayAction" Width="120"
-                                                FontSize="{DynamicResource FontSizeLarger}" Style="{DynamicResource PlayButton}" />
-                                        <Button Name="PART_ButtonContextAction" Width="120" Style="{DynamicResource ContextButton}"
-                                                FontSize="{DynamicResource FontSizeLarger}"/>
-                                        <Button Name="PART_ButtonMoreActions"
+                                    </Border.Style>
+                                </Border>
+
+                                <Border Grid.Row="1" Tag="{DynamicResource BGModeOn}"
+                                VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
+                                BorderBrush="{DynamicResource PanelSeparatorBrush}"
+                                Background="{DynamicResource PanelBackgroundBrush}">
+                                    <Border.Style>
+                                        <Style TargetType="Border">
+                                            <Setter Property="BorderThickness" Value="1,0,1,0"/>
+                                            <Setter Property="Margin" Value="-1,0,-1,0"/>
+                                            <Setter Property="Grid.Column" Value="0"/>
+                                            <Setter Property="Grid.ColumnSpan" Value="3"/>
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
+                                                    <Setter Property="Grid.Column" Value="1"/>
+                                                    <Setter Property="Grid.ColumnSpan" Value="1"/>
+                                                </DataTrigger>
+                                                <DataTrigger Binding="{Settings ShowPanelSeparators}" Value="false">
+                                                    <Setter Property="BorderThickness" Value="0"/>
+                                                    <Setter Property="Margin" Value="0"/>
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </Border.Style>
+                                </Border>
+                            </Grid>
+
+                            <Grid Name="ControlsBar" Grid.Column="1" Grid.Row="1" MinWidth="{Binding ElementName=DetailsPanel, Path=ActualWidth}"
+                                  HorizontalAlignment="Center" VerticalAlignment="Bottom" Background="Transparent">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" MinWidth="{Binding ElementName=DetailsLeftPanel, Path=ActualWidth}"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto" MinWidth="{Binding ElementName=DetailsRightPanel, Path=ActualWidth}"/>
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <Grid.Resources>
+                                    <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+                                        <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}"/>
+                                        <Setter Property="TextOptions.TextRenderingMode" Value="Aliased" />
+                                        <Setter Property="Margin" Value="1,0,0,0" />
+                                        <Setter Property="MinWidth" Value="40" />
+                                        <Setter Property="MinHeight" Value="40" />
+                                        <Setter Property="Background" Value="Transparent" />
+                                        <Setter Property="BorderBrush" Value="Transparent" />
+                                        <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
+                                        <Style.Triggers>
+                                            <Trigger Property="IsMouseOver" Value="True">
+                                                <Setter Property="Background" Value="{DynamicResource DetailsButtonBrush}" />
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Grid.Resources>
+                                <StackPanel x:Name="ControlButtons" Grid.Column="0" Margin="20,0,0,0" Orientation="Horizontal" >
+                                    <Button Name="PART_ButtonPlayAction" Width="{Binding ElementName=PART_ImageCover, Path=ActualWidth}"
+                                            MinWidth="80" FontSize="{DynamicResource FontSizeLarger}" Style="{DynamicResource PlayButton}" />
+                                    <Button Name="PART_ButtonContextAction" Width="{Binding ElementName=PART_ImageCover, Path=ActualWidth}"
+                                            MinWidth="80" Style="{DynamicResource ContextButton}" FontSize="{DynamicResource FontSizeLarger}"/>
+                                    <Button Name="PART_ButtonMoreActions"
                                                 Content="&#xE10C;" FontFamily="{DynamicResource SymbolFont}"/>
+                                </StackPanel>
+                                <StackPanel Grid.Column="1" Orientation="Horizontal"
+                                                    VerticalAlignment="Center" HorizontalAlignment="Center">
+                                    <StackPanel.Resources>
+                                        <Style TargetType="StackPanel">
+                                            <Setter Property="HorizontalAlignment" Value="Center" />
+                                        </Style>
+                                        <Style TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
+                                            <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}"/>
+                                            <Setter Property="FontFamily" Value="{DynamicResource SymbolFont}"/>
+                                            <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}"/>
+                                            <Setter Property="VerticalAlignment" Value="Center"/>
+                                            <Setter Property="Margin" Value="20,0,10,0" />
+                                        </Style>
+                                        <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
+                                            <Setter Property="VerticalAlignment" Value="Center"/>
+                                            <Setter Property="Margin" Value="0,0,20,0"/>
+                                        </Style>
+                                    </StackPanel.Resources>
+                                    <StackPanel Orientation="Horizontal" ToolTip="{DynamicResource LOCTimePlayed}">
+                                        <Label Name="PART_ElemPlayTime" Content="&#x23F3;"/>
+                                        <TextBlock Name="PART_TextPlayTime"/>
                                     </StackPanel>
-                                    <Grid Grid.Column="1" Grid.RowSpan="2" Margin="0"
-                                          HorizontalAlignment="Center" VerticalAlignment="Center">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="{Binding ElementName=DetailsLeftPanel, Path=ActualWidth}" />
-                                            <ColumnDefinition Width="Auto"/>
-                                        </Grid.ColumnDefinitions>
-                                        <TextBlock Text="{DynamicResource LOCGameDetails}" Foreground="{DynamicResource TextBrush}"
-                                                   FontSize="{DynamicResource FontSizeLarger}" FontFamily="{DynamicResource FontFamily}"
-                                                   Typography.Capitals="SmallCaps" Visibility="Visible" FontWeight="SemiBold"
-                                                   VerticalAlignment="Center" Grid.Column="1" Margin="0"/>
-                                    </Grid>
-                                    <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
-
-                                        <StackPanel Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
-                                            <Button Name="PART_HltbCustomButton" Content="&#x23f3;"
-                                                    FontFamily="{DynamicResource SymbolFont}"/>
+                                    <StackPanel Orientation="Horizontal" Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
+                                        <StackPanel Orientation="Horizontal" Tag="{DynamicResource Htlb_HasData}" ToolTip="{DynamicResource LOCHowLongToBeat}">
+                                            <Label Content="&#x23F1;" FontFamily="{DynamicResource SymbolFont}"/>
+                                            <TextBlock Text="{DynamicResource Htlb_TimeToBeatFormat}"/>
                                             <StackPanel.Style>
-                                                <Style TargetType="StackPanel">
-                                                    <Setter Property="Visibility" Value="Collapsed" />
+                                                <Style>
+                                                    <Setter Property="Control.Visibility" Value="Collapsed"/>
                                                     <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}"  Value="True">
-                                                            <Setter Property="Visibility" Value="Visible" />
+                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
+                                                            <Setter Property="Control.Visibility" Value="Visible"/>
                                                         </DataTrigger>
                                                     </Style.Triggers>
                                                 </Style>
                                             </StackPanel.Style>
                                         </StackPanel>
+                                        <StackPanel.Style>
+                                            <Style>
+                                                <Setter Property="Control.Visibility" Value="Collapsed"/>
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="true">
+                                                        <Setter Property="Control.Visibility" Value="Visible"/>
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </StackPanel.Style>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Horizontal" ToolTip="{DynamicResource LOCLastPlayed}">
+                                        <Label Name="PART_ElemLastPlayed" Content="&#xE163;"/>
+                                        <TextBlock Name="PART_TextLastActivity"/>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Horizontal" ToolTip="{DynamicResource LOCCompletionStatus}">
+                                        <Label Name="PART_ElemCompletionStatus" Content="&#xE10B;"/>
+                                        <TextBlock Name="PART_TextCompletionStatus"/>
+                                    </StackPanel>
+                                </StackPanel>
 
-                                        <StackPanel Tag="{DynamicResource Sc_EnableIntegrationInCustomTheme}">
-                                            <Button Name="PART_ScCustomButton" Content="&#x1F3C6;"
-                                                    FontFamily="{DynamicResource SymbolFont}" />
-                                            <StackPanel.Style>
-                                                <Style TargetType="StackPanel">
-                                                    <Setter Property="Visibility" Value="Collapsed" />
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True">
-                                                            <Setter Property="Visibility" Value="Visible" />
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </StackPanel.Style>
-                                        </StackPanel>
+                                <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,20,0">
+                                    <StackPanel Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
+                                        <Button Name="PART_HltbCustomButton" Content="&#x23F1;" ToolTip="{DynamicResource LOCHowLongToBeat}"
+                                                    FontFamily="{DynamicResource SymbolFont}"/>
+                                        <StackPanel.Style>
+                                            <Style TargetType="StackPanel">
+                                                <Setter Property="Visibility" Value="Collapsed" />
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}"  Value="True">
+                                                        <Setter Property="Visibility" Value="Visible" />
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </StackPanel.Style>
+                                    </StackPanel>
 
-                                        <Button x:Name="PART_ButtonEditGame" Margin="0"
-                                                FontFamily="{DynamicResource SymbolFont}" Content="&#xE104;"/>
+                                    <StackPanel Tag="{DynamicResource Sc_EnableIntegrationInCustomTheme}">
+                                        <Button Name="PART_ScCustomButton" Content="&#x1F396;" ToolTip="SuccessStory"
+                                                    FontFamily="{DynamicResource SymbolFont}" />
                                         <StackPanel.Style>
                                             <Style TargetType="StackPanel">
-                                                <Setter Property="Visibility" Value="Hidden" />
+                                                <Setter Property="Visibility" Value="Collapsed" />
                                                 <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType=Grid}}"  Value="True">
+                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True">
                                                         <Setter Property="Visibility" Value="Visible" />
                                                     </DataTrigger>
                                                 </Style.Triggers>
                                             </Style>
                                         </StackPanel.Style>
                                     </StackPanel>
-                                </Grid>
-                                <ScrollViewer DockPanel.Dock="Left" HorizontalScrollBarVisibility="Disabled"
-                                              VerticalScrollBarVisibility="Hidden" Margin="20,0,0,0">
-                                    <ScrollViewer.Resources>
-                                        <Style TargetType="ScrollBar" BasedOn="{StaticResource {x:Type ScrollBar}}">
-                                            <Setter Property="Margin" Value="0,20,0,0"/>
+
+                                    <Button x:Name="PART_ButtonEditGame" Margin="0" ToolTip="{DynamicResource LOCEditGame}"
+                                                FontFamily="{DynamicResource SymbolFont}" Content="&#xE104;"/>
+                                    <StackPanel.Style>
+                                        <Style TargetType="StackPanel">
+                                            <Setter Property="Visibility" Value="Hidden" />
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType=Grid}}"  Value="True">
+                                                    <Setter Property="Visibility" Value="Visible" />
+                                                </DataTrigger>
+                                            </Style.Triggers>
                                         </Style>
-                                    </ScrollViewer.Resources>
-                                    <ScrollViewer.OpacityMask>
-                                        <LinearGradientBrush StartPoint="0,0" EndPoint="0,20" MappingMode="Absolute">
-                                            <LinearGradientBrush.GradientStops>
-                                                <GradientStop Offset="0" Color="Transparent"/>
-                                                <GradientStop Offset="1" Color="White"/>
-                                            </LinearGradientBrush.GradientStops>
-                                        </LinearGradientBrush>
-                                    </ScrollViewer.OpacityMask>
-                                    <StackPanel Name="DetailsLeftPanel" Orientation="Vertical"
-                                                    DockPanel.Dock="Left" Margin="0,20,0,0">
-                                        <Image Name="PART_ImageCover" VerticalAlignment="Center" HorizontalAlignment="Center"
+                                    </StackPanel.Style>
+                                </StackPanel>
+                            </Grid>
+
+                            <ScrollViewer Name="DetailsPanel" Grid.Column="1" Grid.Row="2"
+                                          MaxWidth="{DynamicResource DetailsViewPanelWidth}"
+                                          HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+                                <ScrollViewer.Resources>
+                                    <Style TargetType="ScrollBar" BasedOn="{StaticResource {x:Type ScrollBar}}">
+                                        <Setter Property="Margin" Value="0,20,0,0"/>
+                                    </Style>
+                                </ScrollViewer.Resources>
+                                <ScrollViewer.OpacityMask>
+                                    <LinearGradientBrush StartPoint="0,0" EndPoint="0,20" MappingMode="Absolute">
+                                        <LinearGradientBrush.GradientStops>
+                                            <GradientStop Offset="0" Color="Transparent"/>
+                                            <GradientStop Offset="1" Color="White"/>
+                                        </LinearGradientBrush.GradientStops>
+                                    </LinearGradientBrush>
+                                </ScrollViewer.OpacityMask>
+                                <DockPanel Margin="20">
+                                    <StackPanel Name="DetailsRightPanel" Orientation="Vertical"
+                                                    DockPanel.Dock="Right" Margin="20,20,00,0">
+
+                                        <GridEx HorizontalAlignment="Left" Margin="0"
+                                                ColumnCount="2" RowCount="12" AutoLayoutColumns="2">
+                                            <GridEx.Resources>
+                                                <Style TargetType="ItemsControl">
+                                                    <Setter Property="VerticalAlignment" Value="Center" />
+                                                    <Setter Property="Margin" Value="10,0,0,10" />
+                                                </Style>
+                                                <Style TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
+                                                    <Setter Property="HorizontalAlignment" Value="Center"/>
+                                                    <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                                                    <Setter Property="VerticalAlignment" Value="Center"/>
+                                                    <Setter Property="Margin" Value="0,0,10,10" />
+                                                    <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}"/>
+                                                    <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}" />
+                                                    <Setter Property="FontFamily" Value="{DynamicResource SymbolFont}"/>
+                                                </Style>
+                                                <Style TargetType="Border">
+                                                    <Setter Property="BorderBrush" Value="{DynamicResource HoverBorderBrush}"/>
+                                                    <Setter Property="BorderThickness" Value="0,0,1,0"/>
+                                                    <Setter Property="Margin" Value="-1,5,0,5"/>
+                                                </Style>
+                                                <Style TargetType="Button" BasedOn="{StaticResource PropertyItemButton}" >
+                                                    <Setter Property="Margin" Value="10,0,0,10" />
+                                                    <Setter Property="VerticalAlignment" Value="Center"/>
+                                                </Style>
+                                                <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}" >
+                                                    <Setter Property="Margin" Value="10,0,0,10" />
+                                                    <Setter Property="VerticalAlignment" Value="Center"/>
+                                                </Style>
+                                            </GridEx.Resources>
+
+                                            <Label Name="PART_ElemPlatform" Content="&#xEA32;" FontFamily="{DynamicResource FontIcoFont}"
+                                                   ToolTip="{DynamicResource LOCPlatformTitle}"/>
+                                            <Button Name="PART_ButtonPlatform"/>
+
+                                            <Label Name="PART_ElemReleaseDate" Content="&#x1F382;" ToolTip="{DynamicResource LOCGameReleaseDateTitle}"/>
+                                            <Button Name="PART_ButtonReleaseDate"/>
+
+                                            <Label Name="PART_ElemSeries" Content="&#xE158;" ToolTip="{DynamicResource LOCSeriesLabel}"/>
+                                            <Button Name="PART_ButtonSeries"/>
+
+                                            <Label Name="PART_ElemDevelopers" Content="&#xE144;" ToolTip="{DynamicResource LOCDeveloperLabel}"/>
+                                            <ItemsControl Name="PART_ItemsDevelopers" />
+
+                                            <Label Name="PART_ElemPublishers" Content="&#x1F454;" ToolTip="{DynamicResource LOCPublisherLabel}"/>
+                                            <ItemsControl Name="PART_ItemsPublishers" />
+
+                                            <Label Name="PART_ElemAgeRating" Content="&#x26D4;" ToolTip="{DynamicResource LOCAgeRatingLabel}"/>
+                                            <Button Name="PART_ButtonAgeRating" />
+
+                                            <Label Name="PART_ElemRegion" Content="&#xE128;" ToolTip="{DynamicResource LOCRegionLabel}"/>
+                                            <Button Name="PART_ButtonRegion"/>
+
+                                            <Label Name="PART_ElemCommunityScore" Content="&#xE125;" ToolTip="{DynamicResource LOCCommunityScore}"/>
+                                            <TextBlock Name="PART_TextCommunityScore" VerticalAlignment="Center"
+                                                        Style="{DynamicResource TextBlockGameScore}" Margin="10,0,0,10"/>
+
+                                            <Label Name="PART_ElemCriticScore" Content="&#xE136;" ToolTip="{DynamicResource LOCCriticScore}"/>
+                                            <TextBlock Name="PART_TextCriticScore" VerticalAlignment="Center"
+                                                        Style="{DynamicResource TextBlockGameScore}" Margin="10,0,0,10"/>
+
+                                            <Border>
+                                                <Label Name="PART_ElemGenres" Content="&#x1F3AD;" ToolTip="{DynamicResource LOCGenreLabel}"/>
+                                            </Border>
+                                            <ItemsControl Name="PART_ItemsGenres"/>
+
+                                            <Border>
+                                                <Label Name="PART_ElemTags" Content="&#xE1CB;" ToolTip="{DynamicResource LOCTagsLabel}"/>
+                                            </Border>
+                                            <ItemsControl Name="PART_ItemsTags"/>
+
+                                            <Border>
+                                                <Label Name="PART_ElemFeatures" Content="&#xE133;" ToolTip="{DynamicResource LOCFeaturesLabel}"/>
+                                            </Border>
+                                            <ItemsControl Name="PART_ItemsFeatures"/>
+                                        </GridEx>
+                                    </StackPanel>
+
+                                    <StackPanel Name="DetailsLeftPanel" DockPanel.Dock="Left" Margin="0,20,20,0" MinWidth="{Binding ElementName=PART_ImageCover, Path=ActualWidth}">
+                                        <Image Name="PART_ImageCover" VerticalAlignment="Center" HorizontalAlignment="Left"
                                                    Height="{Settings GameDetailsCoverHeight}" RenderOptions.BitmapScalingMode="Fant"
-                                                   StretchDirection="Both" Stretch="Uniform">
+                                                   StretchDirection="Both" Stretch="Uniform" Margin="0,0,0,10">
                                             <Image.OpacityMask>
                                                 <DrawingBrush>
                                                     <DrawingBrush.Drawing>
@@ -295,132 +635,68 @@
                                                 </DrawingBrush>
                                             </Image.OpacityMask>
                                         </Image>
-                                        <GridEx Margin="0,20,0,20" DockPanel.Dock="Top"
-                                                ColumnCount="2" StarColumns="1"
-                                                RowCount="10" AutoLayoutColumns="2">
+                                        <GridEx ColumnCount="2" RowCount="6" AutoLayoutColumns="2" HorizontalAlignment="Center">
                                             <Grid.Resources>
+                                                <Style TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
+                                                    <Setter Property="HorizontalAlignment" Value="Center" />
+                                                    <Setter Property="VerticalAlignment" Value="Center"/>
+                                                    <Setter Property="Margin" Value="0,0,10,10" />
+                                                    <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}"/>
+                                                    <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}" />
+                                                    <Setter Property="FontFamily" Value="{DynamicResource SymbolFont}"/>
+                                                </Style>
+                                                <Style TargetType="Border">
+                                                    <Setter Property="BorderBrush" Value="{DynamicResource HoverBorderBrush}"/>
+                                                    <Setter Property="BorderThickness" Value="0,0,1,0"/>
+                                                    <Setter Property="Margin" Value="-1,5,0,5"/>
+                                                </Style>
                                                 <Style TargetType="ItemsControl">
                                                     <Setter Property="VerticalAlignment" Value="Center" />
+                                                    <Setter Property="Margin" Value="10,0,0,10"/>
                                                 </Style>
-                                                <Style TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
-                                                    <Setter Property="Margin" Value="0,4,8,4" />
-                                                    <Setter Property="VerticalAlignment" Value="Top" />
-                                                    <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}" />
+                                                <Style TargetType="Button" BasedOn="{StaticResource PropertyItemButton}" >
+                                                    <Setter Property="VerticalAlignment" Value="Center"/>
+                                                    <Setter Property="Margin" Value="10,0,0,10"/>
                                                 </Style>
-                                                <Style TargetType="Button" BasedOn="{StaticResource PropertyItemButton}" />
                                                 <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}" >
                                                     <Setter Property="VerticalAlignment" Value="Center"/>
                                                 </Style>
                                             </Grid.Resources>
+                                            <Label Name="PART_ElemLibrary" Content="&#xEF65;" FontFamily="{DynamicResource FontIcoFont}"
+                                                   ToolTip="{DynamicResource LOCGameProviderTitle}"/>
+                                            <Button Name="PART_ButtonLibrary"/>
 
-                                            <Label Name="PART_ElemVersion" Content="{DynamicResource LOCVersionLabel}" />
-                                            <Button Name="PART_ButtonVersion" VerticalAlignment="Center" />
-
-                                            <Label Name="PART_ElemSource" Content="{DynamicResource LOCSourceLabel}" />
-                                            <Button Name="PART_ButtonSource" VerticalAlignment="Center" />
-
-                                            <Label Name="PART_ElemRegion" Content="{DynamicResource LOCRegionLabel}" />
-                                            <Button Name="PART_ButtonRegion"/>
-
-                                            <Label Name="PART_ElemGenres" Content="{DynamicResource LOCGenreLabel}" />
-                                            <ItemsControl Name="PART_ItemsGenres"  />
+                                            <Label Name="PART_ElemSource" Content="&#xE14D;" ToolTip="{DynamicResource LOCSourceLabel}"/>
+                                            <Button Name="PART_ButtonSource"/>
 
-                                            <Label Name="PART_ElemFeatures" Content="{DynamicResource LOCFeaturesLabel}" />
-                                            <ItemsControl Name="PART_ItemsFeatures" />
+                                            <Label Name="PART_ElemVersion" Content="&#xE15E;" ToolTip="{DynamicResource LOCVersionLabel}"/>
+                                            <Button Name="PART_ButtonVersion"/>
 
-                                            <Label Name="PART_ElemTags" Content="{DynamicResource LOCTagsLabel}" />
-                                            <ItemsControl Name="PART_ItemsTags" />
+                                            <Label Name="PART_ElemUserScore" Content="&#xE13D;" ToolTip="{DynamicResource LOCUserScore}"/>
+                                            <TextBlock Name="PART_TextUserScore" Style="{DynamicResource TextBlockGameScore}"
+                                                       VerticalAlignment="Center" Margin="10,0,0,10"/>
 
-                                            <Label Name="PART_ElemUserScore" Content="{DynamicResource LOCUserScore}" />
-                                            <TextBlock Name="PART_TextUserScore" Style="{DynamicResource TextBlockGameScore}" />
+                                            <Border>
+                                                <Label Name="PART_ElemCategories" Content="&#xE188;" ToolTip="{DynamicResource LOCGameCategoriesTitle}"/>
+                                            </Border>
+                                            <ItemsControl Name="PART_ItemsCategories"/>
 
-                                            <Label Name="PART_ElemCommunityScore" Content="{DynamicResource LOCCommunityScore}" />
-                                            <TextBlock Name="PART_TextCommunityScore" VerticalAlignment="Center"
-                                                        Style="{DynamicResource TextBlockGameScore}" />
-
-                                            <Label Name="PART_ElemCriticScore" Content="{DynamicResource LOCCriticScore}" />
-                                            <TextBlock Name="PART_TextCriticScore" VerticalAlignment="Center"
-                                                        Style="{DynamicResource TextBlockGameScore}" />
-
-                                            <Label Name="PART_ElemLinks" Content="{DynamicResource LOCLinksLabel}" />
-                                            <ItemsControl Name="PART_ItemsLinks" />
+                                            <Border>
+                                                <Label Name="PART_ElemLinks" Content="&#xEF71;" FontFamily="{DynamicResource FontIcoFont}"
+                                                       ToolTip="{DynamicResource LOCLinksLabel}"/>
+                                            </Border>
+                                            <ItemsControl Name="PART_ItemsLinks"/>
                                         </GridEx>
                                     </StackPanel>
-                                </ScrollViewer>
-                                <ScrollViewer Margin="20,0,20,0" DockPanel.Dock="Right">
-                                    <ScrollViewer.Resources>
-                                        <Style TargetType="ScrollBar" BasedOn="{StaticResource {x:Type ScrollBar}}">
-                                            <Setter Property="Margin" Value="0,20,0,20"/>
-                                        </Style>
-                                    </ScrollViewer.Resources>
-                                    <ScrollViewer.OpacityMask>
-                                        <LinearGradientBrush StartPoint="0,0" EndPoint="0,20" MappingMode="Absolute">
-                                            <LinearGradientBrush.GradientStops>
-                                                <GradientStop Offset="0" Color="Transparent"/>
-                                                <GradientStop Offset="1" Color="White"/>
-                                            </LinearGradientBrush.GradientStops>
-                                        </LinearGradientBrush>
-                                    </ScrollViewer.OpacityMask>
-                                    <StackPanel MaxWidth="1280" Margin="0,20,0,20">
+
+                                    <StackPanel Margin="0" DockPanel.Dock="Top" HorizontalAlignment="Stretch">
                                         <StackPanel.Resources>
                                             <Style TargetType="ScrollBar" BasedOn="{StaticResource {x:Type ScrollBar}}">
                                                 <Setter Property="Margin" Value="0"/>
                                             </Style>
                                         </StackPanel.Resources>
-                                        <WrapPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="20,0,20,0">
-                                            <WrapPanel.Resources>
-                                                <Style TargetType="ItemsControl">
-                                                    <Setter Property="Margin" Value="10,0,10,0" />
-                                                    <Setter Property="VerticalAlignment" Value="Top"/>
-                                                </Style>
-                                                <Style TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
-                                                    <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}" />
-                                                    <Setter Property="MinWidth" Value="60" />
-                                                    <Setter Property="Margin" Value="10,0,10,0" />
-                                                    <Setter Property="VerticalAlignment" Value="Bottom" />
-                                                </Style>
-                                                <Style TargetType="Button" BasedOn="{StaticResource PropertyItemButton}" >
-                                                    <Setter Property="Margin" Value="10,4,10,0" />
-                                                    <Setter Property="VerticalAlignment" Value="Top"/>
-                                                </Style>
-                                                <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
-                                                    <Setter Property="Margin" Value="10,4,10,0" />
-                                                    <Setter Property="VerticalAlignment" Value="Top"/>
-                                                </Style>
-                                            </WrapPanel.Resources>
-                                            <GridEx HorizontalAlignment="Center" Margin="0,0,0,20"
-                                                ColumnCount="5" RowCount="2" AutoLayoutColumns="5">
-                                                <Label Name="PART_ElemLibrary" Content="{DynamicResource LOCGameProviderTitle}" />
-                                                <Label Name="PART_ElemCategories" Content="{DynamicResource LOCGameCategoriesTitle}" />
-                                                <Label Name="PART_ElemPlayTime" Content="{DynamicResource LOCTimePlayed}" />
-                                                <Label Name="PART_ElemLastPlayed" Content="{DynamicResource LOCLastPlayed}" />
-                                                <Label Name="PART_ElemCompletionStatus" Content="{DynamicResource LOCCompletionStatus}" />
-
-                                                <Button Name="PART_ButtonLibrary" />
-                                                <ItemsControl Name="PART_ItemsCategories" />
-                                                <TextBlock Name="PART_TextPlayTime" />
-                                                <TextBlock Name="PART_TextLastActivity" />
-                                                <TextBlock Name="PART_TextCompletionStatus" />
-                                            </GridEx>
-                                            <GridEx HorizontalAlignment="Center" Margin="0,0,0,20"
-                                                ColumnCount="6" RowCount="2" AutoLayoutColumns="6">
-                                                <Label Name="PART_ElemPlatform" Content="{DynamicResource LOCPlatformTitle}" />
-                                                <Label Name="PART_ElemReleaseDate" Content="{DynamicResource LOCGameReleaseDateTitle}" />
-                                                <Label Name="PART_ElemSeries" Content="{DynamicResource LOCSeriesLabel}" />
-                                                <Label Name="PART_ElemDevelopers" Content="{DynamicResource LOCDeveloperLabel}" />
-                                                <Label Name="PART_ElemPublishers" Content="{DynamicResource LOCPublisherLabel}" />
-                                                <Label Name="PART_ElemAgeRating" Content="{DynamicResource LOCAgeRatingLabel}" />
-
-                                                <Button Name="PART_ButtonPlatform"/>
-                                                <Button Name="PART_ButtonReleaseDate" />
-                                                <Button Name="PART_ButtonSeries" />
-                                                <ItemsControl Name="PART_ItemsDevelopers" />
-                                                <ItemsControl Name="PART_ItemsPublishers" />
-                                                <Button Name="PART_ButtonAgeRating" />
-                                            </GridEx>
-                                        </WrapPanel>
-                                        <StackPanel Margin="20,0,20,0" >
-                                            <StackPanel Tag="{DynamicResource Sc_EnableIntegrationInCustomTheme}">
+                                        <StackPanel Margin="0" >
+                                            <StackPanel Margin="0" Tag="{DynamicResource Sc_EnableIntegrationInCustomTheme}">
                                                 <StackPanel.Style>
                                                     <Style TargetType="StackPanel">
                                                         <Setter Property="Visibility" Value="Collapsed" />
@@ -431,7 +707,7 @@
                                                         </Style.Triggers>
                                                     </Style>
                                                 </StackPanel.Style>
-                                                <StackPanel Tag="{DynamicResource Sc_HasData}">
+                                                <StackPanel Margin="0,0,0,20" Tag="{DynamicResource Sc_HasData}">
                                                     <StackPanel.Style>
                                                         <Style>
                                                             <Setter Property="Control.Visibility" Value="Visible" />
@@ -445,55 +721,46 @@
                                                             </Style.Triggers>
                                                         </Style>
                                                     </StackPanel.Style>
-                                                    <Grid HorizontalAlignment="Stretch" Margin="0,20,0,20" >
+                                                    <StackPanel.Resources>
+                                                        <Style TargetType="StackPanel">
+                                                            <Setter Property="MaxWidth" Value="720"/>
+                                                        </Style>
+                                                    </StackPanel.Resources>
+                                                    <Grid HorizontalAlignment="Stretch" Margin="0,0,0,20" >
                                                         <Grid.ColumnDefinitions>
                                                             <ColumnDefinition Width="*"/>
                                                             <ColumnDefinition Width="Auto"/>
                                                             <ColumnDefinition Width="*"/>
                                                         </Grid.ColumnDefinitions>
                                                         <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="0"/>
-                                                        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1"
-                                                       Text="{DynamicResource LOCCommonLinksAchievements}" Margin="10,0,10,0" Foreground="{DynamicResource TextBrush}"
-                                                       FontSize="{DynamicResource FontSizeLarger}" FontFamily="{DynamicResource FontFamily}"
-                                                       Typography.Capitals="SmallCaps" Visibility="Visible" FontWeight="SemiBold" />
+                                                        <StackPanel Orientation="Horizontal" Grid.Column="1">
+                                                            <TextBlock Text="&#x1F396;" Margin="10,0,0,0" FontFamily="{DynamicResource SymbolFont}"
+                                                                   FontSize="{DynamicResource FontSizeLarger}" Foreground="{DynamicResource TextBrush}"/>
+                                                            <TextBlock Text="{DynamicResource LOCCommonLinksAchievements}" Margin="10,0,10,0" Foreground="{DynamicResource TextBrush}"
+                                                                       FontSize="{DynamicResource FontSizeLarger}" FontFamily="{DynamicResource FontFamily}"
+                                                                       Typography.Capitals="SmallCaps" FontWeight="SemiBold" />
+                                                        </StackPanel>
                                                         <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="2"/>
                                                     </Grid>
-                                                    <StackPanel Name="PART_Achievements_ProgressBar" MaxWidth="720"/>
+                                                    <StackPanel Name="PART_Achievements_Graphics"/>
 
-                                                    <StackPanel Name="PART_Achievements_Graphics" MaxWidth="720"/>
+                                                    <StackPanel Name="PART_Achievements_ProgressBar"/>
 
-                                                    <StackPanel Name="PART_Achievements_ListComptact" MaxWidth="720"/>
+                                                    <StackPanel Name="PART_Achievements_ListComptact"/>
 
-                                                    <StackPanel Name="PART_Achievements_ListCompactUnlocked" MaxWidth="720"/>
+                                                    <StackPanel Name="PART_Achievements_ListCompactUnlocked"/>
 
-                                                    <StackPanel Name="PART_Achievements_ListCompactLocked" MaxWidth="720"/>
+                                                    <StackPanel Name="PART_Achievements_ListCompactLocked"/>
 
-                                                    <StackPanel Name="PART_Achievements_List" MaxHeight="200" MaxWidth="720"/>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <StackPanel Name="PART_Achievements_List"/>
 
-                                                    <StackPanel Name="PART_ScUserStats" MaxWidth="720"/>
+                                                        <StackPanel Name="PART_ScUserStats"/>
+                                                    </StackPanel>
                                                 </StackPanel>
                                             </StackPanel>
-                                            <StackPanel Name="PART_ElemNotes" Margin="0,0,0,20">
-                                                <Grid HorizontalAlignment="Stretch" Margin="0,20,0,20" >
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="0"/>
-                                                    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1"
-                                                       Text="{DynamicResource LOCNotesLabel}" Margin="10,0,10,0" Foreground="{DynamicResource TextBrush}"
-                                                       FontSize="{DynamicResource FontSizeLarger}" FontFamily="{DynamicResource FontFamily}"
-                                                       Typography.Capitals="SmallCaps" Visibility="Visible" FontWeight="SemiBold" />
-                                                    <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="2"/>
-                                                </Grid>
-                                                <TextBox Name="PART_TextNotes" IsReadOnly="True"
-                                                     BorderThickness="0" Background="Transparent"
-                                                     AcceptsReturn="True" TextWrapping="Wrap"
-                                                     Margin="-1,5,-1,5" Padding="0"/>
-                                            </StackPanel>
                                             <StackPanel Name="PART_ElemDescription" Margin="0,0,0,20">
-                                                <Grid HorizontalAlignment="Stretch" Margin="0,20,0,20" >
+                                                <Grid HorizontalAlignment="Stretch" Margin="0,0,0,20" >
                                                     <Grid.ColumnDefinitions>
                                                         <ColumnDefinition Width="*"/>
                                                         <ColumnDefinition Width="Auto"/>
@@ -504,14 +771,25 @@
                                                         <Image Name="PART_ImageIcon" Height="32" Width="32" SnapsToDevicePixels="True"
                                                                Margin="10,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Center"
                                                                StretchDirection="DownOnly" RenderOptions.BitmapScalingMode="Fant"/>
-                                                        <TextBlock Text="{DynamicResource AboutGameText}" Foreground="{DynamicResource TextBrush}"
+                                                        <TextBlock Foreground="{DynamicResource TextBrush}" Tag="{DynamicResource LOCGameDescriptionTitle}"
                                                                    FontSize="{DynamicResource FontSizeLarger}" FontFamily="{DynamicResource FontFamily}"
                                                                    Typography.Capitals="SmallCaps" Visibility="Visible" FontWeight="SemiBold"
-                                                                   VerticalAlignment="Center" Margin="10,0,10,0"/>
+                                                                   VerticalAlignment="Center" Margin="10,0,10,0">
+                                                            <TextBlock.Style>
+                                                                <Style TargetType="TextBlock">
+                                                                    <Setter Property="Text" Value="{DynamicResource LOCGameDescriptionTitle}"/>
+                                                                    <Style.Triggers>
+                                                                        <Trigger Property="Tag" Value="Description">
+                                                                            <Setter Property="Text" Value="About the Game"/>
+                                                                        </Trigger>
+                                                                    </Style.Triggers>
+                                                                </Style>
+                                                            </TextBlock.Style>
+                                                        </TextBlock>
                                                     </StackPanel>
                                                     <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="2"/>
                                                 </Grid>
-                                                <HtmlTextView Margin="0" x:Name="PART_HtmlDescription"
+                                                <HtmlTextView Margin="20,0,20,0" x:Name="PART_HtmlDescription"
                                                               HtmlFontSize="{DynamicResource FontSize}"
                                                               HtmlFontFamily="{DynamicResource FontFamily}"
                                                               HtmlForeground="{DynamicResource TextColor}"
@@ -519,11 +797,30 @@
                                                               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                                               ScrollViewer.VerticalScrollBarVisibility="Disabled" />
                                             </StackPanel>
+                                            <StackPanel Name="PART_ElemNotes" Margin="0,0,0,20">
+                                                <Grid HorizontalAlignment="Stretch" Margin="0,0,0,20" >
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="*"/>
+                                                        <ColumnDefinition Width="Auto"/>
+                                                        <ColumnDefinition Width="*"/>
+                                                    </Grid.ColumnDefinitions>
+                                                    <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="0"/>
+                                                    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1"
+                                                       Text="{DynamicResource LOCNotesLabel}" Margin="10,0,10,0" Foreground="{DynamicResource TextBrush}"
+                                                       FontSize="{DynamicResource FontSizeLarger}" FontFamily="{DynamicResource FontFamily}"
+                                                       Typography.Capitals="SmallCaps" Visibility="Visible" FontWeight="SemiBold" />
+                                                    <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="2"/>
+                                                </Grid>
+                                                <TextBox Name="PART_TextNotes" IsReadOnly="True"
+                                                     BorderThickness="0" Background="Transparent"
+                                                     AcceptsReturn="True" TextWrapping="Wrap"
+                                                     Margin="-1,5,-1,5" Padding="0"/>
+                                            </StackPanel>
                                         </StackPanel>
                                     </StackPanel>
-                                </ScrollViewer>
-                            </DockPanel>
-                        </Border>
+                                </DockPanel>
+                            </ScrollViewer>
+                        </Grid>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/Views/GridViewGameOverview.xaml b/Views/GridViewGameOverview.xaml
index 7bd8c32..c275306 100644
--- a/Views/GridViewGameOverview.xaml
+++ b/Views/GridViewGameOverview.xaml
@@ -26,8 +26,14 @@
                         </Border.Style>
                         <Grid>
 
-                            <TextBlock Name="LogoPath" Visibility="Collapsed" Tag="{DynamicResource ExtraMetadataPath}" Style="{DynamicResource ExtraMetadataLogoPath}"/>
-                            <TextBlock Name="HeaderPath" Visibility="Collapsed" Tag="{DynamicResource ExtraMetadataPath}" Style="{DynamicResource ExtraMetadataHeaderPath}"/>
+                            <TextBlock Name="LogoPath" Style="{DynamicResource ExtraMetadataLogoPath}"
+                                   Visibility="Collapsed" Tag="{DynamicResource ExtraMetadataPath}"/>
+                            <TextBlock Name="LogoLeftPath" Style="{DynamicResource ExtraMetadataLogoLeftPath}"
+                                   Visibility="Collapsed" Tag="{DynamicResource ExtraMetadataPath}"/>
+                            <TextBlock Name="LogoRightPath" Style="{DynamicResource ExtraMetadataLogoRightPath}"
+                                   Visibility="Collapsed" Tag="{DynamicResource ExtraMetadataPath}"/>
+                            <TextBlock Name="HeaderPath" Style="{DynamicResource ExtraMetadataHeaderPath}" 
+                                   Visibility="Collapsed"  Tag="{DynamicResource ExtraMetadataPath}"/>
 
                             <DockPanel>
                                 <Button HorizontalAlignment="Right" VerticalAlignment="Top"
@@ -78,9 +84,9 @@
                                                             <Setter Property="Source" Value="{Binding ElementName=HeaderPath, Path=Text}"/>
                                                             <Style.Triggers>
                                                                 <Trigger Property="Source" Value="{x:Null}">
-                                                                        <Setter Property="Visibility" Value="Collapsed" />
-                                                                    </Trigger>
-                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True">
+                                                                    <Setter Property="Visibility" Value="Collapsed" />
+                                                                </Trigger>
+                                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True">
                                                                     <Setter Property="Source" Value="{Binding ElementName=HeaderPath, Path=Text, Converter={StaticResource ImageStringToImageConverter}}"/>
                                                                 </DataTrigger>
                                                             </Style.Triggers>
@@ -101,8 +107,8 @@
                                                     <FadeImage x:Name="PART_ImageBackground" Grid.ColumnSpan="3"
                                                        Grid.RowSpan="3" Stretch="UniformToFill"
                                                        VerticalAlignment="Top" HorizontalAlignment="Center" />
-                                                    <Image HorizontalAlignment="Center" VerticalAlignment="Center" StretchDirection="DownOnly"
-                                                           Name="LogoImage" RenderOptions.BitmapScalingMode="Fant" Grid.Column="1" Grid.Row="1"
+                                                    <Image HorizontalAlignment="Center" VerticalAlignment="Center" Name="LogoImage"
+                                                           RenderOptions.BitmapScalingMode="Fant" Grid.Column="1" Grid.Row="1"
                                                            Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
                                                         <Image.Style>
                                                             <Style TargetType="Image">
@@ -115,6 +121,34 @@
                                                             </Style>
                                                         </Image.Style>
                                                     </Image>
+                                                    <Image HorizontalAlignment="Left" VerticalAlignment="Center" Name="LogoImageLeft"
+                                                           RenderOptions.BitmapScalingMode="Fant" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
+                                                           Margin="10,0,-10,0" Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
+                                                        <Image.Style>
+                                                            <Style TargetType="Image">
+                                                                <Setter Property="Source" Value="{Binding ElementName=LogoLeftPath, Path=Text}"/>
+                                                                <Style.Triggers>
+                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True">
+                                                                        <Setter Property="Source" Value="{Binding ElementName=LogoLeftPath, Path=Text, Converter={StaticResource ImageStringToImageConverter}}"/>
+                                                                    </DataTrigger>
+                                                                </Style.Triggers>
+                                                            </Style>
+                                                        </Image.Style>
+                                                    </Image>
+                                                    <Image HorizontalAlignment="Right" VerticalAlignment="Center" Name="LogoImageRight"
+                                                           RenderOptions.BitmapScalingMode="Fant" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2"
+                                                           Margin="-10,0,10,0" Tag="{DynamicResource UseAbsoluteExtraMetadataPath}">
+                                                        <Image.Style>
+                                                            <Style TargetType="Image">
+                                                                <Setter Property="Source" Value="{Binding ElementName=LogoRightPath, Path=Text}"/>
+                                                                <Style.Triggers>
+                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Tag}" Value="True">
+                                                                        <Setter Property="Source" Value="{Binding ElementName=LogoRightPath, Path=Text, Converter={StaticResource ImageStringToImageConverter}}"/>
+                                                                    </DataTrigger>
+                                                                </Style.Triggers>
+                                                            </Style>
+                                                        </Image.Style>
+                                                    </Image>
                                                     <Viewbox HorizontalAlignment="Center" VerticalAlignment="Center" StretchDirection="DownOnly"
                                                              Grid.Column="1" Grid.Row="1">
                                                         <TextBlock Text="{Binding Game.DisplayName}" Visibility="{DynamicResource TitleTextVisibility}"
@@ -132,9 +166,14 @@
                                                             <Style TargetType="Viewbox">
                                                                 <Setter Property="Visibility" Value="Collapsed"/>
                                                                 <Style.Triggers>
-                                                                    <DataTrigger Binding="{Binding ElementName=LogoImage, Path=Source}" Value="{x:Null}">
+                                                                    <MultiDataTrigger>
+                                                                        <MultiDataTrigger.Conditions>
+                                                                            <Condition Binding="{Binding ElementName=LogoImage, Path=Source}" Value="{x:Null}" />
+                                                                            <Condition Binding="{Binding ElementName=LogoImageLeft, Path=Source}" Value="{x:Null}" />
+                                                                            <Condition Binding="{Binding ElementName=LogoImageRight, Path=Source}" Value="{x:Null}" />
+                                                                        </MultiDataTrigger.Conditions>
                                                                         <Setter Property="Visibility" Value="Visible"/>
-                                                                    </DataTrigger>
+                                                                    </MultiDataTrigger>
                                                                 </Style.Triggers>
                                                             </Style>
                                                         </Viewbox.Style>
@@ -163,7 +202,7 @@
                                                     </Style.Triggers>
                                                 </Style>
                                             </Border.Style>
-                                            <Grid VerticalAlignment="Bottom" Background="Transparent" HorizontalAlignment="Stretch" Margin="10,10,5,0">
+                                            <Grid VerticalAlignment="Bottom" Background="Transparent" HorizontalAlignment="Stretch" Margin="10,10,5,10">
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition Width="Auto" />
                                                     <ColumnDefinition Width="Auto" />
@@ -194,8 +233,8 @@
                                                 </StackPanel>
                                                 <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
                                                     <StackPanel Tag="{DynamicResource Htlb_EnableIntegrationInCustomTheme}">
-                                                        <Button Name="PART_HltbCustomButton" Content="&#x23f3;"
-                                                    FontFamily="{DynamicResource SymbolFont}"/>
+                                                        <Button Name="PART_HltbCustomButton" Content="&#x23F1;" ToolTip="{DynamicResource LOCHowLongToBeat}"
+                                                                FontFamily="{DynamicResource SymbolFont}"/>
                                                         <StackPanel.Style>
                                                             <Style TargetType="StackPanel">
                                                                 <Setter Property="Visibility" Value="Collapsed" />
@@ -223,7 +262,7 @@
                                                             </Style>
                                                         </StackPanel.Style>
                                                     </StackPanel>
-                                                    
+
                                                     <Button x:Name="PART_ButtonEditGame" Margin="0"
                                                 FontFamily="{DynamicResource SymbolFont}" Content="&#xE104;"/>
                                                     <StackPanel.Style>
@@ -239,19 +278,6 @@
                                                 </StackPanel>
                                             </Grid>
                                         </Border>
-                                        <Grid HorizontalAlignment="Stretch" Margin="15,0,5,0" >
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="*"/>
-                                                <ColumnDefinition Width="Auto"/>
-                                                <ColumnDefinition Width="*"/>
-                                            </Grid.ColumnDefinitions>
-                                            <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="0"/>
-                                            <TextBlock Text="{DynamicResource LOCGameDetails}" Foreground="{DynamicResource TextBrush}" Margin="10,0,10,0"
-                                                       FontSize="{DynamicResource FontSizeLarger}" FontFamily="{DynamicResource FontFamily}"
-                                                       Typography.Capitals="SmallCaps" FontWeight="SemiBold" HorizontalAlignment="Center"
-                                                           VerticalAlignment="Center" Grid.Column="1"/>
-                                            <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="3" Grid.ColumnSpan="2"/>
-                                        </Grid>
                                     </StackPanel>
                                     <ScrollViewer DockPanel.Dock="Top" HorizontalAlignment="Stretch"
                                               HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
@@ -274,128 +300,178 @@
                                                     <Setter Property="Margin" Value="0"/>
                                                 </Style>
                                             </StackPanel.Resources>
-
-                                            <Border BorderBrush="Transparent" HorizontalAlignment="Stretch" Margin="5,0,5,0"
-                                                    BorderThickness="{DynamicResource ControlBorderThickness}"  Background="Transparent"
-                                                    CornerRadius="{DynamicResource ControlCornerRadius}" >
-                                                <Viewbox StretchDirection="DownOnly">
-                                                    <WrapPanel Orientation="Horizontal" Margin="10">
-                                                        <WrapPanel.Resources>
-                                                            <Style TargetType="ItemsControl">
-                                                                <Setter Property="VerticalAlignment" Value="Center" />
-                                                            </Style>
-                                                            <Style TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
-                                                                <Setter Property="Margin" Value="0,4,8,4" />
-                                                                <Setter Property="VerticalAlignment" Value="Top" />
-                                                                <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+                                            <Grid HorizontalAlignment="Stretch" Margin="0,0,0,20" >
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="*"/>
+                                                    <ColumnDefinition Width="Auto"/>
+                                                    <ColumnDefinition Width="*"/>
+                                                </Grid.ColumnDefinitions>
+                                                <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="0"/>
+                                                <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="0">
+                                                    <Image Name="PART_ImageIcon" Height="32" Width="32" SnapsToDevicePixels="True"
+                                                                   Margin="10,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                                                   StretchDirection="DownOnly" RenderOptions.BitmapScalingMode="Fant"/>
+                                                    <TextBlock Foreground="{DynamicResource TextBrush}" Tag="{DynamicResource LOCGameDescriptionTitle}"
+                                                                   FontSize="{DynamicResource FontSizeLarger}" FontFamily="{DynamicResource FontFamily}"
+                                                                   Typography.Capitals="SmallCaps" FontWeight="SemiBold"
+                                                                   VerticalAlignment="Center" Margin="10,0,10,0">
+                                                        <TextBlock.Style>
+                                                            <Style TargetType="TextBlock">
+                                                                <Setter Property="Text" Value="{DynamicResource LOCGameDescriptionTitle}"/>
+                                                                <Style.Triggers>
+                                                                    <Trigger Property="Tag" Value="Description">
+                                                                        <Setter Property="Text" Value="About the Game"/>
+                                                                    </Trigger>
+                                                                </Style.Triggers>
                                                             </Style>
-                                                            <Style TargetType="Button" BasedOn="{StaticResource PropertyItemButton}" />
-                                                        </WrapPanel.Resources>
-                                                        <GridEx Margin="0,0,15,0"
-                                                    ColumnCount="2" StarColumns="1"
-                                                    RowCount="10" AutoLayoutColumns="2">
-                                                            <Grid.Resources>
-                                                                <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}" />
-                                                            </Grid.Resources>
-
-                                                            <Label Name="PART_ElemPlayTime" Content="Play Time" />
-                                                            <TextBlock Name="PART_TextPlayTime" VerticalAlignment="Center" />
-
-                                                            <Label Name="PART_ElemLastPlayed" Content="{DynamicResource LOCLastPlayed}" />
-                                                            <TextBlock Name="PART_TextLastActivity" VerticalAlignment="Center" />
-
-                                                            <Label Name="PART_ElemCompletionStatus" Content="Completion" />
-                                                            <TextBlock Name="PART_TextCompletionStatus" VerticalAlignment="Center" />
-
-                                                            <Label Name="PART_ElemCategories" Content="{DynamicResource LOCGameCategoriesTitle}" />
-                                                            <ItemsControl Name="PART_ItemsCategories" />
-
-                                                            <Label Name="PART_ElemTags" Content="{DynamicResource LOCTagsLabel}" />
-                                                            <ItemsControl Name="PART_ItemsTags" />
-
-                                                            <Label Name="PART_ElemRegion" Content="{DynamicResource LOCRegionLabel}" />
-                                                            <Button Name="PART_ButtonRegion" VerticalAlignment="Center" />
-
-                                                            <Label Name="PART_ElemUserScore" Content="{DynamicResource LOCUserScore}" />
-                                                            <TextBlock Name="PART_TextUserScore" VerticalAlignment="Center"
-                                                           Style="{DynamicResource TextBlockGameScore}" />
-
-                                                            <Label Name="PART_ElemCommunityScore" Content="Comm. Score" />
-                                                            <TextBlock Name="PART_TextCommunityScore" VerticalAlignment="Center"
-                                                           Style="{DynamicResource TextBlockGameScore}" />
-
-                                                            <Label Name="PART_ElemCriticScore" Content="{DynamicResource LOCCriticScore}" />
-                                                            <TextBlock Name="PART_TextCriticScore" VerticalAlignment="Center"
-                                                           Style="{DynamicResource TextBlockGameScore}" />
-
-                                                            <Label Name="PART_ElemLinks" Content="{DynamicResource LOCLinksLabel}" />
-                                                            <ItemsControl Name="PART_ItemsLinks" />
-                                                        </GridEx>
-                                                        <Border BorderBrush="{DynamicResource NormalBorderBrush}" BorderThickness="1,0,0,0" Margin="-1,0,0,0">
-                                                            <GridEx Margin="15,0,0,0"
-                                                    ColumnCount="2" StarColumns="1"
-                                                    RowCount="11" AutoLayoutColumns="2">
-                                                                <Grid.Resources>
-                                                                    <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}" />
-                                                                </Grid.Resources>
-
-                                                                <Label Name="PART_ElemLibrary" Content="{DynamicResource LOCGameProviderTitle}" />
-                                                                <Button Name="PART_ButtonLibrary" VerticalAlignment="Center" />
-
-                                                                <Label Name="PART_ElemVersion" Content="{DynamicResource LOCVersionLabel}" />
-                                                                <Button Name="PART_ButtonVersion" VerticalAlignment="Center" />
-
-                                                                <Label Name="PART_ElemSource" Content="{DynamicResource LOCSourceLabel}" />
-                                                                <Button Name="PART_ButtonSource" VerticalAlignment="Center" />
-
-                                                                <Label Name="PART_ElemPlatform" Content="{DynamicResource LOCPlatformTitle}" />
-                                                                <Button Name="PART_ButtonPlatform" VerticalAlignment="Center" />
-
-                                                                <Label Name="PART_ElemGenres" Content="{DynamicResource LOCGenreLabel}" />
-                                                                <ItemsControl Name="PART_ItemsGenres"  />
-
-                                                                <Label Name="PART_ElemFeatures" Content="{DynamicResource LOCFeaturesLabel}" />
-                                                                <ItemsControl Name="PART_ItemsFeatures" />
-
-                                                                <Label Name="PART_ElemDevelopers" Content="{DynamicResource LOCDeveloperLabel}" />
-                                                                <ItemsControl Name="PART_ItemsDevelopers" />
-
-                                                                <Label Name="PART_ElemPublishers" Content="{DynamicResource LOCPublisherLabel}" />
-                                                                <ItemsControl Name="PART_ItemsPublishers" />
-
-                                                                <Label Name="PART_ElemReleaseDate" Content="Released" />
-                                                                <Button Name="PART_ButtonReleaseDate" VerticalAlignment="Center" />
-
-                                                                <Label Name="PART_ElemSeries" Content="{DynamicResource LOCSeriesLabel}" />
-                                                                <Button Name="PART_ButtonSeries" VerticalAlignment="Center" />
-
-                                                                <Label Name="PART_ElemAgeRating" Content="{DynamicResource LOCAgeRatingLabel}" />
-                                                                <Button Name="PART_ButtonAgeRating" VerticalAlignment="Center" />
+                                                        </TextBlock.Style>
+                                                    </TextBlock>
+                                                </StackPanel>
+                                                <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="2"/>
+                                            </Grid>
+                                            <Expander Margin="-10,0,0,20" HorizontalAlignment="Stretch">
+                                                <Expander.Header>
+                                                    <TextBlock Text="{DynamicResource LOCMoreAction}" Foreground="{DynamicResource GlyphBrush}" Margin="0,10,0,10"
+                                                                   FontSize="{DynamicResource FontSizeLarge}" FontFamily="{DynamicResource FontFamily}"
+                                                                   Typography.Capitals="SmallCaps" FontWeight="SemiBold" HorizontalAlignment="Left"
+                                                                   VerticalAlignment="Center" />
+                                                </Expander.Header>
+                                                <Expander.Resources>
+                                                    <Style TargetType="StackPanel">
+                                                        <Setter Property="Orientation" Value="Horizontal"/>
+                                                        <Setter Property="VerticalAlignment" Value="Top"/>
+                                                    </Style>
+                                                    <Style TargetType="ItemsControl">
+                                                        <Setter Property="VerticalAlignment" Value="Center" />
+                                                        <Setter Property="Margin" Value="0,0,10,10" />
+                                                        <Setter Property="MinWidth" Value="140"/>
 
-                                                            </GridEx>
-                                                        </Border>
+                                                    </Style>
+                                                    <Style TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
+                                                        <Setter Property="HorizontalAlignment" Value="Right" />
+                                                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                                                        <Setter Property="VerticalAlignment" Value="Top"/>
+                                                        <Setter Property="MinWidth" Value="30"/>
+                                                        <Setter Property="Margin" Value="0,0,10,10" />
+                                                        <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}"/>
+                                                        <Setter Property="FontSize" Value="{DynamicResource FontSizeLarger}" />
+                                                        <Setter Property="FontFamily" Value="{DynamicResource SymbolFont}"/>
+                                                    </Style>
+                                                    <Style TargetType="Button" BasedOn="{StaticResource PropertyItemButton}" >
+                                                        <Setter Property="Margin" Value="0,0,10,10" />
+                                                        <Setter Property="VerticalAlignment" Value="Center"/>
+                                                        <Setter Property="MinWidth" Value="140"/>
+                                                    </Style>
+                                                    <Style TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}" >
+                                                        <Setter Property="Margin" Value="0,0,10,10" />
+                                                        <Setter Property="VerticalAlignment" Value="Center"/>
+                                                        <Setter Property="MinWidth" Value="140"/>
+                                                    </Style>
+                                                </Expander.Resources>
+                                                <StackPanel Orientation="Vertical">
+                                                    <WrapPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemPlayTime" Content="&#xE121;" ToolTip="{DynamicResource LOCTimePlayed}"/>
+                                                            <TextBlock Name="PART_TextPlayTime" />
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemLastPlayed" Content="&#xE163;" ToolTip="{DynamicResource LOCLastPlayed}"/>
+                                                            <TextBlock Name="PART_TextLastActivity" />
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemCompletionStatus" Content="&#xE10B;" ToolTip="{DynamicResource LOCCompletionStatus}"/>
+                                                            <TextBlock Name="PART_TextCompletionStatus" />
+                                                        </StackPanel>
                                                     </WrapPanel>
-                                                </Viewbox>
-                                            </Border>
-                                            <StackPanel Name="PART_ElemDescription" Margin="0,20,0,0">
-                                                <Grid HorizontalAlignment="Stretch" Margin="0,20,0,20" >
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="Auto"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="0"/>
-                                                    <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="0">
-                                                        <Image Name="PART_ImageIcon" Height="32" Width="32" SnapsToDevicePixels="True"
-                                                                   Margin="10,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                                                   StretchDirection="DownOnly" RenderOptions.BitmapScalingMode="Fant"/>
-                                                        <TextBlock Text="{DynamicResource AboutGameText}" Foreground="{DynamicResource TextBrush}"
-                                                               FontSize="{DynamicResource FontSizeLarger}" FontFamily="{DynamicResource FontFamily}"
-                                                               Typography.Capitals="SmallCaps" Visibility="Visible" FontWeight="SemiBold"
-                                                               VerticalAlignment="Center" Margin="10,0,10,0"/>
-                                                    </StackPanel>
-                                                    <Separator Margin="0" Background="{DynamicResource HoverBrush}" Grid.Column="2"/>
-                                                </Grid>
+                                                    <WrapPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemLibrary" Content="&#xEF65;" FontFamily="{DynamicResource FontIcoFont}"
+                                                                   ToolTip="{DynamicResource LOCGameProviderTitle}"/>
+                                                            <Button Name="PART_ButtonLibrary"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemSource" Content="&#xE14D;" ToolTip="{DynamicResource LOCSourceLabel}"/>
+                                                            <Button Name="PART_ButtonSource"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemCategories" Content="&#xE188;" ToolTip="{DynamicResource LOCGameCategoriesTitle}"/>
+                                                            <ItemsControl Name="PART_ItemsCategories"/>
+                                                        </StackPanel>
+                                                    </WrapPanel>
+                                                    <WrapPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemUserScore" Content="&#xE13D;" ToolTip="{DynamicResource LOCUserScore}"/>
+                                                            <TextBlock Name="PART_TextUserScore" Style="{DynamicResource TextBlockGameScore}"
+                                                                       VerticalAlignment="Center" Margin="0,0,10,10" MinWidth="140"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemCommunityScore" Content="&#xE125;" ToolTip="{DynamicResource LOCCommunityScore}"/>
+                                                            <TextBlock Name="PART_TextCommunityScore" Style="{DynamicResource TextBlockGameScore}"
+                                                                       VerticalAlignment="Center" Margin="0,0,10,10" MinWidth="140"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemCriticScore" Content="&#xE136;" ToolTip="{DynamicResource LOCCriticScore}"/>
+                                                            <TextBlock Name="PART_TextCriticScore" Style="{DynamicResource TextBlockGameScore}"
+                                                                       VerticalAlignment="Center" Margin="0,0,10,10" MinWidth="140"/>
+                                                        </StackPanel>
+                                                    </WrapPanel>
+                                                    <WrapPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemPlatform" Content="&#xEA32;" FontFamily="{DynamicResource FontIcoFont}"
+                                                                   ToolTip="{DynamicResource LOCPlatformTitle}"/>
+                                                            <Button Name="PART_ButtonPlatform"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemReleaseDate" Content="&#x1F382;" ToolTip="{DynamicResource LOCGameReleaseDateTitle}"/>
+                                                            <Button Name="PART_ButtonReleaseDate"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemSeries" Content="&#xE158;" ToolTip="{DynamicResource LOCSeriesLabel}"/>
+                                                            <Button Name="PART_ButtonSeries"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemDevelopers" Content="&#xE144;" ToolTip="{DynamicResource LOCDeveloperLabel}"/>
+                                                            <ItemsControl Name="PART_ItemsDevelopers" />
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemPublishers" Content="&#x1F454;" ToolTip="{DynamicResource LOCPublisherLabel}"/>
+                                                            <ItemsControl Name="PART_ItemsPublishers" />
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemAgeRating" Content="&#x26D4;" ToolTip="{DynamicResource LOCAgeRatingLabel}"/>
+                                                            <Button Name="PART_ButtonAgeRating" />
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemVersion" Content="&#xE15E;" ToolTip="{DynamicResource LOCVersionLabel}"/>
+                                                            <Button Name="PART_ButtonVersion"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemRegion" Content="&#xE128;" ToolTip="{DynamicResource LOCRegionLabel}"/>
+                                                            <Button Name="PART_ButtonRegion"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemGenres" Content="&#x1F3AD;" ToolTip="{DynamicResource LOCGenreLabel}"/>
+                                                            <ItemsControl Name="PART_ItemsGenres"/>
+                                                        </StackPanel>
+                                                    </WrapPanel>
+                                                    <WrapPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemTags" Content="&#xE1CB;" ToolTip="{DynamicResource LOCTagsLabel}"/>
+                                                            <ItemsControl Name="PART_ItemsTags"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemFeatures" Content="&#xE133;" ToolTip="{DynamicResource LOCFeaturesLabel}"/>
+                                                            <ItemsControl Name="PART_ItemsFeatures"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <Label Name="PART_ElemLinks" Content="&#xEF71;" FontFamily="{DynamicResource FontIcoFont}"
+                                                                   ToolTip="{DynamicResource LOCLinksLabel}"/>
+                                                            <ItemsControl Name="PART_ItemsLinks"/>
+                                                        </StackPanel>
+                                                    </WrapPanel>
+                                                </StackPanel>
+                                            </Expander>
+                                            <StackPanel Name="PART_ElemDescription" Margin="0,0,0,20">
                                                 <HtmlTextView Name="PART_HtmlDescription"
                                                       Margin="5,0,0,0"
                                                       HtmlFontSize="{DynamicResource FontSize}"
@@ -405,8 +481,8 @@
                                                       ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                                       ScrollViewer.VerticalScrollBarVisibility="Disabled" />
                                             </StackPanel>
-                                            <StackPanel Name="PART_ElemNotes" Margin="0,20,0,0">
-                                                <Grid HorizontalAlignment="Stretch" Margin="0,20,0,20" >
+                                            <StackPanel Name="PART_ElemNotes" Margin="0,0,0,20">
+                                                <Grid HorizontalAlignment="Stretch" Margin="0,0,0,20" >
                                                     <Grid.ColumnDefinitions>
                                                         <ColumnDefinition Width="*"/>
                                                         <ColumnDefinition Width="Auto"/>
diff --git a/Views/LibraryGridView.xaml b/Views/LibraryGridView.xaml
index 5f65a50..86b92a8 100644
--- a/Views/LibraryGridView.xaml
+++ b/Views/LibraryGridView.xaml
@@ -59,11 +59,16 @@
                                     </Style>
                                 </TextBlock.Style>
                             </TextBlock>
-                            <StackPanel Margin="5" Orientation="Horizontal" Grid.Row="1">
-                                <Label FontFamily="{DynamicResource SymbolFont}" Content="&#xe12e;" Foreground="{DynamicResource TextBrushDarker}" Margin="10,0,10,0"/>
-                                <Border>
-                                    <SliderWithPopup x:Name="PART_SliderZoom" />
-                                </Border>
+                            <StackPanel Margin="5" Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Left">
+                                <Label FontFamily="{DynamicResource SymbolFont}" Content="&#xE1D8;" Foreground="{DynamicResource TextBrushDarker}" Margin="10,0,10,0"/>
+                                <SliderWithPopup x:Name="PART_SliderZoom" />
+                                <Label FontFamily="{DynamicResource SymbolFont}" Content="&#xE1D9;" Foreground="{DynamicResource TextBrushDarker}" Margin="10,0,10,0"/>
+                                <StackPanel.Effect>
+                                    <DropShadowEffect ShadowDepth="0"
+                                                         Color="Black"
+                                                         Opacity="1"
+                                                         BlurRadius="2"/>
+                                </StackPanel.Effect>
                             </StackPanel>
                         </Grid>
                     </DockPanel>
diff --git a/Views/Sidebar.xaml b/Views/Sidebar.xaml
index b05abc5..0ed6ad9 100644
--- a/Views/Sidebar.xaml
+++ b/Views/Sidebar.xaml
@@ -3,20 +3,22 @@
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
                     mc:Ignorable="d">
-    
+
     <Style TargetType="{x:Type Sidebar}">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Sidebar}">
                     <Border BorderThickness="0,0,1,0" BorderBrush="{DynamicResource PanelSeparatorBrush}"
                             x:Name="BorderContentHolder" Background="{DynamicResource TitlebarBrush}">
-                        <DockPanel x:Name="DockContentHolder">                            
+                        <DockPanel x:Name="DockContentHolder">
                             <Border x:Name="PART_ElemMainMenu" Background="Transparent"
                                     Width="44" Height="44" Margin="0,0,0,5"
                                     DockPanel.Dock="Top" Padding="5" Cursor="Hand"
                                     WindowChrome.IsHitTestVisibleInChrome="True">
-                                <Image Source="{ThemeFile 'Images/applogo_white.ico'}"
-                                       RenderOptions.BitmapScalingMode="Fant" />
+                                <Viewbox>
+                                    <Label Content="&#x2261;" FontFamily="{DynamicResource SymbolFont}"
+                                           FontSize="48" Margin="0,-18,0,-8"/>
+                                </Viewbox>
                             </Border>
 
                             <ItemsControl x:Name="PART_ListSideBarItems"
diff --git a/theme.yaml b/theme.yaml
index 519a0a8..d598faf 100644
--- a/theme.yaml
+++ b/theme.yaml
@@ -2,11 +2,11 @@ ThemeApiVersion: 1.9.0
 Id: Magpie_Desktop
 Name: Magpie
 Author: Dan Davis
-Version: 0.8.4
+Version: 0.9.0
 Constants:
+  - BGModeOn: Off for banners on for backgrounds in details.
   - UseAbsoluteExtraMetadataPath: Use absolute path to your Playnite config folder.
   - ExtraMetadataPath: That path; no ending backslash.
-  - AboutGameText: About the Game DIY Localization.
   - DetailsViewPanelWidth(640,2560): Width of main details view panel.
   - TitleTextVisibility: Visibility of Title shown if missing logo.
   - TitlebarBrush: Titlebar background.