diff --git a/DiscordChatExporter/App.ammy b/DiscordChatExporter/App.ammy
index 990ea63a..848164ca 100644
--- a/DiscordChatExporter/App.ammy
+++ b/DiscordChatExporter/App.ammy
@@ -63,7 +63,7 @@
       #Setter("Foreground", resource dyn "PrimaryTextBrush")
     }
 
-    // Locator
-    Locator Key="Locator" { }
+    // Container
+    Container Key="Container" { }
   }
 }
\ No newline at end of file
diff --git a/DiscordChatExporter/App.ammy.cs b/DiscordChatExporter/App.ammy.cs
index 86edf4b6..d511a987 100644
--- a/DiscordChatExporter/App.ammy.cs
+++ b/DiscordChatExporter/App.ammy.cs
@@ -6,12 +6,12 @@ namespace DiscordChatExporter
     {
         private void App_Startup(object sender, StartupEventArgs e)
         {
-            Locator.Init();
+            Container.Init();
         }
 
         private void App_Exit(object sender, ExitEventArgs e)
         {
-            Locator.Cleanup();
+            Container.Cleanup();
         }
     }
 }
\ No newline at end of file
diff --git a/DiscordChatExporter/Locator.cs b/DiscordChatExporter/Container.cs
similarity index 97%
rename from DiscordChatExporter/Locator.cs
rename to DiscordChatExporter/Container.cs
index c7111036..755a480a 100644
--- a/DiscordChatExporter/Locator.cs
+++ b/DiscordChatExporter/Container.cs
@@ -5,7 +5,7 @@ using Microsoft.Practices.ServiceLocation;
 
 namespace DiscordChatExporter
 {
-    public class Locator
+    public class Container
     {
         public static void Init()
         {
diff --git a/DiscordChatExporter/DiscordChatExporter.csproj b/DiscordChatExporter/DiscordChatExporter.csproj
index f10486b4..2f78e9bb 100644
--- a/DiscordChatExporter/DiscordChatExporter.csproj
+++ b/DiscordChatExporter/DiscordChatExporter.csproj
@@ -106,7 +106,7 @@
     <Compile Include="App.ammy.cs">
       <DependentUpon>App.ammy</DependentUpon>
     </Compile>
-    <Compile Include="Locator.cs" />
+    <Compile Include="Container.cs" />
     <Compile Include="Models\Attachment.cs" />
     <Compile Include="Models\Channel.cs" />
     <Compile Include="Models\Guild.cs" />
diff --git a/DiscordChatExporter/Views/MainWindow.ammy b/DiscordChatExporter/Views/MainWindow.ammy
index 38562c3a..2b827d7d 100644
--- a/DiscordChatExporter/Views/MainWindow.ammy
+++ b/DiscordChatExporter/Views/MainWindow.ammy
@@ -6,7 +6,7 @@ Window "DiscordChatExporter.Views.MainWindow" {
   Width: 600
   Height: 550
   Background: resource dyn "MaterialDesignPaper"
-  DataContext: bind MainViewModel from $resource Locator
+  DataContext: bind MainViewModel from $resource Container
   FocusManager.FocusedElement: bind from "TokenTextBox"
   FontFamily: resource dyn "MaterialDesignFont"
   SnapsToDevicePixels: true
@@ -128,7 +128,7 @@ Window "DiscordChatExporter.Views.MainWindow" {
                     Cursor: CursorType.Hand
 
                     Image {
-                      Margin: 6
+                      Margin: "12 6 12 6"
                       Width: 48
                       Height: 48
                       Source: bind IconUrl
@@ -167,12 +167,12 @@ Window "DiscordChatExporter.Views.MainWindow" {
                     ]
 
                     PackIcon {
-                      Margin: "4 7 0 6"
+                      Margin: "16 7 0 6"
                       Kind: PackIconKind.Pound
                       VerticalAlignment: Center
                     }
                     TextBlock {
-                      Margin: "3 6 6 6"
+                      Margin: "3 8 8 8"
                       FontSize: 14
                       Text: bind Name
                       VerticalAlignment: Center
diff --git a/DiscordChatExporter/Views/SettingsDialog.ammy b/DiscordChatExporter/Views/SettingsDialog.ammy
index 096b0643..edb06e72 100644
--- a/DiscordChatExporter/Views/SettingsDialog.ammy
+++ b/DiscordChatExporter/Views/SettingsDialog.ammy
@@ -1,7 +1,7 @@
 using MaterialDesignThemes.Wpf
 
 UserControl "DiscordChatExporter.Views.SettingsDialog" {
-  DataContext: bind SettingsViewModel from $resource Locator
+  DataContext: bind SettingsViewModel from $resource Container
   Width: 250
 
   StackPanel {