diff --git a/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs b/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs
index 80331b4cf3..cea15721cb 100644
--- a/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs
+++ b/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs
@@ -1,4 +1,4 @@
-using Content.Client.CharacterInfo;
+using Content.Client.CharacterInfo;
 using Content.Client.Gameplay;
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Systems.Character.Controls;
@@ -125,9 +125,13 @@ public sealed class CharacterUIController : UIController, IOnStateEntered<Gamepl
                 var conditionControl = new ObjectiveConditionsControl();
                 conditionControl.ProgressTexture.Texture = condition.SpriteSpecifier.Frame0();
                 conditionControl.ProgressTexture.Progress = condition.Progress;
+                var titleMessage = new FormattedMessage();
+                var descriptionMessage = new FormattedMessage();
+                titleMessage.AddText(condition.Title);
+                descriptionMessage.AddText(condition.Description);
 
-                conditionControl.Title.Text = condition.Title;
-                conditionControl.Description.Text = condition.Description;
+                conditionControl.Title.SetMessage(titleMessage);
+                conditionControl.Description.SetMessage(descriptionMessage);
 
                 objectiveControl.AddChild(conditionControl);
             }
diff --git a/Content.Client/UserInterface/Systems/Character/Windows/CharacterWindow.xaml b/Content.Client/UserInterface/Systems/Character/Windows/CharacterWindow.xaml
index 1e55cad891..e77ee915ec 100644
--- a/Content.Client/UserInterface/Systems/Character/Windows/CharacterWindow.xaml
+++ b/Content.Client/UserInterface/Systems/Character/Windows/CharacterWindow.xaml
@@ -1,4 +1,4 @@
-<windows:CharacterWindow
+<windows:CharacterWindow
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns:windows="clr-namespace:Content.Client.UserInterface.Systems.Character.Windows"
diff --git a/Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveConditionsControl.xaml b/Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveConditionsControl.xaml
index 8751f9c078..420be595c9 100644
--- a/Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveConditionsControl.xaml
+++ b/Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveConditionsControl.xaml
@@ -1,12 +1,12 @@
-<controls:ObjectiveConditionsControl
+<controls:ObjectiveConditionsControl
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Systems.Objectives.Controls"
     Orientation="Horizontal">
-    <cc:ProgressTextureRect Name="ProgressTexture" VerticalAlignment="Center" Access="Public"/>
+    <cc:ProgressTextureRect Name="ProgressTexture" VerticalAlignment="Top" Access="Public" Margin="0 8 0 0"/>
     <Control MinSize="10 0"/>
     <BoxContainer Orientation="Vertical">
-        <Label Name="Title" Access="Public"/>
-        <Label Name="Description" Access="Public"/>
+        <RichTextLabel Name="Title" Access="Public" SetWidth="325" HorizontalAlignment="Left"/>
+        <RichTextLabel Name="Description" Access="Public" SetWidth="325" HorizontalAlignment="Left"/>
     </BoxContainer>
 </controls:ObjectiveConditionsControl>