diff --git a/rabi_splitter_WPF/MainWindow.xaml b/rabi_splitter_WPF/MainWindow.xaml
index 43f3076..733aaab 100644
--- a/rabi_splitter_WPF/MainWindow.xaml
+++ b/rabi_splitter_WPF/MainWindow.xaml
@@ -11,14 +11,17 @@
         <local:InverseBooleanConverter x:Key="InverseBooleanConverter"/>
     </Window.Resources>
     <TabControl>
-        <TabItem Header="Display">
+        <TabItem Header="Variable Export">
+            <local:VariableExportTab x:Name="VariableExportTab"  d:DataContext="{d:DesignData local:PracticeModeContext}"/>
+        </TabItem>
+        <TabItem Header="Debug Display">
             <!--<StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Left">
             <TextBlock Text="v0.3.2" Margin="0,0,30,0" VerticalAlignment="Top" />
             <TextBlock Text="GitHub" MouseUp="TextBlock_MouseUp" Cursor="Hand" Foreground="Blue" TextDecorations="Underline" VerticalAlignment="Top"   />
         </StackPanel>-->
             <DockPanel Margin="5" DockPanel.Dock="Top">
                 <StackPanel Margin="0,0,0,0" Width="500">
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,0,0,3">
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,0,0,3" Visibility="Collapsed">
                         <TextBlock TextWrapping="Wrap" Text="LiveSplit Server Port" VerticalAlignment="Center" FontSize="16" Margin="0,0,10,0"/>
                         <TextBox  TextWrapping="Wrap" Text="{Binding ServerPort}" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalContentAlignment="Center" FontSize="16" Padding="6,0"/>
                         <Button x:Name="BtnConnect" Content="Connect" VerticalAlignment="Center" FontSize="16" Width="80" Click="BtnConnect_Click"/>
@@ -77,8 +80,11 @@
                     </Grid>
                 </StackPanel>
                 <DockPanel x:Name="EntityDataPanel" d:DataContext="{d:DesignData local:DebugContext}">
-                    <TextBox Width="100" DockPanel.Dock="Top"  TextWrapping="Wrap" Text="{Binding EntityAnalysisIndex}" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalContentAlignment="Center" FontSize="16" Padding="0,0"/>
-                    <DataGrid Width="250"  x:Name="EntityStats" ItemsSource="{Binding EntityStatsListView}" CanUserAddRows="False"  IsReadOnly="True" AutoGenerateColumns="False"  SelectionUnit="FullRow"  
+                    <DockPanel DockPanel.Dock="Top" HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <TextBlock HorizontalAlignment="Right" VerticalAlignment="Center" Text="Entity Id:" Margin="0,0,5,0"/>
+                        <TextBox Width="100" TextWrapping="Wrap" Text="{Binding EntityAnalysisIndex}" VerticalContentAlignment="Center" FontSize="16" Padding="0,0"/>
+                    </DockPanel>
+                    <DataGrid Width="250" x:Name="EntityStats" ItemsSource="{Binding EntityStatsListView}" CanUserAddRows="False"  IsReadOnly="True" AutoGenerateColumns="False"  SelectionUnit="FullRow"  
                         d:DataContext="{d:DesignData local:EntityStatsData}">
                         <DataGrid.Columns>
                             <DataGridTextColumn Width="2*" Binding="{Binding Addr}" ClipboardContentBinding="{Binding Addr}" Header="Addr"/>
@@ -111,9 +117,6 @@
                 </DockPanel>
             </DockPanel>
         </TabItem>
-        <TabItem Header="Variable Export">
-            <local:VariableExportTab x:Name="VariableExportTab"  d:DataContext="{d:DesignData local:PracticeModeContext}"/>
-        </TabItem>
     </TabControl>
 </Window>