diff --git a/BFR/MainWindow.xaml b/BFR/MainWindow.xaml
index 254f90e..5a28ae5 100644
--- a/BFR/MainWindow.xaml
+++ b/BFR/MainWindow.xaml
@@ -12,9 +12,9 @@
       <Button  Grid.Column="1" Content=" ... "/>
     </Grid>
     <!-- ListBox Headers -->
-    <TextBlock Grid.Row="1" Grid.Column="0" Text="Before"/>
-    <TextBlock Grid.Row="1" Grid.Column="1" Text="Operations"/>
-    <TextBlock Grid.Row="1" Grid.Column="2" Text="After"/>
+    <TextBox Classes="HeaderTextBox" Grid.Row="1" Grid.Column="0" Text="Before"/>
+    <TextBox Classes="HeaderTextBox" Grid.Row="1" Grid.Column="1" Text="Operations"/>
+    <TextBox Classes="HeaderTextBox" Grid.Row="1" Grid.Column="2" Text="After"/>
     
     <!-- Current and Preview ListBoxes -->
     <ListBox Grid.Row="2" Grid.Column="0"/>
@@ -26,19 +26,64 @@
       <ListBox/>
       
       <!-- Operations Controls -->
-      <Grid Grid.Row="1" ColumnDefinitions="auto,*,auto,auto,auto">
-        <TextBlock Grid.Column="0" Text="New:"/>
-        <ComboBox Grid.Column="1"/>
-        <Button Grid.Column="2" Content=" + "/>
-        <Button Grid.Column="3" Content=" - "/>
-        <ButtonSpinner Grid.Column="4"/>
-      </Grid>
+      <Border Grid.Row="1" Classes="ConnectUp">
+        <Grid ColumnDefinitions="auto,*,auto,auto,auto">
+          <TextBlock Grid.Column="0" Text="New:"/>
+          <ComboBox Grid.Column="1"/>
+          <Button Grid.Column="2" Content=" + "/>
+          <Button Grid.Column="3" Content=" - "/>
+          <ButtonSpinner Grid.Column="4"/>
+        </Grid>
+      </Border>
       
       <!-- Commit and Undo Buttons -->
-      <Grid Grid.Row="2" ColumnDefinitions="*,*">
-        <Button Grid.Column="0" Content="Undo"/>
-        <Button Grid.Column="1" Content="Rename All"/>
-      </Grid>
+      <Border Grid.Row="2" Classes="ConnectUp">
+        <Grid ColumnDefinitions="*,*">
+          <Button Grid.Column="0" Content="Undo"/>
+          <Button Grid.Column="1" Content="Rename All"/>
+        </Grid>
+      </Border>
     </Grid>
   </Grid>
+
+  <Window.Styles>
+    <Style Selector="Grid > ListBox">
+      <Setter Property="Margin" Value="4"/>
+    </Style>
+    <Style Selector="Grid > TextBox">
+      <Setter Property="Margin" Value="4"/>
+      <Setter Property="Grid.Column" Value="1"/>
+    </Style>
+    <Style Selector="Grid > Button">
+      <Setter Property="Margin" Value="4"/>
+      <Setter Property="Grid.Column" Value="1"/>
+    </Style>
+    <Style Selector="Grid > ButtonSpinner">
+      <Setter Property="Margin" Value="4"/>
+      <Setter Property="Grid.Column" Value="1"/>
+    </Style>
+    <Style Selector="Grid > ComboBox">
+      <Setter Property="Margin" Value="4"/>
+      <Setter Property="Grid.Column" Value="1"/>
+    </Style>
+    <Style Selector="Grid > TextBlock">
+      <Setter Property="Margin" Value="8"/>
+      <Setter Property="Grid.Column" Value="0"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
+    <Style Selector="Grid > TextBox.HeaderTextBox">
+      <Setter Property="Margin" Value="4,4,4,-5"/>
+      <Setter Property="TextAlignment" Value="Center"/>
+      <Setter Property="FontWeight" Value="Bold"/>
+    </Style>
+    <Style Selector="Grid > Border">
+      <Setter Property="Margin" Value="4"/>
+      <Setter Property="Padding" Value="4"/>
+      <Setter Property="BorderBrush" Value="Gray"/>
+      <Setter Property="BorderThickness" Value="1"/>
+    </Style>
+    <Style Selector="Grid > Border.ConnectUp">
+      <Setter Property="Margin" Value="4,-5,4,4"/>
+    </Style>
+  </Window.Styles>
 </Window>
diff --git a/BFR/MainWindow.xaml.cs b/BFR/MainWindow.xaml.cs
index b093bd1..e65fb1c 100644
--- a/BFR/MainWindow.xaml.cs
+++ b/BFR/MainWindow.xaml.cs
@@ -3,7 +3,7 @@ using Avalonia.Markup.Xaml;
 
 namespace BFR
 {
-    public class MainWindow : Window
+    public partial class MainWindow : Window
     {
         public MainWindow() =>
             InitializeComponent();
diff --git a/BFR/MainWindowUIProperties.cs b/BFR/MainWindowUIProperties.cs
new file mode 100644
index 0000000..06164e8
--- /dev/null
+++ b/BFR/MainWindowUIProperties.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace BFR
+{
+    public partial class MainWindow : Window
+    {
+    }
+}