diff --git a/Esper_Genesis_5E/EG_Sheet.css b/Esper_Genesis_5E/EG_Sheet.css
index 09b0874c41..d366d9c424 100644
--- a/Esper_Genesis_5E/EG_Sheet.css
+++ b/Esper_Genesis_5E/EG_Sheet.css
@@ -6424,25 +6424,30 @@ div.sheet-charmancer div.sheet-licensedsheet-flag:not(:empty) ~ * .sheet-summary
 }
 .charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-armor-class, .charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-maneuver-defense {
   background: #f4fafd;
-  grid-template-columns: 115px 1fr;
-  grid-gap: 10px;
   padding: 10px;
 }
-.charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-armor-class > div:first-child, .charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-maneuver-defense > div:first-child {
+.charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-armor-class h3, .charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-maneuver-defense h3 {
+  text-align: center;
+}
+.charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-armor-class > .sheet-grid-container, .charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-maneuver-defense > .sheet-grid-container {
+  grid-template-columns: 115px 1fr;
+  grid-gap: 10px;
+}
+.charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-armor-class > .sheet-grid-container > div:first-child, .charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-maneuver-defense > .sheet-grid-container > div:first-child {
   align-items: center;
   display: flex;
 }
-.charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-armor-class .sheet-grid-container, .charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-maneuver-defense .sheet-grid-container {
+.charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-armor-class > .sheet-grid-container .sheet-grid-container, .charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-maneuver-defense > .sheet-grid-container .sheet-grid-container {
   grid-template-rows: repeat(4, 1fr);
   grid-template-columns: 30px 1fr;
   grid-gap: 5px;
 }
-.charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-armor-class .sheet-grid-container label, .charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-maneuver-defense .sheet-grid-container label {
+.charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-armor-class > .sheet-grid-container .sheet-grid-container label, .charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-maneuver-defense > .sheet-grid-container .sheet-grid-container label {
   align-items: center;
   display: flex;
   line-height: 11px;
   position: relative;
 }
-.charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-armor-class .sheet-grid-container label span, .charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-maneuver-defense .sheet-grid-container label span {
+.charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-armor-class > .sheet-grid-container .sheet-grid-container label span, .charsheet .sheet-pc .sheet-pc-ship .sheet-bottom .sheet-grid-container > div:first-child .sheet-grid-container .sheet-maneuver-defense > .sheet-grid-container .sheet-grid-container label span {
   font-size: 11px;
 }
\ No newline at end of file
diff --git a/Esper_Genesis_5E/EG_Sheet.html b/Esper_Genesis_5E/EG_Sheet.html
index 65e8b96e1d..0c3ce34835 100644
--- a/Esper_Genesis_5E/EG_Sheet.html
+++ b/Esper_Genesis_5E/EG_Sheet.html
@@ -4274,46 +4274,52 @@
         <div class="sheet-grid-container">
           <div>
             <div class="sheet-grid-container">
-              <div class="sheet-grid-container sheet-armor-class">
-                <div><img src="https://raw.githubusercontent.com/mperes/Esper-Images/main/armor_class.png" alt="Armor Class"/></div>
+              <div class="sheet-armor-class">
+                    <h3><span data-i18n="armor-class"></span></h3>
                 <div class="sheet-grid-container">
-                      <div>
-                        <input type="text" name="attr_pc_ship_base_armor_class"/>
-                      </div>
-                      <label for="attr_pc_ship_base_armor_class"><span data-i18n="base-armor-class"></span></label>
-                      <div>
-                        <input type="text" name="attr_pc_ship_maneuver_bonus"/>
-                      </div>
-                      <label for="attr_pc_ship_maneuver_bonus"><span data-i18n="maneuver-bonus"></span></label>
-                      <div>
-                        <input type="text" name="attr_pc_ship_pilot_dex_modifier"/>
-                      </div>
-                      <label for="attr_pc_ship_pilot_dex_modifier"><span data-i18n="pilot-dex-modifier"></span></label>
-                      <div>
-                        <input type="text" name="attr_pc_ship_misc_mod_bonus"/>
-                      </div>
-                      <label for="attr_pc_ship_misc_mod_bonus"><span data-i18n="misc-mod-bonus"></span></label>
+                  <div><img src="https://raw.githubusercontent.com/mperes/Esper-Images/main/armor_class.png" alt="Armor Class"/></div>
+                  <div class="sheet-grid-container">
+                        <div>
+                          <input type="text" name="attr_pc_ship_base_armor_class"/>
+                        </div>
+                        <label for="attr_pc_ship_base_armor_class"><span data-i18n="base-armor-class"></span></label>
+                        <div>
+                          <input type="text" name="attr_pc_ship_maneuver_bonus"/>
+                        </div>
+                        <label for="attr_pc_ship_maneuver_bonus"><span data-i18n="maneuver-bonus"></span></label>
+                        <div>
+                          <input type="text" name="attr_pc_ship_pilot_dex_modifier"/>
+                        </div>
+                        <label for="attr_pc_ship_pilot_dex_modifier"><span data-i18n="pilot-dex-modifier"></span></label>
+                        <div>
+                          <input type="text" name="attr_pc_ship_misc_mod_bonus"/>
+                        </div>
+                        <label for="attr_pc_ship_misc_mod_bonus"><span data-i18n="misc-mod-bonus"></span></label>
+                  </div>
                 </div>
               </div>
-              <div class="sheet-grid-container sheet-maneuver-defense">
-                <div><img src="https://raw.githubusercontent.com/mperes/Esper-Images/main/maneuver_defense.png" alt="Maneuver Bonus"/></div>
+              <div class="sheet-maneuver-defense">
+                    <h3><span data-i18n="maneuver-defense"></span></h3>
                 <div class="sheet-grid-container">
-                      <div>
-                        <input type="text" name="attr_pc_ship_base_maneuver_defense"/>
-                      </div>
-                      <label for="attr_pc_ship_base_maneuver_defense"><span data-i18n="base-maneuver-defense"></span></label>
-                      <div>
-                        <input type="text" name="attr_pc_ship_proficiency_bonus"/>
-                      </div>
-                      <label for="attr_pc_ship_proficiency_bonus"><span data-i18n="proficiency-bonus"></span></label>
-                      <div>
-                        <input type="text" name="attr_pc_ship_pilot_wis_modifier"/>
-                      </div>
-                      <label for="attr_pc_ship_pilot_wis_modifier"><span data-i18n="pilot-wis-modifier"></span></label>
-                      <div>
-                        <input type="text" name="attr_pc_ship_captain_cha_modifier"/>
-                      </div>
-                      <label for="attr_pc_ship_captain_cha_modifier"><span data-i18n="captain-cha-modifier"></span></label>
+                  <div><img src="https://raw.githubusercontent.com/mperes/Esper-Images/main/maneuver_defense.png" alt="Maneuver Bonus"/></div>
+                  <div class="sheet-grid-container">
+                        <div>
+                          <input type="text" name="attr_pc_ship_base_maneuver_defense"/>
+                        </div>
+                        <label for="attr_pc_ship_base_maneuver_defense"><span data-i18n="base-maneuver-defense"></span></label>
+                        <div>
+                          <input type="text" name="attr_pc_ship_proficiency_bonus"/>
+                        </div>
+                        <label for="attr_pc_ship_proficiency_bonus"><span data-i18n="proficiency-bonus"></span></label>
+                        <div>
+                          <input type="text" name="attr_pc_ship_pilot_wis_modifier"/>
+                        </div>
+                        <label for="attr_pc_ship_pilot_wis_modifier"><span data-i18n="pilot-wis-modifier"></span></label>
+                        <div>
+                          <input type="text" name="attr_pc_ship_captain_cha_modifier"/>
+                        </div>
+                        <label for="attr_pc_ship_captain_cha_modifier"><span data-i18n="captain-cha-modifier"></span></label>
+                  </div>
                 </div>
               </div>
             </div>
diff --git a/Esper_Genesis_5E/EG_Sheet.sass b/Esper_Genesis_5E/EG_Sheet.sass
index ca83cc7c99..22ab96a1f0 100644
--- a/Esper_Genesis_5E/EG_Sheet.sass
+++ b/Esper_Genesis_5E/EG_Sheet.sass
@@ -6436,27 +6436,32 @@ div.sheet-charmancer
           .sheet-grid-container
             .sheet-armor-class,.sheet-maneuver-defense
               background: #f4fafd
-              grid-template-columns: 115px 1fr
-              grid-gap: 10px
               padding: 10px
 
-              > div:first-child
-                  align-items: center
-                  display: flex
+              h3
+                text-align: center
+                     
+              > .sheet-grid-container
+                grid-template-columns: 115px 1fr
+                grid-gap: 10px
 
-              .sheet-grid-container
-                grid-template-rows: repeat(4, 1fr)
-                grid-template-columns: 30px 1fr
-                grid-gap: 5px
-                
-                label
-                  align-items: center
-                  display: flex
-                  line-height: 11px
-                  position: relative
+                > div:first-child
+                    align-items: center
+                    display: flex
 
-                  span
-                    font-size: 11px
+                .sheet-grid-container
+                  grid-template-rows: repeat(4, 1fr)
+                  grid-template-columns: 30px 1fr
+                  grid-gap: 5px
+                  
+                  label
+                    align-items: center
+                    display: flex
+                    line-height: 11px
+                    position: relative
+
+                    span
+                      font-size: 11px
             
             .sheet-armor-class
               
diff --git a/Esper_Genesis_5E/src/pc/ship.pug b/Esper_Genesis_5E/src/pc/ship.pug
index d36bd62938..8a2fdac23c 100644
--- a/Esper_Genesis_5E/src/pc/ship.pug
+++ b/Esper_Genesis_5E/src/pc/ship.pug
@@ -140,21 +140,25 @@ mixin armorClassOrManeuverEntry(name)
     .sheet-grid-container
       div
         .sheet-grid-container
-          .sheet-grid-container.sheet-armor-class
-            div
-              img(src=`${imagePath}/armor_class.png` alt='Armor Class')
+          .sheet-armor-class
+            +subtitle('armor-class')
             .sheet-grid-container
-              +armorClassOrManeuverEntry('base_armor_class')
-              +armorClassOrManeuverEntry('maneuver_bonus')
-              +armorClassOrManeuverEntry('pilot_dex_modifier')
-              +armorClassOrManeuverEntry('misc_mod_bonus')
+              div
+                img(src=`${imagePath}/armor_class.png` alt='Armor Class')
+              .sheet-grid-container
+                +armorClassOrManeuverEntry('base_armor_class')
+                +armorClassOrManeuverEntry('maneuver_bonus')
+                +armorClassOrManeuverEntry('pilot_dex_modifier')
+                +armorClassOrManeuverEntry('misc_mod_bonus')
           
-          .sheet-grid-container.sheet-maneuver-defense
-            div
-              img(src=`${imagePath}/maneuver_defense.png` alt='Maneuver Bonus')
+          .sheet-maneuver-defense
+            +subtitle('maneuver-defense')
             .sheet-grid-container
-              +armorClassOrManeuverEntry('base_maneuver_defense')
-              +armorClassOrManeuverEntry('proficiency_bonus')
-              +armorClassOrManeuverEntry('pilot_wis_modifier')
-              +armorClassOrManeuverEntry('captain_cha_modifier')
+              div
+                img(src=`${imagePath}/maneuver_defense.png` alt='Maneuver Bonus')
+              .sheet-grid-container
+                +armorClassOrManeuverEntry('base_maneuver_defense')
+                +armorClassOrManeuverEntry('proficiency_bonus')
+                +armorClassOrManeuverEntry('pilot_wis_modifier')
+                +armorClassOrManeuverEntry('captain_cha_modifier')
       div
\ No newline at end of file
diff --git a/Esper_Genesis_5E/translation.json b/Esper_Genesis_5E/translation.json
index 09a3037d4b..c9fb0851b4 100644
--- a/Esper_Genesis_5E/translation.json
+++ b/Esper_Genesis_5E/translation.json
@@ -754,10 +754,12 @@
 	"maneuver-save-dc-info": "= 8 + Pilot's Proficiency Bonus + Pilot's Dex Modifier + Captain's CHA Modifier",
 	"special-features-and-options": "Special Features and Options",
 	"ship-cargo": "Ship Cargo",
+	"armor-class": "Armor Class",
 	"base-armor-class": "Base Armor Class",
 	"maneuver-bonus": "Maneuver Bonus",
 	"pilot-dex-modifier": "Pilot's DEX Modifier",
 	"misc-mod-bonus": "Misc Mod Bonus",
+	"maneuver-defense": "Maneuver Defense",
 	"base-maneuver-defense": "",
 	"proficiency-bonus": "Proficiency Bonus",
 	"pilot-wis-modifier": "Pilot's WIS Modifier",