diff --git a/src/Artemis.UI.Shared/Styles/Artemis.axaml b/src/Artemis.UI.Shared/Styles/Artemis.axaml
index d32872413..00a87c6d3 100644
--- a/src/Artemis.UI.Shared/Styles/Artemis.axaml
+++ b/src/Artemis.UI.Shared/Styles/Artemis.axaml
@@ -45,4 +45,5 @@
     <StyleInclude Source="/Styles/NumberBox.axaml" />
     <StyleInclude Source="/Styles/TreeView.axaml" />
     <StyleInclude Source="/Styles/Plugins.axaml" />
+    <StyleInclude Source="/Styles/ScrollViewer.axaml" />
 </Styles>
\ No newline at end of file
diff --git a/src/Artemis.UI.Shared/Styles/ScrollViewer.axaml b/src/Artemis.UI.Shared/Styles/ScrollViewer.axaml
new file mode 100644
index 000000000..db4e5985f
--- /dev/null
+++ b/src/Artemis.UI.Shared/Styles/ScrollViewer.axaml
@@ -0,0 +1,15 @@
+<Style xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+        <Border Padding="20">
+            <ScrollViewer Classes="with-padding" Height="100">
+                <Rectangle Fill="Blue" Width="50" Height="200"></Rectangle>
+            </ScrollViewer>
+        </Border>
+    </Design.PreviewWith>
+
+    <!-- Add Styles Here -->
+    <Style Selector="ScrollViewer.with-padding /template/ ScrollContentPresenter#PART_ContentPresenter">
+        <Setter Property="Grid.ColumnSpan" Value="1"></Setter>
+    </Style>
+</Style>
diff --git a/src/Artemis.UI/Controllers/RemoteController.cs b/src/Artemis.UI/Controllers/RemoteController.cs
index 56b88ef6a..abf1e7c89 100644
--- a/src/Artemis.UI/Controllers/RemoteController.cs
+++ b/src/Artemis.UI/Controllers/RemoteController.cs
@@ -20,6 +20,12 @@ public class RemoteController : WebApiController
         _mainWindowService = mainWindowService;
     }
 
+    [Route(HttpVerbs.Any, "/status")]
+    public void GetStatus()
+    {
+        HttpContext.Response.StatusCode = 200;
+    }
+
     [Route(HttpVerbs.Post, "/remote/bring-to-foreground")]
     public void PostBringToForeground()
     {
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml
index d9a846e3e..4d08b66ec 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameView.axaml
@@ -7,9 +7,6 @@
              x:Class="Artemis.UI.Screens.ProfileEditor.ProfileTree.ContentDialogs.ProfileElementRenameView"
              x:DataType="contentDialogs:ProfileElementRenameViewModel">
     <StackPanel>
-        <StackPanel.KeyBindings>
-            <KeyBinding Gesture="Enter" Command="{CompiledBinding Enter}" />
-        </StackPanel.KeyBindings>
         <TextBox Name="NameTextBox" Text="{CompiledBinding ProfileElementName}" Watermark="Profile element name" />
     </StackPanel>
 </UserControl>
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameViewModel.cs
index 26a07ff15..de2b72860 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ContentDialogs/ProfileElementRenameViewModel.cs
@@ -22,7 +22,6 @@ public class ProfileElementRenameViewModel : ContentDialogViewModelBase
         _profileElementName = profileElement.Name;
 
         Confirm = ReactiveCommand.Create(ExecuteConfirm, ValidationContext.Valid);
-        Enter = ReactiveCommand.Create(() => ContentDialog?.Hide(ContentDialogResult.Primary), Confirm.CanExecute);
         this.ValidationRule(vm => vm.ProfileElementName, name => !string.IsNullOrWhiteSpace(name), "You must specify a valid name");
     }
 
@@ -33,7 +32,6 @@ public class ProfileElementRenameViewModel : ContentDialogViewModelBase
     }
 
 
-    public ReactiveCommand<Unit, Unit> Enter { get; }
     public ReactiveCommand<Unit, Unit> Confirm { get; }
 
     private void ExecuteConfirm()
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml
index ba9da9a27..854942d2f 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameView.axaml
@@ -7,9 +7,6 @@
              x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Tree.ContentDialogs.LayerEffectRenameView"
              x:DataType="contentDialogs:LayerEffectRenameViewModel">
     <StackPanel>
-        <StackPanel.KeyBindings>
-            <KeyBinding Gesture="Enter" Command="{CompiledBinding Enter}" />
-        </StackPanel.KeyBindings>
         <TextBox Name="NameTextBox" Text="{CompiledBinding LayerEffectName}" Watermark="Layer effect name" />
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs
index 7aeb01ab1..776928ce5 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/ContentDialogs/LayerEffectRenameViewModel.cs
@@ -22,7 +22,6 @@ public class LayerEffectRenameViewModel : ContentDialogViewModelBase
         _layerEffectName = layerEffect.Name;
 
         Confirm = ReactiveCommand.Create(ExecuteConfirm, ValidationContext.Valid);
-        Enter = ReactiveCommand.Create(() => ContentDialog?.Hide(ContentDialogResult.Primary), Confirm.CanExecute);
         this.ValidationRule(vm => vm.LayerEffectName, categoryName => !string.IsNullOrWhiteSpace(categoryName), "You must specify a valid name");
     }
 
@@ -33,7 +32,6 @@ public class LayerEffectRenameViewModel : ContentDialogViewModelBase
     }
 
     public ReactiveCommand<Unit, Unit> Confirm { get; }
-    public ReactiveCommand<Unit, Unit> Enter { get; }
 
     private void ExecuteConfirm()
     {
diff --git a/src/Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditView.axaml b/src/Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditView.axaml
index a27bb9281..8250fe739 100644
--- a/src/Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditView.axaml
+++ b/src/Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditView.axaml
@@ -7,9 +7,6 @@
              x:Class="Artemis.UI.Screens.Sidebar.SidebarCategoryEditView"
              x:DataType="sidebar:SidebarCategoryEditViewModel">
     <StackPanel>
-        <StackPanel.KeyBindings>
-            <KeyBinding Gesture="Enter" Command="{CompiledBinding Enter}" />
-        </StackPanel.KeyBindings>
-        <TextBox Text="{CompiledBinding CategoryName}" Watermark="Category name"/>
+        <TextBox Name="NameTextBox" Text="{CompiledBinding CategoryName}" Watermark="Category name"/>
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditView.axaml.cs b/src/Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditView.axaml.cs
index a9447050f..ac9c1d71a 100644
--- a/src/Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditView.axaml.cs
+++ b/src/Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditView.axaml.cs
@@ -1,6 +1,7 @@
+using System.Threading.Tasks;
 using Artemis.UI.Shared.Extensions;
-using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
+using Avalonia.Threading;
 using ReactiveUI;
 
 namespace Artemis.UI.Screens.Sidebar;
@@ -10,7 +11,18 @@ public partial class SidebarCategoryEditView : ReactiveUserControl<SidebarCatego
     public SidebarCategoryEditView()
     {
         InitializeComponent();
-        this.WhenActivated(_ => this.ClearAllDataValidationErrors());
+        this.WhenActivated(_ =>
+        {
+            this.ClearAllDataValidationErrors();
+            Dispatcher.UIThread.Post(DelayedAutoFocus);
+        });
+    }
+    
+    private async void DelayedAutoFocus()
+    {
+        // Don't ask
+        await Task.Delay(200);
+        NameTextBox.SelectAll();
+        NameTextBox.Focus();
     }
-
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditViewModel.cs b/src/Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditViewModel.cs
index 0884562ed..5096cc2d3 100644
--- a/src/Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditViewModel.cs
+++ b/src/Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditViewModel.cs
@@ -24,7 +24,6 @@ public class SidebarCategoryEditViewModel : ContentDialogViewModelBase
             _categoryName = _category.Name;
 
         Confirm = ReactiveCommand.Create(ExecuteConfirm, ValidationContext.Valid);
-        Enter = ReactiveCommand.Create(() => ContentDialog?.Hide(ContentDialogResult.Primary), Confirm.CanExecute);
         this.ValidationRule(vm => vm.CategoryName, categoryName => !string.IsNullOrWhiteSpace(categoryName?.Trim()), "You must specify a valid name");
         this.ValidationRule(vm => vm.CategoryName, categoryName => profileService.ProfileCategories.All(c => c.Name != categoryName?.Trim()), "You must specify a unique name");
     }
@@ -36,7 +35,6 @@ public class SidebarCategoryEditViewModel : ContentDialogViewModelBase
     }
 
     public ReactiveCommand<Unit, Unit> Confirm { get; }
-    public ReactiveCommand<Unit, Unit> Enter { get; }
 
     private void ExecuteConfirm()
     {
diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsStepView.axaml b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsStepView.axaml
index b85ffdb0f..5fd3cbcdb 100644
--- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsStepView.axaml
+++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsStepView.axaml
@@ -31,37 +31,46 @@
             Learn more about adaption hints
         </controls:HyperlinkButton>
 
-        <ItemsRepeater ItemsSource="{CompiledBinding Layers}" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="0 10 0 0">
-            <ItemsRepeater.ItemTemplate>
-                <DataTemplate DataType="profile:ProfileAdaptionHintsLayerViewModel">
-                    <StackPanel>
-                        <Border Classes="card-separator" />
-                        <Grid ColumnDefinitions="Auto,*,Auto" RowDefinitions="*,*">
-                            <avalonia:MaterialIcon Grid.Column="0"
-                                                   Grid.Row="0"
-                                                   Grid.RowSpan="2"
-                                                   Width="25"
-                                                   Height="25"
-                                                   Margin="5 0 10 0"
-                                                   Kind="{CompiledBinding Layer.LayerBrush.Descriptor.Icon, FallbackValue=QuestionMark}" />
-                            <TextBlock Grid.Column="1" Grid.Row="0" Text="{CompiledBinding Layer.Name}" />
-                            <TextBlock Grid.Column="1" 
-                                       Grid.Row="1" 
-                                       VerticalAlignment="Top" 
-                                       Classes="subtitle" 
-                                       Classes.danger="{CompiledBinding !AdaptionHintCount}"
-                                       Text="{CompiledBinding AdaptionHintText}">
-                            </TextBlock>
-                            <Button Grid.Column="2"
-                                    Grid.Row="0"
-                                    Grid.RowSpan="2"
-                                    Command="{Binding EditAdaptionHints}">
-                                Edit hints
-                            </Button>
-                        </Grid>
-                    </StackPanel>
-                </DataTemplate>
-            </ItemsRepeater.ItemTemplate>
-        </ItemsRepeater>
+        <ScrollViewer Grid.Row="2"
+                      Grid.Column="0"
+                      Grid.ColumnSpan="2" 
+                      Margin="0 10 0 0" 
+                      Classes="with-padding" 
+                      HorizontalScrollBarVisibility="Disabled" 
+                      VerticalScrollBarVisibility="Auto" 
+                      VerticalAlignment="Top">
+            <ItemsRepeater ItemsSource="{CompiledBinding Layers}">
+                <ItemsRepeater.ItemTemplate>
+                    <DataTemplate DataType="profile:ProfileAdaptionHintsLayerViewModel">
+                        <StackPanel>
+                            <Border Classes="card-separator" />
+                            <Grid ColumnDefinitions="Auto,*,Auto" RowDefinitions="*,*">
+                                <avalonia:MaterialIcon Grid.Column="0"
+                                                       Grid.Row="0"
+                                                       Grid.RowSpan="2"
+                                                       Width="25"
+                                                       Height="25"
+                                                       Margin="5 0 10 0"
+                                                       Kind="{CompiledBinding Layer.LayerBrush.Descriptor.Icon, FallbackValue=QuestionMark}" />
+                                <TextBlock Grid.Column="1" Grid.Row="0" Text="{CompiledBinding Layer.Name}" />
+                                <TextBlock Grid.Column="1"
+                                           Grid.Row="1"
+                                           VerticalAlignment="Top"
+                                           Classes="subtitle"
+                                           Classes.danger="{CompiledBinding !AdaptionHintCount}"
+                                           Text="{CompiledBinding AdaptionHintText}">
+                                </TextBlock>
+                                <Button Grid.Column="2"
+                                        Grid.Row="0"
+                                        Grid.RowSpan="2"
+                                        Command="{Binding EditAdaptionHints}">
+                                    Edit hints
+                                </Button>
+                            </Grid>
+                        </StackPanel>
+                    </DataTemplate>
+                </ItemsRepeater.ItemTemplate>
+            </ItemsRepeater>
+        </ScrollViewer>
     </Grid>
 </UserControl>
\ No newline at end of file