diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs
index acbcceeb565e2f..19f43e05752bbf 100644
--- a/Content.Client/Lobby/LobbyUIController.cs
+++ b/Content.Client/Lobby/LobbyUIController.cs
@@ -11,6 +11,7 @@
 using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Preferences.Loadouts.Effects;
 using Content.Shared.Roles;
+using Robust.Client.State;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controllers;
 using Robust.Shared.Map;
@@ -21,6 +22,7 @@ namespace Content.Client.Lobby;
 public sealed class LobbyUIController : UIController, IOnStateEntered<LobbyState>, IOnStateExited<LobbyState>
 {
     [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!;
+    [Dependency] private readonly IStateManager _stateManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [UISystemDependency] private readonly HumanoidAppearanceSystem _humanoid = default!;
     [UISystemDependency] private readonly ClientInventorySystem _inventory = default!;
@@ -73,7 +75,7 @@ public void SetPreviewPanel(LobbyCharacterPreviewPanel? panel)
         UpdateCharacterUI();
     }
 
-    public void SetDummyJob(JobPrototype? job, RoleLoadout? loadout)
+    public void SetDummyJob(JobPrototype? job)
     {
         _dummyJob = job;
         UpdateCharacterUI();
@@ -81,6 +83,10 @@ public void SetDummyJob(JobPrototype? job, RoleLoadout? loadout)
 
     public void UpdateCharacterUI()
     {
+        // Test moment
+        if (_stateManager.CurrentState is not LobbyState)
+            return;
+
         if (!_preferencesManager.ServerDataLoaded)
         {
             _previewPanel?.SetLoaded(false);
diff --git a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
deleted file mode 100644
index e017dddbe0afdc..00000000000000
--- a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System.Numerics;
-using Content.Client.UserInterface.Controls;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using static Robust.Client.UserInterface.Controls.BoxContainer;
-
-namespace Content.Client.Lobby.UI;
-
-/// <summary>
-/// Handles the entity preview for a character in a particular role.
-/// </summary>
-public sealed class LobbyCharacterPreviewPanel : Control
-{
-    private readonly Label _summaryLabel;
-    private readonly BoxContainer _loaded;
-    private readonly BoxContainer _viewBox;
-    private readonly Label _unloaded;
-
-    public LobbyCharacterPreviewPanel()
-    {
-        IoCManager.InjectDependencies(this);
-        var header = new NanoHeading
-        {
-            Text = Loc.GetString("lobby-character-preview-panel-header")
-        };
-
-        CharacterSetupButton = new Button
-        {
-            Text = Loc.GetString("lobby-character-preview-panel-character-setup-button"),
-            HorizontalAlignment = HAlignment.Center,
-            Margin = new Thickness(0, 5, 0, 0),
-        };
-
-        _summaryLabel = new Label
-        {
-            HorizontalAlignment = HAlignment.Center,
-            Margin = new Thickness(3, 3),
-        };
-
-        var vBox = new BoxContainer
-        {
-            Orientation = LayoutOrientation.Vertical
-        };
-        _unloaded = new Label { Text = Loc.GetString("lobby-character-preview-panel-unloaded-preferences-label") };
-
-        _loaded = new BoxContainer
-        {
-            Orientation = LayoutOrientation.Vertical,
-            Visible = false
-        };
-        _viewBox = new BoxContainer
-        {
-            Orientation = LayoutOrientation.Horizontal,
-            HorizontalAlignment = HAlignment.Center,
-        };
-        var vSpacer = new VSpacer();
-
-        _loaded.AddChild(_summaryLabel);
-        _loaded.AddChild(_viewBox);
-        _loaded.AddChild(vSpacer);
-        _loaded.AddChild(CharacterSetupButton);
-
-        vBox.AddChild(header);
-        vBox.AddChild(_loaded);
-        vBox.AddChild(_unloaded);
-        AddChild(vBox);
-
-        UserInterfaceManager.GetUIController<LobbyUIController>().SetPreviewPanel(this);
-    }
-
-    public void SetLoaded(bool value)
-    {
-        _loaded.Visible = value;
-        _unloaded.Visible = !value;
-    }
-
-    public void SetSummaryText(string value)
-    {
-        _summaryLabel.Text = string.Empty;
-    }
-
-    public void SetSprite(EntityUid uid)
-    {
-        _viewBox.DisposeAllChildren();
-        var spriteView = new SpriteView
-        {
-            OverrideDirection = Direction.South,
-            Scale = new Vector2(4f, 4f),
-            MaxSize = new Vector2(112, 112),
-            Stretch = SpriteView.StretchMode.Fill,
-        };
-        spriteView.SetEntity(uid);
-        _viewBox.AddChild(spriteView);
-    }
-
-    public Button CharacterSetupButton { get; }
-}
diff --git a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml
new file mode 100644
index 00000000000000..997507414cd750
--- /dev/null
+++ b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml
@@ -0,0 +1,22 @@
+<Control
+    xmlns="https://spacestation14.io"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
+    <BoxContainer Name="VBox" Orientation="Vertical">
+        <controls:NanoHeading Name="Header" Text="{Loc 'lobby-character-preview-panel-header'}">
+
+        </controls:NanoHeading>
+        <BoxContainer Name="Loaded" Orientation="Vertical"
+                      Visible="False">
+            <Label Name="Summary" HorizontalAlignment="Center" Margin="3 3"/>
+            <BoxContainer Name="ViewBox" Orientation="Horizontal" HorizontalAlignment="Center">
+
+            </BoxContainer>
+            <controls:VSpacer/>
+            <Button Name="CharacterSetup" Text="{Loc 'lobby-character-preview-panel-character-setup-button'}"
+                    HorizontalAlignment="Center"
+                    Margin="0 5 0 0"/>
+        </BoxContainer>
+        <Label Name="Unloaded" Text="{Loc 'lobby-character-preview-panel-unloaded-preferences-label'}"/>
+    </BoxContainer>
+</Control>
diff --git a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs
new file mode 100644
index 00000000000000..407bfa5670c845
--- /dev/null
+++ b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs
@@ -0,0 +1,46 @@
+using System.Numerics;
+using Content.Client.UserInterface.Controls;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Lobby.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class LobbyCharacterPreviewPanel : Control
+{
+    public Button CharacterSetupButton => CharacterSetup;
+
+    public LobbyCharacterPreviewPanel()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+        UserInterfaceManager.GetUIController<LobbyUIController>().SetPreviewPanel(this);
+    }
+
+    public void SetLoaded(bool value)
+    {
+        Loaded.Visible = value;
+        Unloaded.Visible = !value;
+    }
+
+    public void SetSummaryText(string value)
+    {
+        Summary.Text = string.Empty;
+    }
+
+    public void SetSprite(EntityUid uid)
+    {
+        ViewBox.DisposeAllChildren();
+        var spriteView = new SpriteView
+        {
+            OverrideDirection = Direction.South,
+            Scale = new Vector2(4f, 4f),
+            MaxSize = new Vector2(112, 112),
+            Stretch = SpriteView.StretchMode.Fill,
+        };
+        spriteView.SetEntity(uid);
+        ViewBox.AddChild(spriteView);
+    }
+}
diff --git a/Content.Client/Preferences/UI/HighlightedContainer.cs b/Content.Client/Preferences/UI/HighlightedContainer.cs
deleted file mode 100644
index 205bc1ea6c962f..00000000000000
--- a/Content.Client/Preferences/UI/HighlightedContainer.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface.Controls;
-
-namespace Content.Client.Preferences.UI;
-
-public sealed class HighlightedContainer : PanelContainer
-{
-    public HighlightedContainer()
-    {
-        PanelOverride = new StyleBoxFlat()
-        {
-            BackgroundColor = new Color(47, 47, 53),
-            ContentMarginTopOverride = 10,
-            ContentMarginBottomOverride = 10,
-            ContentMarginLeftOverride = 10,
-            ContentMarginRightOverride = 10
-        };
-    }
-}
diff --git a/Content.Client/Preferences/UI/HighlightedContainer.xaml b/Content.Client/Preferences/UI/HighlightedContainer.xaml
new file mode 100644
index 00000000000000..8cf6e2da05b0c1
--- /dev/null
+++ b/Content.Client/Preferences/UI/HighlightedContainer.xaml
@@ -0,0 +1,11 @@
+<PanelContainer
+    xmlns="https://spacestation14.io"
+    xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
+    <PanelContainer.PanelOverride>
+        <graphics:StyleBoxFlat BackgroundColor="#2F2F35"
+                               ContentMarginTopOverride="10"
+                               ContentMarginBottomOverride="10"
+                               ContentMarginLeftOverride="10"
+                               ContentMarginRightOverride="10"/>
+    </PanelContainer.PanelOverride>
+</PanelContainer>
diff --git a/Content.Client/Preferences/UI/HighlightedContainer.xaml.cs b/Content.Client/Preferences/UI/HighlightedContainer.xaml.cs
new file mode 100644
index 00000000000000..68294d0f059641
--- /dev/null
+++ b/Content.Client/Preferences/UI/HighlightedContainer.xaml.cs
@@ -0,0 +1,14 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Preferences.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class HighlightedContainer : PanelContainer
+{
+    public HighlightedContainer()
+    {
+        RobustXamlLoader.Load(this);
+    }
+}
diff --git a/Content.Client/Preferences/UI/LoadoutWindow.xaml.cs b/Content.Client/Preferences/UI/LoadoutWindow.xaml.cs
index e98a0f1688a008..8e1ef0f1697702 100644
--- a/Content.Client/Preferences/UI/LoadoutWindow.xaml.cs
+++ b/Content.Client/Preferences/UI/LoadoutWindow.xaml.cs
@@ -47,7 +47,7 @@ public override void Close()
     {
         base.Close();
         var controller = UserInterfaceManager.GetUIController<LobbyUIController>();
-        controller.SetDummyJob(null, null);
+        controller.SetDummyJob(null);
     }
 
     public void RefreshLoadouts(RoleLoadout loadout, ICommonSession session, IDependencyCollection collection)
diff --git a/Content.Client/Preferences/UI/RequirementsSelector.cs b/Content.Client/Preferences/UI/RequirementsSelector.cs
index 4a5f336c591307..0a7e9b6ca722c5 100644
--- a/Content.Client/Preferences/UI/RequirementsSelector.cs
+++ b/Content.Client/Preferences/UI/RequirementsSelector.cs
@@ -140,7 +140,7 @@ protected void Setup(RoleLoadout? loadout, (string, int)[] items, string title,
                     if (Proto is JobPrototype jobProto)
                     {
                         var controller = UserInterfaceManager.GetUIController<LobbyUIController>();
-                        controller.SetDummyJob(jobProto, _loadout);
+                        controller.SetDummyJob(jobProto);
                     }
 
                     _loadoutWindow.OnLoadoutUnpressed += (selectedGroup, selectedLoadout) =>
diff --git a/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs b/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs
index 980559cc8174cc..7bc62dfe2bc27e 100644
--- a/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs
+++ b/Content.IntegrationTests/Tests/Minds/MindTest.DeleteAllThenGhost.cs
@@ -19,7 +19,7 @@ public async Task DeleteAllThenGhost()
         await using var pair = await PoolManager.GetServerClient(settings);
 
         // Client is connected with a valid entity & mind
-        Assert.That(pair.Client.EntMan.EntityExists(pair.Client.Player?.ControlledEntity));
+        Assert.That(pair.Client.EntMan.EntityExists(pair.Client.AttachedEntity));
         Assert.That(pair.Server.EntMan.EntityExists(pair.PlayerData?.Mind));
 
         // Delete **everything**
@@ -28,6 +28,12 @@ public async Task DeleteAllThenGhost()
         await pair.RunTicksSync(5);
 
         Assert.That(pair.Server.EntMan.EntityCount, Is.EqualTo(0));
+
+        foreach (var ent in pair.Client.EntMan.GetEntities())
+        {
+            Console.WriteLine(pair.Client.EntMan.ToPrettyString(ent));
+        }
+
         Assert.That(pair.Client.EntMan.EntityCount, Is.EqualTo(0));
 
         // Create a new map.
@@ -36,7 +42,7 @@ public async Task DeleteAllThenGhost()
         await pair.RunTicksSync(5);
 
         // Client is not attached to anything
-        Assert.That(pair.Client.Player?.ControlledEntity, Is.Null);
+        Assert.That(pair.Client.AttachedEntity, Is.Null);
         Assert.That(pair.PlayerData?.Mind, Is.Null);
 
         // Attempt to ghost
@@ -45,9 +51,9 @@ public async Task DeleteAllThenGhost()
         await pair.RunTicksSync(10);
 
         // Client should be attached to a ghost placed on the new map.
-        Assert.That(pair.Client.EntMan.EntityExists(pair.Client.Player?.ControlledEntity));
+        Assert.That(pair.Client.EntMan.EntityExists(pair.Client.AttachedEntity));
         Assert.That(pair.Server.EntMan.EntityExists(pair.PlayerData?.Mind));
-        var xform = pair.Client.Transform(pair.Client.Player!.ControlledEntity!.Value);
+        var xform = pair.Client.Transform(pair.Client.AttachedEntity!.Value);
         Assert.That(xform.MapID, Is.EqualTo(new MapId(mapId)));
 
         await pair.CleanReturnAsync();