diff --git a/styles/simple.css b/styles/simple.css
index 06ff1d1..ac8e050 100644
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -606,6 +606,9 @@ ul, li {
   flex-grow: 2;
   margin-left: 4px;
 }
+.status-header-label {
+  margin-left: 2px;
+}
 .roll-dialog-label {
   margin: 4px 0;
   min-width: 96px;
@@ -1317,7 +1320,7 @@ Focus FOC: #ff0084
   max-width: 24px;
 }
 .status-col-name {
-  max-width: 62px;
+  max-width: 72px;
 }
 .status-block {
   max-width: 216px;
diff --git a/system.json b/system.json
index 255e5e9..9b9f4dd 100644
--- a/system.json
+++ b/system.json
@@ -183,6 +183,6 @@
   "templateVersion": 86,
   "title": "Pegasus RPG",
   "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "background" : "./images/ui/pegasus_welcome_page.webp"
 }
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index 19e631a..9239efc 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -284,8 +284,8 @@
         <ul>
           <li class="item flexrow list-item" data-key="nrg">
             <span class="stat-label flexrow" name="nrg"><h4>{{data.nrg.label}}</h4>               </span>
-            <span class="small-label padd-right packed-left">Act</span><input type="text" class="padd-right update-field" data-field-name="data.nrg.activated" value="{{data.nrg.activated}}" data-dtype="Number"/>
-            <span class="small-label padd-right packed-left">&nbsp;Cur</span><input type="text" class="padd-right update-field" data-field-name="data.nrg.value" value="{{data.nrg.value}}" data-dtype="Number"/>
+            <span class="small-label padd-right packed-left">Activated</span><input type="text" class="padd-right update-field" data-field-name="data.nrg.activated" value="{{data.nrg.activated}}" data-dtype="Number"/>
+            <span class="small-label padd-right packed-left">&nbsp;Current</span><input type="text" class="padd-right update-field" data-field-name="data.nrg.value" value="{{data.nrg.value}}" data-dtype="Number"/>
             <span class="small-label padd-right packed-left">&nbsp;Mod</span><input type="text" class="padd-right update-field" data-field-name="data.nrg.mod" value="{{data.nrg.mod}}" data-dtype="Number"/>
             <span class="small-label padd-right packed-left">&nbsp;Max</span><input type="text" class="padd-right update-field" data-field-name="data.nrg.max" value="{{data.nrg.max}}" data-dtype="Number"/>
             <span class="small-label padd-right packed-left"> / {{data.nrg.absolutemax}}</span>
@@ -561,8 +561,8 @@
               <input type="text" class="" name="data.biodata.preferredhand" value="{{data.biodata.preferredhand}}" data-dtype="String" />
             </li>            
             <li class="flexrow item" data-item-id="{{race._id}}">
-              <a class="item-edit"><img class="stat-icon" src="{{race.img}}"></a>
               <label class="generic-label">Race</label>
+              <a class="item-edit"><img class="stat-icon" src="{{race.img}}"></a>
               <input type="text" class="" name="data.biodata.racename" value="{{race.name}}" disabled  data-dtype="String" />
               <div class="item-controls">
                 <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
diff --git a/templates/partial-actor-status.html b/templates/partial-actor-status.html
index a097d4a..e7d28d6 100644
--- a/templates/partial-actor-status.html
+++ b/templates/partial-actor-status.html
@@ -1,12 +1,12 @@
 <ul class="status-block">
-  <li class="item flexrow list-item">
-    <span class="status-small-label status-col-name"><strong>Status</strong></span>
-    <span class="status-small-label no-grow">Cur</span>
-    <span class="status-small-label no-grow">Max</span>
-    <span class="status-small-label no-grow">Mod</span>
+  <li class="item flexrow">
+    <span class="stat-label status-small-label status-col-name"><label class="status-small-label"><strong>Status</strong></label></span>
+    <span class="status-header-label status-small-label no-grow"><label class="status-small-label">Cur</label></span>
+    <span class="status-header-label status-small-label no-grow"><label class="status-small-label">Max</label></span>
+    <span class="status-header-label status-small-label no-grow"><label class="status-small-label">Mod</label></span>
   </li>
   {{#each data.secondary as |stat2 key|}}
-    <li class="item flexrow list-item" data-attr-key="{{key}}">
+    <li class="item flexrow " data-attr-key="{{key}}">
       <span class="stat-label flexrow status-col-name" name="{{key}}">
         <label class="status-small-label"><strong>{{stat2.label}}</strong><br>
           {{#if (eq key "health")}}
@@ -20,25 +20,30 @@
       <input type="text" class="padd-right status-small-label no-grow" name="data.secondary.{{key}}.value" value="{{stat2.value}}" data-dtype="Number"/>
       <input type="text" class="padd-right status-small-label no-grow" name="data.secondary.{{key}}.max" value="{{stat2.max}}" data-dtype="Number"/>
       <input type="text" class="padd-right status-small-label no-grow" name="data.secondary.{{key}}.bonus" value="{{stat2.bonus}}" data-dtype="Number"/>
-      {{#if (eq key "socialhealth")}}
-        <span class="stat-label flexrow status-col-name" name="activated-nrg">
-          <label class="status-small-label"><strong>Activated NRG</strong><br>
-        </span>
-      {{/if}}
     </li>
   {{/each}}
-  <li class="item flexrow list-item" data-key="nrg">
+  <li class="item flexrow " data-key="nrg">
     <span class="stat-label flexrow status-col-name" name="nrg">
       <label class="status-small-label"><strong>{{data.nrg.label}}</strong></label>               
     </span>
     <input type="text" class="padd-right status-small-label no-grow" name="data.nrg.value" value="{{data.nrg.value}}" data-dtype="Number"/>
     <input type="text" class="padd-right status-small-label no-grow" name="data.nrg.max" value="{{data.nrg.max}}" data-dtype="Number"/>
     <input type="text" class="padd-right status-small-label no-grow" name="data.nrg.mod" value="{{data.nrg.mod}}" data-dtype="Number"/>
+  </li>
+  <li class="item flexrow " data-key="nrg">
+    <span class="stat-label flexrow status-col-name" name="activated-nrg">
+      <label class="status-small-label"><strong>Activated NRG</strong><br>
+    </span>
     <span class="stat-label flexrow status-col-name" name="activated-nrg">
       <input type="text" class="padd-right status-small-label no-grow" name="data.nrg.activated" value="{{data.nrg.activated}}" data-dtype="Number"/>
     </span>
+    <span class="stat-label flexrow status-col-name" name="momentum">
+      <label class="status-small-label flexrow"><strong>
+        <a class="stat-icon lock-unlock-sheet">{{#if editScore}}Lock{{else}}Unlock{{/if}}</a>
+      </strong></label>          
+    </span>
   </li>
-  <li class="item flexrow list-item" data-key="momentum">
+  <li class="item flexrow " data-key="momentum">
     <span class="stat-label flexrow status-col-name" name="momentum">
       <label class="status-small-label"><strong>Momentum</strong></label>               
     </span>
@@ -49,13 +54,6 @@
       <a class="momentum-minus plus-minus-button">-</a>
     </span>
   </li>
-  <li class="item flexrow list-item" data-key="momentum">
-    <span class="stat-label flexrow status-col-name" name="momentum">
-      <label class="status-small-label flexrow"><strong>
-        <a class="stat-icon lock-unlock-sheet">{{#if editScore}}Lock{{else}}Unlock{{/if}}</a>
-      </strong></label>          
-    </span>
-  </li>
   <!--<li class="item flexrow list-item" data-key="lock-unlock">
     <span class="stat-label flexrow status-col-name" name="momentum">
       <a class="stat-icon lock-unlock-sheet"><img class="small-button-container"