diff --git a/components/CharacterUnit/index.scss b/components/CharacterUnit/index.scss
index d8c40284..01804e8f 100644
--- a/components/CharacterUnit/index.scss
+++ b/components/CharacterUnit/index.scss
@@ -27,7 +27,8 @@
     h3 {
         color: #333;
         font-size: $font-regular;
-        font-weight: 500;
+        font-weight: $normal;
+        line-height: 1.1;
         margin: 0;
         max-width: 131px;
         text-align: center;
diff --git a/components/CharacterUnit/index.tsx b/components/CharacterUnit/index.tsx
index 243eb530..12c66138 100644
--- a/components/CharacterUnit/index.tsx
+++ b/components/CharacterUnit/index.tsx
@@ -77,20 +77,18 @@ const CharacterUnit = (props: Props) => {
     )
 
     const unitContent = (
-        <div>
-            <div className={classes}>
-                { (props.editable) ? editableImage : image }
-                { (gridCharacter && character) ? 
-                    <UncapIndicator 
-                        type="character"
-                        flb={character.uncap.flb || false}
-                        ulb={character.uncap.ulb || false}
-                        uncapLevel={gridCharacter.uncap_level}
-                        updateUncap={passUncapData}
-                        special={character.special}
-                    /> : '' }
-                <h3 className="CharacterName">{character?.name.en}</h3>
-            </div>
+        <div className={classes}>
+            { (props.editable) ? editableImage : image }
+            { (gridCharacter && character) ? 
+                <UncapIndicator 
+                    type="character"
+                    flb={character.uncap.flb || false}
+                    ulb={character.uncap.ulb || false}
+                    uncapLevel={gridCharacter.uncap_level}
+                    updateUncap={passUncapData}
+                    special={character.special}
+                /> : '' }
+            <h3 className="CharacterName">{character?.name.en}</h3>
         </div>
     )
 
@@ -101,9 +99,7 @@ const CharacterUnit = (props: Props) => {
     )
 
     return (
-        <div className={classes}>
-            { (gridCharacter) ? withHovercard : unitContent }
-        </div>
+        (gridCharacter) ? withHovercard : unitContent
     )
 }
 
diff --git a/components/SummonUnit/index.scss b/components/SummonUnit/index.scss
index ae42fb45..ac2e2511 100644
--- a/components/SummonUnit/index.scss
+++ b/components/SummonUnit/index.scss
@@ -92,7 +92,8 @@
     h3 {
         color: #333;
         font-size: $font-regular;
-        font-weight: 500;
+        font-weight: $normal;
+        line-height: 1.1;
         margin: 0;
         text-align: center;
     }
diff --git a/components/SummonUnit/index.tsx b/components/SummonUnit/index.tsx
index 05d3cf01..1e126bea 100644
--- a/components/SummonUnit/index.tsx
+++ b/components/SummonUnit/index.tsx
@@ -83,7 +83,7 @@ const SummonUnit = (props: Props) => {
     )
 
     const unitContent = (
-        <div>
+        <div className={classes}>
             { (props.editable) ? editableImage : image }
             { (gridSummon) ? 
                 <UncapIndicator 
@@ -105,11 +105,7 @@ const SummonUnit = (props: Props) => {
         </SummonHovercard>
     )
 
-    return (
-        <div className={classes}>
-            { (gridSummon) ? withHovercard : unitContent }
-        </div>
-    )
+    return (gridSummon) ? withHovercard : unitContent
 }
 
 export default SummonUnit
diff --git a/components/WeaponUnit/index.scss b/components/WeaponUnit/index.scss
index ccda269a..c3e1881d 100644
--- a/components/WeaponUnit/index.scss
+++ b/components/WeaponUnit/index.scss
@@ -85,6 +85,7 @@
         color: $grey-00;
         font-size: $font-button;
         font-weight: $normal;
+        line-height: 1.1;
         margin: 0;
         text-align: center;
     }
diff --git a/components/WeaponUnit/index.tsx b/components/WeaponUnit/index.tsx
index 67a8f7a8..6674f18e 100644
--- a/components/WeaponUnit/index.tsx
+++ b/components/WeaponUnit/index.tsx
@@ -90,7 +90,7 @@ const WeaponUnit = (props: Props) => {
     )
 
     const unitContent = (
-        <div>
+        <div className={classes}>
             { (props.editable && gridWeapon && canBeModified(gridWeapon)) ? 
             <WeaponModal gridWeapon={gridWeapon}>
                 <div>
@@ -118,11 +118,7 @@ const WeaponUnit = (props: Props) => {
         </WeaponHovercard>
     )
 
-    return (
-        <div className={classes}>
-            { (gridWeapon) ? withHovercard : unitContent }
-        </div>
-    )
+    return (gridWeapon) ? withHovercard : unitContent
 }
 
 export default WeaponUnit