diff --git a/app/Models/Character/CharacterImage.php b/app/Models/Character/CharacterImage.php
index f7b4bd2fa..a626b67dc 100644
--- a/app/Models/Character/CharacterImage.php
+++ b/app/Models/Character/CharacterImage.php
@@ -285,7 +285,7 @@ public function getDisplayTitlesAttribute() {
             $titles[] = $title->displayTitle;
         }
 
-        return implode(' ', $titles);
+        return '<div class="row">'.implode('', $titles).'</div>';
     }
 
     /**
diff --git a/app/Models/Character/CharacterImageTitle.php b/app/Models/Character/CharacterImageTitle.php
index 29bf5f4d1..d62a12ffa 100644
--- a/app/Models/Character/CharacterImageTitle.php
+++ b/app/Models/Character/CharacterImageTitle.php
@@ -66,6 +66,6 @@ public function getDisplayTitleAttribute() {
             return $this->title->displayTitle($this->data);
         }
 
-        return '<div><span class="badge ml-1" style="color: white; background-color: #ddd;">'.isset($this->data['short']) ?? $this->data['full'].'</span></div>';
+        return '<div><span class="badge ml-1" style="color: white; background-color: #ddd;">'.(isset($this->data['short']) ? $this->data['short'] : $this->data['full']).'</span></div>';
     }
 }
diff --git a/app/Models/Character/CharacterTitle.php b/app/Models/Character/CharacterTitle.php
index 5677fd126..466ea85d2 100644
--- a/app/Models/Character/CharacterTitle.php
+++ b/app/Models/Character/CharacterTitle.php
@@ -190,7 +190,7 @@ public function getAssetTypeAttribute() {
      */
     public function displayTitle($data) {
         return '<a href="'.$this->idUrl.'"><span class="badge ml-1" style="color: white; background-color: '.$this->colour.';"'.
-            ($data['full'] ? 'data-toggle="tooltip" title="'.$this->title.'">'.$data['full'] : '>'.$this->title)
+            ($data['full'] ? ' data-toggle="tooltip" title="'.$this->title.'">'.$data['full'] : '>'.$this->title)
         .'</span></a>';
     }
 }