diff --git a/app/Desktop/Main/Controls/FilterPanel.axaml b/app/Desktop/Main/Controls/FilterPanel.axaml
index a39659c..e50fcc9 100644
--- a/app/Desktop/Main/Controls/FilterPanel.axaml
+++ b/app/Desktop/Main/Controls/FilterPanel.axaml
@@ -11,9 +11,6 @@
     </Design.DataContext>
 
     <UserControl.Styles>
-        <Style Selector="WrapPanel">
-            <Setter Property="Background" Value="#FFFFFF" />
-        </Style>
         <Style Selector="WrapPanel > StackPanel">
             <Setter Property="Margin" Value="0 20 40 0" />
             <Setter Property="Spacing" Value="4" />
diff --git a/app/Desktop/Main/MainContentScreen.axaml b/app/Desktop/Main/MainContentScreen.axaml
index 9065892..45805c2 100644
--- a/app/Desktop/Main/MainContentScreen.axaml
+++ b/app/Desktop/Main/MainContentScreen.axaml
@@ -12,7 +12,7 @@
     </Design.DataContext>
 
     <UserControl.Styles>
-        <Style Selector="TabControl WrapPanel">
+        <Style Selector="TabControl ItemsPresenter > WrapPanel">
             <Setter Property="Background" Value="#546A9F" />
         </Style>
         <Style Selector="TabItem">
diff --git a/app/Desktop/Main/Pages/DatabasePage.axaml b/app/Desktop/Main/Pages/DatabasePage.axaml
index 347410d..713ef36 100644
--- a/app/Desktop/Main/Pages/DatabasePage.axaml
+++ b/app/Desktop/Main/Pages/DatabasePage.axaml
@@ -10,15 +10,21 @@
         <pages:DatabasePageModel />
     </Design.DataContext>
 
+    <UserControl.Styles>
+        <Style Selector="WrapPanel > Button">
+            <Setter Property="Margin" Value="0 0 10 10" />
+        </Style>
+    </UserControl.Styles>
+
     <StackPanel Spacing="10">
         <DockPanel>
             <Button Command="{Binding CloseDatabase}" DockPanel.Dock="Right">Close Database</Button>
             <TextBox Text="{Binding Db.Path}" Width="NaN" Margin="0 0 10 0" IsEnabled="True" />
         </DockPanel>
-        <StackPanel Spacing="10" Orientation="Horizontal">
+        <WrapPanel>
             <Button Command="{Binding OpenDatabaseFolder}">Open Database Folder</Button>
             <Button Command="{Binding MergeWithDatabase}">Merge with Database(s)...</Button>
-        </StackPanel>
+        </WrapPanel>
     </StackPanel>
 
 </UserControl>
diff --git a/app/Desktop/Main/Pages/TrackingPage.axaml b/app/Desktop/Main/Pages/TrackingPage.axaml
index 9bd910a..81468f2 100644
--- a/app/Desktop/Main/Pages/TrackingPage.axaml
+++ b/app/Desktop/Main/Pages/TrackingPage.axaml
@@ -15,6 +15,10 @@
             <Setter Property="FontFamily" Value="Consolas,Courier" />
             <Setter Property="FontSize" Value="15" />
         </Style>
+        <Style Selector="WrapPanel > StackPanel">
+            <Setter Property="Orientation" Value="Vertical" />
+            <Setter Property="Margin" Value="0 0 10 10" />
+        </Style>
     </UserControl.Styles>
 
     <StackPanel Spacing="10">
@@ -30,19 +34,21 @@
                 <TextBlock TextWrapping="Wrap">
                     The following settings determine how the tracking script communicates with this application. If you change them, you will have to copy and apply the tracking script again.
                 </TextBlock>
-                <StackPanel Orientation="Horizontal" Spacing="10">
-                    <StackPanel Orientation="Vertical">
+                <WrapPanel>
+                    <StackPanel>
                         <Label Target="Port">Port</Label>
                         <TextBox x:Name="Port" Width="70" Text="{Binding InputPort}" />
                     </StackPanel>
-                    <StackPanel Orientation="Vertical">
+                    <StackPanel>
                         <Label Target="Token">Token</Label>
                         <StackPanel Orientation="Horizontal">
                             <TextBox x:Name="Token" Width="200" Text="{Binding InputToken}" />
                         </StackPanel>
                     </StackPanel>
-                    <Button Command="{Binding OnClickRandomizeToken}" VerticalAlignment="Bottom">Randomize Token</Button>
-                </StackPanel>
+                    <StackPanel VerticalAlignment="Bottom">
+                        <Button Command="{Binding OnClickRandomizeToken}">Randomize Token</Button>
+                    </StackPanel>
+                </WrapPanel>
                 <StackPanel Orientation="Horizontal" Spacing="10">
                     <Button IsEnabled="{Binding HasMadeChanges}" Command="{Binding OnClickApplyChanges}">Apply &amp; Restart</Button>
                     <Button IsEnabled="{Binding HasMadeChanges}" Command="{Binding OnClickCancelChanges}">Cancel</Button>
diff --git a/app/Desktop/Main/WelcomeScreen.axaml b/app/Desktop/Main/WelcomeScreen.axaml
index 48615e4..3e1c08e 100644
--- a/app/Desktop/Main/WelcomeScreen.axaml
+++ b/app/Desktop/Main/WelcomeScreen.axaml
@@ -28,7 +28,7 @@
 
     <Panel Name="RootPanel">
         <StackPanel Margin="42">
-            <TextBlock Text="{Binding Version, StringFormat=Discord History Tracker v.{0}}" FontSize="25" Margin="0 0 0 30" HorizontalAlignment="Center" />
+            <TextBlock Text="{Binding Version, StringFormat=Discord History Tracker v{0}}" FontSize="25" Margin="0 0 0 30" HorizontalAlignment="Center" />
 
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                 <Button Command="{Binding OpenOrCreateDatabase}">Open or Create Database</Button>