diff --git a/src/NileLibrarySettingsView.xaml b/src/NileLibrarySettingsView.xaml
index a19caad..f4695ca 100644
--- a/src/NileLibrarySettingsView.xaml
+++ b/src/NileLibrarySettingsView.xaml
@@ -20,100 +20,104 @@
     <TabControl ScrollViewer.VerticalScrollBarVisibility="Disabled"
         HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
         <TabItem Header="{DynamicResource LOCNile3P_PlayniteSettingsGeneralLabel}">
-            <StackPanel Margin="20">
-                <CheckBox DockPanel.Dock="Top" Name="AmazonImportInstalledChk"
+            <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
+                <StackPanel Margin="20">
+                    <CheckBox DockPanel.Dock="Top" Name="AmazonImportInstalledChk"
                   Margin="0,0,0,15"
                   IsChecked="{Binding Settings.ImportInstalledGames}"
                   Content="{DynamicResource LOCNile3P_AmazonSettingsImportInstalledLabel}"/>
 
-                <CheckBox DockPanel.Dock="Top" Name="AmazonConnectAccountChk"
+                    <CheckBox DockPanel.Dock="Top" Name="AmazonConnectAccountChk"
                   IsChecked="{Binding Settings.ConnectAccount}"
                   Content="{DynamicResource LOCNile3P_AmazonSettingsConnectAccount}" Checked="AmazonConnectAccountChk_Checked"/>
 
-                <StackPanel DockPanel.Dock="Top" Margin="40,5,5,5"
+                    <StackPanel DockPanel.Dock="Top" Margin="40,5,5,5"
                     IsEnabled="{Binding IsChecked, ElementName=AmazonConnectAccountChk}">
 
-                    <CheckBox DockPanel.Dock="Top" Name="AmazonImportUninstalledChk"
+                        <CheckBox DockPanel.Dock="Top" Name="AmazonImportUninstalledChk"
                       IsChecked="{Binding Settings.ImportUninstalledGames}"
                       Margin="0,10,0,0"
                       Content="{DynamicResource LOCNile3P_AmazonSettingsImportUninstalledLabel}"/>
 
-                    <StackPanel Orientation="Horizontal"
+                        <StackPanel Orientation="Horizontal"
                         DockPanel.Dock="Top" Margin="0,15,5,5" HorizontalAlignment="Left">
-                        <ToggleButton HorizontalAlignment="Left" Name="LoginBtn" Content="{DynamicResource LOCNile3P_AmazonAuthenticateLabel}" IsChecked="False" Click="LoginBtn_Click" />
-                        <TextBlock VerticalAlignment="Center" Margin="10,5,5,5"  Name="AuthStatusTB" Text="{DynamicResource LOCNile3P_AmazonLoginChecking}">
-                        </TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" Name="LoginBtn" Content="{DynamicResource LOCNile3P_AmazonAuthenticateLabel}" IsChecked="False" Click="LoginBtn_Click" />
+                            <TextBlock VerticalAlignment="Center" Margin="10,5,5,5"  Name="AuthStatusTB" Text="{DynamicResource LOCNile3P_AmazonLoginChecking}">
+                            </TextBlock>
+                        </StackPanel>
                     </StackPanel>
-                </StackPanel>
 
-                <Button Content="{DynamicResource LOCNileMigrateGamesAmazon}" HorizontalAlignment="Left" Margin="0,5,0,10" Name="MigrateAmazonBtn" IsEnabled="False" Click="MigrateAmazonBtn_Click"></Button>
-                
-                <CheckBox IsChecked="{Binding Settings.StartGamesWithoutLauncher}"
+                    <Button Content="{DynamicResource LOCNileMigrateGamesAmazon}" HorizontalAlignment="Left" Margin="0,5,0,10" Name="MigrateAmazonBtn" IsEnabled="False" Click="MigrateAmazonBtn_Click"></Button>
+
+                    <CheckBox IsChecked="{Binding Settings.StartGamesWithoutLauncher}"
                   Content="{DynamicResource LOCNile3P_AmazonSettingsStartGameDirectly}"
                   Margin="0,5,0,0" />
 
-                <StackPanel Margin="0,20,0,0">
-                    <TextBlock Text="{DynamicResource LOCNile3P_PlayniteExtensionsUpdates}" FontSize="18"
+                    <StackPanel Margin="0,20,0,0">
+                        <TextBlock Text="{DynamicResource LOCNile3P_PlayniteExtensionsUpdates}" FontSize="18"
                         Margin="0,0,0,2" />
-                    <Separator Margin="0,0,0,10" />
-                    <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
-                        <TextBlock Text="{DynamicResource LOCNileLauncherUpdatePolicy}" VerticalAlignment="Center" HorizontalAlignment="Left"></TextBlock>
-                        <ComboBox Grid.Row="0" Grid.Column="1" x:Name="LauncherUpdatesCBo" DisplayMemberPath="Value" SelectedValue="{Binding Settings.LauncherUpdatePolicy}" SelectedValuePath="Key" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" HorizontalAlignment="Left" Margin="10,0,0,0" />
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
-                        <TextBlock Text="{DynamicResource LOCNileGamesUpdatePolicy}" VerticalAlignment="Center" HorizontalAlignment="Left"></TextBlock>
-                        <ComboBox Grid.Row="0" Grid.Column="1" x:Name="GamesUpdatesCBo" DisplayMemberPath="Value" SelectedValue="{Binding Settings.GamesUpdatePolicy}" SelectedValuePath="Key" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" HorizontalAlignment="Left" Margin="10,0,0,0" SelectionChanged="GamesUpdatesCBo_SelectionChanged" />
+                        <Separator Margin="0,0,0,10" />
+                        <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
+                            <TextBlock Text="{DynamicResource LOCNileLauncherUpdatePolicy}" VerticalAlignment="Center" HorizontalAlignment="Left"></TextBlock>
+                            <ComboBox Grid.Row="0" Grid.Column="1" x:Name="LauncherUpdatesCBo" DisplayMemberPath="Value" SelectedValue="{Binding Settings.LauncherUpdatePolicy}" SelectedValuePath="Key" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" HorizontalAlignment="Left" Margin="10,0,0,0" />
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
+                            <TextBlock Text="{DynamicResource LOCNileGamesUpdatePolicy}" VerticalAlignment="Center" HorizontalAlignment="Left"></TextBlock>
+                            <ComboBox Grid.Row="0" Grid.Column="1" x:Name="GamesUpdatesCBo" DisplayMemberPath="Value" SelectedValue="{Binding Settings.GamesUpdatePolicy}" SelectedValuePath="Key" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" HorizontalAlignment="Left" Margin="10,0,0,0" SelectionChanged="GamesUpdatesCBo_SelectionChanged" />
+                        </StackPanel>
+                        <CheckBox Content="{DynamicResource LOCNileAutoUpdate}" Margin="0,0,0,10" Name="AutoUpdateGamesChk" IsChecked="{Binding Settings.AutoUpdateGames}"></CheckBox>
                     </StackPanel>
-                    <CheckBox Content="{DynamicResource LOCNileAutoUpdate}" Margin="0,0,0,10" Name="AutoUpdateGamesChk" IsChecked="{Binding Settings.AutoUpdateGames}"></CheckBox>
                 </StackPanel>
-            </StackPanel>
+            </ScrollViewer>
         </TabItem>
         <TabItem Header="{DynamicResource LOCNileDownloadSettings}">
-            <StackPanel Margin="20">
-                <CheckBox Grid.Column="0" Grid.Row="0"
+            <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
+                <StackPanel Margin="20">
+                    <CheckBox Grid.Column="0" Grid.Row="0"
                             Content="{DynamicResource LOCNileDisplayDownloadTaskFinishedNotifications}"
                             IsChecked="{Binding Settings.DisplayDownloadTaskFinishedNotifications}" Margin="0,0,0,10" />
-                <CheckBox Grid.Column="0" Grid.Row="1"
+                    <CheckBox Grid.Column="0" Grid.Row="1"
                             Content="{DynamicResource LOCNileDisplayDownloadSpeedInBits}"
                             IsChecked="{Binding Settings.DisplayDownloadSpeedInBits}" Margin="0,0,0,10" />
-                <CheckBox Grid.Column="0" Grid.Row="5"
+                    <CheckBox Grid.Column="0" Grid.Row="5"
                             Content="{DynamicResource LOCNileUnattendedInstall}" ToolTip="{DynamicResource LOCNileUnattendedInstallToolTip}"
                             IsChecked="{Binding Settings.UnattendedInstall}" Margin="0,0,0,10" />
-                <DockPanel Margin="0,0,0,5">
-                    <TextBlock Text="{DynamicResource LOCNileGamesInstallationPath}" Grid.Row="1" Grid.Column="0"
+                    <DockPanel Margin="0,0,0,5">
+                        <TextBlock Text="{DynamicResource LOCNileGamesInstallationPath}" Grid.Row="1" Grid.Column="0"
                                Margin="0,0,7,0" VerticalAlignment="Center" HorizontalAlignment="Left">
-                    </TextBlock>
-                    <Button Margin="5 0 0 0" DockPanel.Dock="Right"
+                        </TextBlock>
+                        <Button Margin="5 0 0 0" DockPanel.Dock="Right"
                             Name="ChooseGamePathBtn" Click="ChooseGamePathBtn_Click" Content="&#xec5b;" 
                             FontFamily="{DynamicResource FontIcoFont}" ToolTip="{DynamicResource LOCNile3P_PlayniteSelectDirectoryTooltip}"
                             VerticalAlignment="Center" />
-                    <TextBox Name="SelectedGamePathTxt"
+                        <TextBox Name="SelectedGamePathTxt"
                         Text="{Binding Settings.GamesInstallationPath, UpdateSourceTrigger=PropertyChanged}"
                         VerticalAlignment="Center" />
-                </DockPanel>
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition x:Name="Left" Width="Auto" />
-                        <ColumnDefinition x:Name="Right" Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
-                    </Grid.RowDefinitions>
-                    <TextBlock Text="{DynamicResource LOCNileMaxWorkers}" Grid.Column="0"
+                    </DockPanel>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition x:Name="Left" Width="Auto" />
+                            <ColumnDefinition x:Name="Right" Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition></RowDefinition>
+                            <RowDefinition></RowDefinition>
+                            <RowDefinition></RowDefinition>
+                        </Grid.RowDefinitions>
+                        <TextBlock Text="{DynamicResource LOCNileMaxWorkers}" Grid.Column="0"
                             Grid.Row="0" Margin="0,0,10,5" VerticalAlignment="Center" HorizontalAlignment="Left" />
-                    <common:NumericInput Grid.Row="0" Grid.Column="1" Margin="0,0,0,5" MinValue="0" x:Name="MaxWorkersNI" Value="{Binding Settings.MaxWorkers}" HorizontalAlignment="Left"/>
-                    <TextBlock Grid.Column="0" Grid.Row="1"
+                        <common:NumericInput Grid.Row="0" Grid.Column="1" Margin="0,0,0,5" MinValue="0" x:Name="MaxWorkersNI" Value="{Binding Settings.MaxWorkers}" HorizontalAlignment="Left"/>
+                        <TextBlock Grid.Column="0" Grid.Row="1"
                             Text="{DynamicResource LOCNileAfterDownloadComplete}" Margin="0,0,10,5" VerticalAlignment="Center" HorizontalAlignment="Left"  />
-                    <ComboBox Grid.Column="1" Grid.Row="1" x:Name="AfterDownloadCompleteCBo" DisplayMemberPath="Value" SelectedValue="{Binding Settings.DoActionAfterDownloadComplete}" SelectedValuePath="Key"  VerticalAlignment="Center" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Margin="0,0,0,5" HorizontalAlignment="Left"/>
-                    <TextBlock Grid.Row="2" Grid.Column="0" Text="{DynamicResource LOCNileAutoRemoveCompletedDownloads}" Margin="0,0,0,5" VerticalAlignment="Center" HorizontalAlignment="Left"></TextBlock>
-                    <ComboBox Grid.Row="2" Grid.Column="1" x:Name="AutoRemoveCompletedDownloadsCBo" DisplayMemberPath="Value" SelectedValue="{Binding Settings.AutoRemoveCompletedDownloads}" SelectedValuePath="Key" VerticalContentAlignment="Center" HorizontalContentAlignment="Left"  Margin="10,0,0,5" HorizontalAlignment="Left" />
-                </Grid>
-            </StackPanel>
+                        <ComboBox Grid.Column="1" Grid.Row="1" x:Name="AfterDownloadCompleteCBo" DisplayMemberPath="Value" SelectedValue="{Binding Settings.DoActionAfterDownloadComplete}" SelectedValuePath="Key"  VerticalAlignment="Center" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Margin="0,0,0,5" HorizontalAlignment="Left"/>
+                        <TextBlock Grid.Row="2" Grid.Column="0" Text="{DynamicResource LOCNileAutoRemoveCompletedDownloads}" Margin="0,0,0,5" VerticalAlignment="Center" HorizontalAlignment="Left"></TextBlock>
+                        <ComboBox Grid.Row="2" Grid.Column="1" x:Name="AutoRemoveCompletedDownloadsCBo" DisplayMemberPath="Value" SelectedValue="{Binding Settings.AutoRemoveCompletedDownloads}" SelectedValuePath="Key" VerticalContentAlignment="Center" HorizontalContentAlignment="Left"  Margin="10,0,0,5" HorizontalAlignment="Left" />
+                    </Grid>
+                </StackPanel>
+            </ScrollViewer>
         </TabItem>
         <TabItem Header="{DynamicResource LOCNile3P_PlayniteSettingsAdvancedLabel}">
-            <ScrollViewer>
+            <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
                 <StackPanel Margin="20">
                     <DockPanel>
                         <TextBlock Text="{DynamicResource LOCNileLauncherCustomPath}"
@@ -147,75 +151,77 @@
             </ScrollViewer>
         </TabItem>
         <TabItem Header="{DynamicResource LOCNileTroubleshootingInformation}">
-            <StackPanel Margin="20">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
-                        <RowDefinition></RowDefinition>
-                    </Grid.RowDefinitions>
-                    <TextBlock Text="{DynamicResource LOCNilePlayniteVersion}" Grid.Column="0" Grid.Row="0"
+            <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
+                <StackPanel Margin="20">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition></RowDefinition>
+                            <RowDefinition></RowDefinition>
+                            <RowDefinition></RowDefinition>
+                            <RowDefinition></RowDefinition>
+                            <RowDefinition></RowDefinition>
+                            <RowDefinition></RowDefinition>
+                            <RowDefinition></RowDefinition>
+                            <RowDefinition></RowDefinition>
+                            <RowDefinition></RowDefinition>
+                            <RowDefinition></RowDefinition>
+                            <RowDefinition></RowDefinition>
+                        </Grid.RowDefinitions>
+                        <TextBlock Text="{DynamicResource LOCNilePlayniteVersion}" Grid.Column="0" Grid.Row="0"
                                Margin="0,0,10,5" VerticalAlignment="Center">
-                    </TextBlock>
-                    <TextBox x:Name="PlayniteVersionTxt" Grid.Column="1" Grid.Row="0" Margin="0,0,0,5" 
+                        </TextBlock>
+                        <TextBox x:Name="PlayniteVersionTxt" Grid.Column="1" Grid.Row="0" Margin="0,0,0,5" 
                              VerticalAlignment="Bottom" IsReadOnly="True" HorizontalAlignment="Left"/>
-                    <TextBlock Text="{DynamicResource LOCNilePluginVersion}" Grid.Column="0" Grid.Row="1"
+                        <TextBlock Text="{DynamicResource LOCNilePluginVersion}" Grid.Column="0" Grid.Row="1"
                                Margin="0,0,10,5" VerticalAlignment="Center" />
-                    <TextBox x:Name="PluginVersionTxt" Grid.Column="1" Grid.Row="1" Margin="0,0,0,5" 
+                        <TextBox x:Name="PluginVersionTxt" Grid.Column="1" Grid.Row="1" Margin="0,0,0,5" 
                              VerticalAlignment="Center" IsReadOnly="True" HorizontalAlignment="Left"/>
-                    <TextBlock Text="{DynamicResource LOCNileLauncherVersion}" Grid.Column="0" Grid.Row="2"
+                        <TextBlock Text="{DynamicResource LOCNileLauncherVersion}" Grid.Column="0" Grid.Row="2"
                                Margin="0,0,10,5" VerticalAlignment="Center" />
-                    <TextBox x:Name="LauncherVersionTxt" Grid.Column="1" Grid.Row="2" Margin="0,0,0,5" VerticalAlignment="Center" 
+                        <TextBox x:Name="LauncherVersionTxt" Grid.Column="1" Grid.Row="2" Margin="0,0,0,5" VerticalAlignment="Center" 
                              IsReadOnly="True" HorizontalAlignment="Left"/>
-                    <Button x:Name="CheckForNileUpdatesBtn" Grid.Column="2" Grid.Row="2" Margin="10,0,0,5" VerticalAlignment="Center"
+                        <Button x:Name="CheckForNileUpdatesBtn" Grid.Column="2" Grid.Row="2" Margin="10,0,0,5" VerticalAlignment="Center"
                             Content="{DynamicResource LOCNile3P_PlayniteCheckForUpdates}" Click="CheckForNileUpdatesBtn_Click" />
-                    <TextBlock Text="{DynamicResource LOCNileLauncherBinary}" Grid.Column="0" Grid.Row="4"
+                        <TextBlock Text="{DynamicResource LOCNileLauncherBinary}" Grid.Column="0" Grid.Row="4"
                                Margin="0,0,10,5" VerticalAlignment="Center"/>
-                    <TextBox x:Name="NileBinaryTxt" VerticalAlignment="Center" IsReadOnly="True" Grid.Column="1" Grid.Row="4" Margin="0,0,0,5"/>
-                    <Button x:Name="OpenNileBinaryBtn" Margin="10,0,0,5" Content="{DynamicResource LOCNile3P_PlayniteOpen}" 
+                        <TextBox x:Name="NileBinaryTxt" VerticalAlignment="Center" IsReadOnly="True" Grid.Column="1" Grid.Row="4" Margin="0,0,0,5"/>
+                        <Button x:Name="OpenNileBinaryBtn" Margin="10,0,0,5" Content="{DynamicResource LOCNile3P_PlayniteOpen}" 
                                 VerticalAlignment="Center"  Grid.Column="2" Grid.Row="4" Click="OpenNileBinaryBtn_Click" />
-                    <TextBlock Text="{DynamicResource LOCNileGamesInstallationPath}" Grid.Row="6" Grid.Column="0"
+                        <TextBlock Text="{DynamicResource LOCNileGamesInstallationPath}" Grid.Row="6" Grid.Column="0"
                                Margin="0,0,10,5" VerticalAlignment="Center"/>
-                    <TextBox x:Name="GamesInstallationPathTxt" Margin="0,0,0,5" VerticalAlignment="Center" IsReadOnly="True" Grid.Column="1" Grid.Row="6" />
-                    <Button x:Name="OpenGamesInstallationPathBtn" Margin="10,0,0,5" Content="{DynamicResource LOCNile3P_PlayniteOpen}" 
+                        <TextBox x:Name="GamesInstallationPathTxt" Margin="0,0,0,5" VerticalAlignment="Center" IsReadOnly="True" Grid.Column="1" Grid.Row="6" />
+                        <Button x:Name="OpenGamesInstallationPathBtn" Margin="10,0,0,5" Content="{DynamicResource LOCNile3P_PlayniteOpen}" 
                                 VerticalAlignment="Center" Click="OpenGamesInstallationPathBtn_Click" Grid.Column="2" Grid.Row="6" />
-                    <TextBlock VerticalAlignment="Center" Grid.Column="0" Grid.Row="7" Margin="0,0,10,5" Text="{DynamicResource LOCNileLogFilesPath}"/>
-                    <TextBox x:Name="LogFilesPathTxt" Margin="0,0,0,5" VerticalAlignment="Center" IsReadOnly="True" Grid.Column="1" Grid.Row="7" />
-                    <Button x:Name="OpenLogFilesPathBtn" Margin="10,0,0,5" Content="{DynamicResource LOCNile3P_PlayniteOpen}" 
+                        <TextBlock VerticalAlignment="Center" Grid.Column="0" Grid.Row="7" Margin="0,0,10,5" Text="{DynamicResource LOCNileLogFilesPath}"/>
+                        <TextBox x:Name="LogFilesPathTxt" Margin="0,0,0,5" VerticalAlignment="Center" IsReadOnly="True" Grid.Column="1" Grid.Row="7" />
+                        <Button x:Name="OpenLogFilesPathBtn" Margin="10,0,0,5" Content="{DynamicResource LOCNile3P_PlayniteOpen}" 
                                 VerticalAlignment="Center" Grid.Column="2"  Grid.Row="7" Click="OpenLogFilesPathBtn_Click" />
-                    <Button Margin="0,10,5,5" Grid.Column="0" Grid.Row="8" Name="CopyRawDataBtn" Click="CopyRawDataBtn_Click" 
+                        <Button Margin="0,10,5,5" Grid.Column="0" Grid.Row="8" Name="CopyRawDataBtn" Click="CopyRawDataBtn_Click" 
                             Grid.ColumnSpan="2" HorizontalAlignment="Left" Content="{DynamicResource LOCNileCopyRawDataToClipboard}"/>
-                    <TextBlock VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5" Grid.Column="0" Grid.Row="9" Margin="0,10,0,0">
+                        <TextBlock VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5" Grid.Column="0" Grid.Row="9" Margin="0,10,0,0">
                     <Hyperlink
                         NavigateUri="https://github.com/hawkeye116477/playnite-nile-plugin/wiki/troubleshooting"
                         Command="{x:Static pcmd:GlobalCommands.NavigateUrlCommand}"
                         CommandParameter="{Binding NavigateUri, RelativeSource={RelativeSource Self}}">
                         <Run Text="{DynamicResource LOCNile3P_AmazonTroubleShootingIssues}" />
                     </Hyperlink>
-                    </TextBlock>
-                    <TextBlock VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5" Grid.Column="0" Grid.Row="10" Margin="0,10,0,0">
+                        </TextBlock>
+                        <TextBlock VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5" Grid.Column="0" Grid.Row="10" Margin="0,10,0,0">
                     <Hyperlink 
                         Name="ReportBugHyp"
                         Command="{x:Static pcmd:GlobalCommands.NavigateUrlCommand}"
                         CommandParameter="{Binding NavigateUri, RelativeSource={RelativeSource Self}}">
                         <Run Text="{DynamicResource LOCNileReportBug}" />
                     </Hyperlink>
-                    </TextBlock>
-                </Grid>
-            </StackPanel>
+                        </TextBlock>
+                    </Grid>
+                </StackPanel>
+            </ScrollViewer>
         </TabItem>
     </TabControl>
 </UserControl>
\ No newline at end of file