diff --git a/app/Desktop/Main/Controls/ServerConfigurationPanel.axaml b/app/Desktop/Main/Controls/ServerConfigurationPanel.axaml
index f1a504b..0634920 100644
--- a/app/Desktop/Main/Controls/ServerConfigurationPanel.axaml
+++ b/app/Desktop/Main/Controls/ServerConfigurationPanel.axaml
@@ -33,9 +33,7 @@
             </StackPanel>
             <StackPanel>
                 <Label Target="Token">Token</Label>
-                <StackPanel Orientation="Horizontal">
-                    <TextBox x:Name="Token" Width="200" Text="{Binding InputToken}" />
-                </StackPanel>
+                <TextBox x:Name="Token" Width="200" Text="{Binding InputToken}" />
             </StackPanel>
             <StackPanel VerticalAlignment="Bottom">
                 <Button Command="{Binding OnClickRandomizeToken}">Randomize Token</Button>
diff --git a/app/Desktop/Main/Screens/MainContentScreen.axaml b/app/Desktop/Main/Screens/MainContentScreen.axaml
index b7197d8..6f2b334 100644
--- a/app/Desktop/Main/Screens/MainContentScreen.axaml
+++ b/app/Desktop/Main/Screens/MainContentScreen.axaml
@@ -88,17 +88,17 @@
                     <ContentPresenter Content="{Binding DatabasePage}" Classes="page" />
                 </ScrollViewer>
             </TabItem>
-            <TabItem x:Name="TabTracking" Header="Tracking" DockPanel.Dock="Top" Grid.Row="1">
+            <TabItem x:Name="TabTracking" Header="Tracking" Grid.Row="1">
                 <ScrollViewer>
                     <ContentPresenter Content="{Binding TrackingPage}" Classes="page" />
                 </ScrollViewer>
             </TabItem>
-            <TabItem x:Name="TabViewer" Header="Viewer" DockPanel.Dock="Top" Grid.Row="2">
+            <TabItem x:Name="TabViewer" Header="Viewer" Grid.Row="2">
                 <ScrollViewer>
                     <ContentPresenter Content="{Binding ViewerPage}" Classes="page" />
                 </ScrollViewer>
             </TabItem>
-            <TabItem x:Name="TabAdvanced" Header="Advanced" DockPanel.Dock="Bottom" Grid.Row="4">
+            <TabItem x:Name="TabAdvanced" Header="Advanced" Grid.Row="4">
                 <ScrollViewer>
                     <ContentPresenter Content="{Binding AdvancedPage}" Classes="page" />
                 </ScrollViewer>