diff --git a/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml b/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml
index 52420d1819..483825aae4 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml
+++ b/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml
@@ -1,15 +1,13 @@
 <BoxContainer xmlns="https://spacestation14.io"
-              Orientation="Horizontal"
-              SeparationOverride="10"
-              HorizontalExpand="True">
-    <BoxContainer Orientation="Vertical"
-                  HorizontalExpand="True">
-        <RichTextLabel Name="Title" />
-        <RichTextLabel Name="Description" />
-    </BoxContainer>
+              Orientation="Vertical"
+              HorizontalExpand="True"
+              Margin="0 0 8 8">
+    <Label Name="Title"
+           StyleClasses="LabelKeyText"/>
+    <PanelContainer StyleClasses="HighDivider" />
+    <RichTextLabel Name="Description"
+                   Margin="0 4"/>
     <Button Name="RequestButton"
             Text="{Loc 'ghost-roles-window-request-role-button'}"
-            TextAlign="Center"
-            HorizontalAlignment="Right"
-            VerticalAlignment="Center" />
+            HorizontalAlignment="Left"/>
 </BoxContainer>
diff --git a/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml.cs b/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml.cs
index b2d22ee47d..159b758e90 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml.cs
+++ b/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml.cs
@@ -13,7 +13,7 @@ namespace Content.Client.Ghost.Roles.UI
         {
             RobustXamlLoader.Load(this);
 
-            Title.SetMessage(info.Name);
+            Title.Text = info.Name;
             Description.SetMessage(info.Description);
             RequestButton.OnPressed += requestAction;
         }
diff --git a/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml b/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml
index bc1a36a80b..8888b7da94 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml
+++ b/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml
@@ -4,11 +4,10 @@
     <Label Name="NoRolesMessage"
            Text="{Loc 'ghost-roles-window-no-roles-available-label'}"
            VerticalAlignment="Top" />
-    <ScrollContainer HorizontalExpand="True"
-                     VerticalExpand="True">
+    <ScrollContainer VerticalExpand="True"
+                     HScrollEnabled="False">
         <BoxContainer Orientation="Vertical"
                       Name="EntryContainer"
-                      HorizontalExpand="True"
                       VerticalExpand="True">
             <!-- Ghost role entries are added here by code -->
         </BoxContainer>