diff --git a/templates/actors/newActor/character-sheet.html b/templates/actors/newActor/character-sheet.html
index 92def5da..4e0c7338 100644
--- a/templates/actors/newActor/character-sheet.html
+++ b/templates/actors/newActor/character-sheet.html
@@ -37,16 +37,13 @@
 		<div class="attributes">
 			{{!-- ARMOR CLASS --}}
 			<section>
-				
-				<li class="attribute armor">
-                    <h4 class="attribute-name box-title">
-                        {{ localize "SW5E.ArmorClass" }}
-                        <a class="config-button" data-action="armor" title="{{localize 'SW5E.ArmorConfig'}}"><i class="fas fa-cog"></i></a>
-                    </h4>
-                    <div class="attribute-value attributable" data-property="attributes.ac">
-                        <span>{{data.attributes.ac.value}}</span>
-                    </div>
-				</li>
+				<h1 class="attribute-name armor">
+					{{ localize "SW5E.ArmorClass" }}
+					<a class="config-button" data-action="armor" title="{{localize 'SW5E.ArmorConfig'}}"><i class="fas fa-cog"></i></a>
+				</h1>
+				<div class="attribute-value attributable" data-property="attributes.ac">
+					<span>{{data.attributes.ac.value}}</span>
+				</div>
 			</section>
 
 			{{!-- HIT POINTS --}}
@@ -99,7 +96,7 @@
 
 			{{!-- SPEED / MOVEMENT TYPES --}}
 			<section>
-				<h1>
+				<h1 class="attribute-name movement">
 					{{ localize "SW5E.Movement" }}
 					<a class="config-button" data-action="movement" title="{{localize 'SW5E.MovementConfig'}}"><i class="fas fa-cog"></i></a>
 				</h1>
diff --git a/templates/actors/newActor/npc-sheet.html b/templates/actors/newActor/npc-sheet.html
index 64782ccb..9d50d67f 100644
--- a/templates/actors/newActor/npc-sheet.html
+++ b/templates/actors/newActor/npc-sheet.html
@@ -37,18 +37,16 @@
         <div class="attributes">
 			{{!-- ARMOR CLASS --}}
 			<section>
-                <li class="attribute armor">
-                    <h4 class="attribute-name box-title">
-                        {{ localize "SW5E.ArmorClass" }}
-                        <a class="config-button" data-action="armor" title="{{localize 'SW5E.ArmorConfig'}}"><i class="fas fa-cog"></i></a>
-                    </h4>
-                    <div class="attribute-value attributable" data-property="attributes.ac">
-                        <span>{{data.attributes.ac.value}}</span>
-                    </div>
-                    <footer class="attribute-footer">
-                        <span>{{labels.armorType}}</span>
-                    </footer>
-                </li>
+                <h1 class="attribute-name armor">
+                    {{ localize "SW5E.ArmorClass" }}
+                    <a class="config-button" data-action="armor" title="{{localize 'SW5E.ArmorConfig'}}"><i class="fas fa-cog"></i></a>
+                </h1>
+                <div class="attribute-value attributable" data-property="attributes.ac">
+                    <span>{{data.attributes.ac.value}}</span>
+                </div>
+                <footer class="attribute-footer">
+                    <span>{{labels.armorType}}</span>
+                </footer>
 			</section>
 
 			{{!-- HIT POINTS --}}
@@ -67,7 +65,8 @@
                 </footer>
             </section>
             <section>
-				<h1>{{ localize "SW5E.Movement" }}
+                <h1 class="attribute-name movement">
+                    {{ localize "SW5E.Movement" }}
                     <a class="config-button" data-action="movement" title="{{localize 'SW5E.MovementConfig'}}"><i class="fas fa-cog"></i></a>
                 </h1>
                 <div class="attribute-value">