diff --git a/modules/pegasus-actor.js b/modules/pegasus-actor.js
index d6d0f19..ec606f7 100644
--- a/modules/pegasus-actor.js
+++ b/modules/pegasus-actor.js
@@ -297,13 +297,13 @@ export class PegasusActor extends Actor {
 
   /* ------------------------------------------- */
   async buildContainerTree() {
-    let equipments = duplicate(this.data.items.filter(item => item.type == "equipment") || [] )
+    let equipments = duplicate(this.data.items.filter(item => item.type == "equipment") || [])
     for (let equip1 of equipments) {
-      if ( equip1.data.iscontainer) {
+      if (equip1.data.iscontainer) {
         equip1.data.contents = []
         equip1.data.contentsEnc = 0
         for (let equip2 of equipments) {
-          if ( equip1._id != equip2._id && equip2.data.containerid == equip1._id ) {
+          if (equip1._id != equip2._id && equip2.data.containerid == equip1._id) {
             equip1.data.contents.push(equip2)
             equip1.data.contentsEnc += equip2.data.weight
           }
@@ -311,27 +311,35 @@ export class PegasusActor extends Actor {
       }
     }
 
+    // Compute whole enc
     let enc = 0
-    for( let item of equipments) {
+    for (let item of equipments) {
       if (item.data.equipped) {
-        if ( item.data.iscontainer) {
+        if (item.data.iscontainer) {
           enc += item.data.contentsEnc
         } else {
           enc += item.data.weight
         }
       }
     }
+    for (let item of this.data.items) { // Process items/shields/armors
+      if ((item.type == "weapon" || item.type == "shield" || item.type == "armor") && item.data.data.equipped) {
+        enc += item.data.data.weight
+      }
+    }
+
+    // Store local values
     this.encCurrent = enc
-    this.containersTree = equipments.filter( item => item.data.containerid == "") // Returns the root of equipements without container
+    this.containersTree = equipments.filter(item => item.data.containerid == "") // Returns the root of equipements without container
 
     // Manages slow effect
-    let overCapacity = Math.floor(this.encCurrent / this.getEncumbranceCapacity() )
-    this.encHindrance = Math.floor(this.encCurrent / this.getEncumbranceCapacity() )
-    
+    let overCapacity = Math.floor(this.encCurrent / this.getEncumbranceCapacity())
+    this.encHindrance = Math.floor(this.encCurrent / this.getEncumbranceCapacity())
+
     //console.log("Capacity", overCapacity, this.encCurrent / this.getEncumbranceCapacity() )
     let effect = this.data.items.find(item => item.type == "effect" && item.data.data.slow)
-    if (overCapacity >= 4  ) {
-      if ( !effect) {
+    if (overCapacity >= 4) {
+      if (!effect) {
         effect = await PegasusUtility.getEffectFromCompendium("Slowed")
         effect.data.slow = true
         this.createEmbeddedDocuments('Item', [effect])
@@ -344,14 +352,27 @@ export class PegasusActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  modifyMomentum( incDec) {
+  modifyMomentum(incDec) {
     let momentum = duplicate(this.data.data.momentum)
     momentum.value += incDec
-    if ( momentum.value >= 0 && momentum.value <= momentum.max ){
-      this.update( { 'data.momentum': momentum})
+    if (momentum.value >= 0 ) {
+      this.update({ 'data.momentum': momentum })
+      let chatData = {
+        user: game.user.id,
+        rollMode: game.settings.get("core", "rollMode"),
+        whisper: [game.user.id].concat(ChatMessage.getWhisperRecipients('GM'))
+      }
+      if (incDec > 0) {
+        chatData.content = `<div>${this.name} has gained a Momentum</div`
+      } else {
+        chatData.content = `<div>${this.name} has used a Momentum</div`
+      }
+      ChatMessage.create(chatData)
+    }else {
+      ui.notifications.warn("Momentum cannot go below 0")
     }
   }
-  
+
   /* -------------------------------------------- */
   getActiveEffects(matching = it => true) {
     let array = Array.from(this.getEmbeddedCollection("ActiveEffect").values());
@@ -372,25 +393,25 @@ export class PegasusActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  async addObjectToContainer( itemId, containerId ) {
-    let container = this.data.items.find( item => item.id == containerId && item.data.data.iscontainer)
-    let object = this.data.items.find( item => item.id == itemId )
+  async addObjectToContainer(itemId, containerId) {
+    let container = this.data.items.find(item => item.id == containerId && item.data.data.iscontainer)
+    let object = this.data.items.find(item => item.id == itemId)
     console.log("Found", container, object)
-    if ( container ) {
-      if ( object.data.data.iscontainer) {
+    if (container) {
+      if (object.data.data.iscontainer) {
         ui.notifications.warn("Only 1 level of container allowed")
         return
       }
-      let alreadyInside = this.data.items.filter( item => item.data.data.containerid && item.data.data.containerid == containerId);
-      if ( alreadyInside.length >= container.data.data.containercapacity ) {
+      let alreadyInside = this.data.items.filter(item => item.data.data.containerid && item.data.data.containerid == containerId);
+      if (alreadyInside.length >= container.data.data.containercapacity) {
         ui.notifications.warn("Container is already full !")
         return
-      } else { 
-        await this.updateEmbeddedDocuments( "Item", [{ _id: object.id, 'data.containerid':containerId }] )
+      } else {
+        await this.updateEmbeddedDocuments("Item", [{ _id: object.id, 'data.containerid': containerId }])
       }
-    } else if ( object && object.data.data.containerid) { // remove from container
+    } else if (object && object.data.data.containerid) { // remove from container
       console.log("Removeing: ", object)
-      await this.updateEmbeddedDocuments( "Item", [{ _id: object.id, 'data.containerid':"" }]);
+      await this.updateEmbeddedDocuments("Item", [{ _id: object.id, 'data.containerid': "" }]);
     }
   }
 
@@ -414,7 +435,7 @@ export class PegasusActor extends Actor {
 
     let dropID = $(event.target).parents(".item").attr("data-item-id") // Only relevant if container drop
     let objectID = item.id || item._id
-    this.addObjectToContainer( objectID, dropID )
+    this.addObjectToContainer(objectID, dropID)
   }
 
   /* -------------------------------------------- */
@@ -438,7 +459,7 @@ export class PegasusActor extends Actor {
   getSubActors() {
     let subActors = [];
     for (let id of this.data.data.subactors) {
-      subActors.push( duplicate(game.actors.get(id)) )
+      subActors.push(duplicate(game.actors.get(id)))
     }
     return subActors;
   }
@@ -531,7 +552,7 @@ export class PegasusActor extends Actor {
         effects.push(effect)
       }
       if (effects.length > 0) {
-        this.createEmbeddedDocuments('Item', effects )
+        this.createEmbeddedDocuments('Item', effects)
       }
       this.updateEmbeddedDocuments('Item', [{ _id: itemId, 'data.activated': true }])
     }
@@ -735,7 +756,7 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   async computeNRGHealth() {
     if (this.isToken) return
-    
+
     if (this.isOwner || game.user.isGM) {
       let updates = {}
       let phyDiceValue = PegasusUtility.getDiceValue(this.data.data.statistics.phy.value) + this.data.data.secondary.health.bonus + this.data.data.statistics.phy.mod;
@@ -974,8 +995,8 @@ export class PegasusActor extends Actor {
     if (this.data.data.combat.hindrancedice > 0) {
       effectsList.push({ label: "Health/Delirium Hindrance", type: "hindrance", applied: false, value: this.data.data.combat.hindrancedice })
     }
-    let overCapacity = Math.floor(this.encCurrent / this.getEncumbranceCapacity() )
-    if (overCapacity > 0  ) {
+    let overCapacity = Math.floor(this.encCurrent / this.getEncumbranceCapacity())
+    if (overCapacity > 0) {
       effectsList.push({ label: "Encumbrance Hindrance", type: "hindrance", applied: false, value: overCapacity })
     }
     let effects = this.data.items.filter(item => item.type == 'effect')
@@ -1083,14 +1104,14 @@ export class PegasusActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  powerDmgRoll( itemId) {
+  powerDmgRoll(itemId) {
     let power = this.data.items.get(itemId)
-    if (power )  {
+    if (power) {
       power = duplicate(power)
-      this.rollPool( power.data.dmgstatistic )
+      this.rollPool(power.data.dmgstatistic)
     }
   }
-  
+
   /* -------------------------------------------- */
   rollPool(statKey, useShield = false) {
     let stat = this.getStat(statKey)
diff --git a/styles/simple.css b/styles/simple.css
index 7c3d130..06ff1d1 100644
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -217,9 +217,10 @@ table {border: 1px solid #7a7971;}
   -webkit-box-flex: 0;
   -ms-flex: 0 0 128px;
   flex: 0 0 128px;
-  width: 128px;
+  width: 196px;
   height: auto;
   max-height:260px;
+  margin-top: 0px;
   margin-right: 10px;
   object-fit: cover;
   object-position: 50% 0;
@@ -1253,11 +1254,18 @@ Stealth STL: #505050
 Perception PER: #f9c801     Also Used for Ranged Damage
 Focus FOC: #ff0084
 */  
+.color-class-black {
+  background-color: black;
+  background: black;
+}
 .color-class-agi,
 .color-class-range {
   background-color: #02a41d;
   background: #02a41d;
 }
+.color-class-pool {
+  background-color:#c5c3c3;
+}
 .color-class-mnd {
   background-color: #a100fe;
 }
@@ -1272,6 +1280,9 @@ Focus FOC: #ff0084
 .color-class-dmgres {
   background-color: #990304;
 }
+.color-class-mr {
+  background-color: #050505;
+}
 .color-class-com,
 .color-class-melee {
   background-color: #0136ff;
@@ -1306,10 +1317,10 @@ Focus FOC: #ff0084
   max-width: 24px;
 }
 .status-col-name {
-  max-width: 48px;
+  max-width: 62px;
 }
 .status-block {
-  max-width: 128px;
+  max-width: 216px;
 }
 .momentum-block {
   max-width: 128px;
@@ -1325,7 +1336,7 @@ Focus FOC: #ff0084
 }
 .stat-margin {
   margin-left: 4px;
-  margin-top: 6px;  
+  margin-top: 5px;  
 }
 .combat-margin {
   margin-left: 4px;
@@ -1336,6 +1347,7 @@ Focus FOC: #ff0084
 }
 .item-stat-roll {
   max-height: 42px;
+  min-height: 36px;
 }
 .item-stat-roll select, .item-stat-roll input {
   margin-top: 4px;
@@ -1349,4 +1361,17 @@ Focus FOC: #ff0084
   max-width: 48px;
   max-height: 48px;
   border: 0;
+}
+.items-title-bg {
+  margin-top: 6px;
+  background: black;
+  color: white;
+}
+.lock-icon {
+  width:16px;
+  height: 16px;
+}
+.item-sheet-img {
+  width: 64px;
+  height: auto;
 }
\ No newline at end of file
diff --git a/system.json b/system.json
index 2a7a74d..255e5e9 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.2",
+  "version": "0.5.3",
   "background" : "./images/ui/pegasus_welcome_page.webp"
 }
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index 93ad6f7..19e631a 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -3,12 +3,11 @@
   {{!-- Sheet Header --}}
   <header class="sheet-header">
     <div class="header-fields">
+      <h1 class="charname margin-right"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
       <div class="flexrow">
         <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
         <div class="flexcol">
           
-          <h1 class="charname margin-right"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
-
           <div class="flexrow">                            
               <div class="stat-item">
                 <ul>
@@ -17,6 +16,14 @@
                       {{> systems/fvtt-pegasus-rpg/templates/partial-actor-stat-block.html stat=stat key=key}}
                     {{/if}}
                   {{/each}}
+                  <li class="item flexrow list-item color-class-pool item-stat-roll" data-attr-key="pool">
+                    <span class="stat-icon">
+                      <img class="stat-icon" src="icons/dice/d12black.svg">
+                    </span>
+                    <span class="stat-label stat-margin" name="pool">
+                      <h4 class="stat-text-white stat-margin"><a class="generic-pool-roll stat-margin" data-stat-key="pool">Dice Pool</a></h4>
+                    </span>
+                  </li>                  
                 </ul>    
               </div>
               
@@ -27,6 +34,22 @@
                       {{> systems/fvtt-pegasus-rpg/templates/partial-actor-stat-block.html stat=stat key=key}}
                     {{/if}}
                   {{/each}}
+                  <li class="item flexrow list-item color-class-mr item-stat-roll" data-attr-key="mr">
+                    <span class="stat-icon">
+                      <img class="stat-icon" src="systems/fvtt-pegasus-rpg/images/icons/MR.webp">
+                    </span>
+                    <span class="stat-label stat-margin" name="mr">
+                      <h4 class="stat-text-white stat-margin"><a class="roll-stat stat-margin" data-stat-key="mr">MR</a></h4>
+                    </span>
+                    <select class="status-small-label color-class-common" type="text" name="data.mr.value" value="{{data.mr.value}}"
+                      data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+                      {{#select stat.value}}
+                      {{{@root.optionsDiceList}}}
+                      {{/select}}
+                    </select>
+                    <input type="text" class="input-numeric-short padd-right status-small-label color-class-common" name="data.mr.mod" value="{{data.mr.mod}}"
+                      data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}} />
+                  </li>                  
                 </ul>    
               </div>
 
@@ -34,37 +57,10 @@
                 {{> systems/fvtt-pegasus-rpg/templates/partial-actor-status.html}}         
               </div>
 
-              <div class="stat-item momentum-block">
-                <div class="flexcol">
-                  <label class="status-small-label"><strong>Momentum</strong></label>
-                  <table class="table-momentum">
-                    <tr>
-                      <td>
-                        <img class="img-no-border" src="systems/fvtt-pegasus-rpg/images/icons/Momentum.webp">
-                      </td>
-                      <td>
-                        <a class="momentum-plus plus-minus-button">+</a>
-                        <br>
-                        <a class="momentum-minus plus-minus-button">-</a>
-                      </td>
-                      <tr>
-                        <td colspan="2">
-                          <label class="status-small-label">Cur&nbsp;&nbsp;&nbsp;Max</label><br>
-                          <input type="text" class="padd-right status-small-label no-grow" name="data.momentum.value" value="{{data.momentum.value}}" data-dtype="Number"/>
-                          <input type="text" class="padd-right status-small-label no-grow" name="data.momentum.max" value="{{data.momentum.max}}" data-dtype="Number"/>                    
-                        </td>
-                      </tr>
-                      <tr>
-                        <td>
-                          <label class="status-small-label">Active NRG</label> 
+                          <!--
+                            <label class="status-small-label">Active NRG</label> 
                           <input type="text" class="padd-right status-small-label no-grow" name="data.nrg.activated" value="{{data.nrg.activated}}" data-dtype="Number"/>
-                      </td>
-                      </tr>
-                    </tr>
-                  </table>
-                </div>  
-              </div>
-
+                          -->
           
           </div>
         </div>
@@ -153,9 +149,9 @@
             </span>
             <ul class="stat-list alternate-list">
               <li class="item stat flexrow list-item">
-                <span class="generic-label">Stun Level</span>
+                <span class="generic-label small-label">Current</span>
                 <input type="text" class="" name="data.combat.stunlevel" value="{{data.combat.stunlevel}}" data-dtype="Number" />
-                <span class="generic-label">Stun Threshold</span>
+                <span class="generic-label small-label">Threshold</span>
                 <input type="text" class="" name="data.combat.stunthreshold" value="{{data.combat.stunthreshold}}" data-dtype="Number" />
               </li>
             </ul>
@@ -164,12 +160,12 @@
 
         <div>
           <span class="generic-label">
-            <h3>Perks</h3>
+            <h3 class="items-title-bg">Perks</h3>
           </span>
           <ul class="stat-list alternate-list">
             {{#each perks as |perk key|}}
             <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{perk._id}}">
-              <img class="sheet-competence-img" src="{{perk.img}}" />
+              <a class="item-edit" title="Edit Item"><img class="sheet-competence-img" src="{{perk.img}}" /></a>
               <span class="stat-label">{{perk.name}}</span>
               <span class="stat-label">Lvl:{{perk.data.level}}</span>
               {{#if perk.data.features.range.flag}}
@@ -214,9 +210,7 @@
                 <span class="stat-label">&nbsp;</span>
                 <span class="stat-label">&nbsp;</span>
               {{/if}}
-
               <div class="item-controls">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                 <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
@@ -225,19 +219,18 @@
         </div>
         
         <div>
-          <h3>Effects</h3>
+          <h3 class="items-title-bg">Effects</h3>
         </div>
         <ul class="stat-list alternate-list">
           {{#each effects as |effect key|}}
           <li class="item stat flexrow list-item list-item-shadow" data-arme-id="{{effect.id}}" data-item-id="{{effect._id}}">
-            <img class="sheet-competence-img" src="{{effect.img}}" />
+            <a class="item-edit" title="Edit Item"><img class="sheet-competence-img" src="{{effect.img}}" /></a>
             <span class="generic-label">{{effect.name}}</span>
             <span class="generic-label">{{upperFirst effect.data.type}}</span>
             <span class="generic-label">{{upperFirst effect.data.genre}}</span>
             <span class="generic-label">Lvl:{{effect.data.effectlevel}}</span>
             <span class="generic-label">{{upper effect.data.stataffected}}</span>
             <div class="item-controls">
-              <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
               <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
@@ -253,12 +246,12 @@
 
         <div>
           <span class="generic-label">
-            <h3>Specialisations</h3>
+            <h3 class="items-title-bg">Specialisations</h3>
           </span>
           <ul class="stat-list alternate-list">
             {{#each specs as |spec key|}}
             <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{spec._id}}">
-              <img class="sheet-competence-img" src="{{spec.img}}" />
+              <a class="item-edit" title="Edit Item"><img class="sheet-competence-img" src="{{spec.img}}" /></a>              
               <span class="stat-label"><a class="roll-spec">{{spec.name}}</a></span>
               <span class="stat-label">{{upper spec.data.statistic}}</span>
               <span class="stat-label">{{spec.data.dice}}</span>
@@ -272,7 +265,6 @@
                 <span class="stat-label">&nbsp;</span>
               {{/if}}
               <div class="item-controls">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                 <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
@@ -301,12 +293,12 @@
         </ul>
 
         <span class="generic-label">
-          <h3>Powers</h3>
+          <h3 class="items-title-bg">Powers</h3>
         </span>
         <ul class="stat-list alternate-list">
           {{#each powers as |power key|}}
           <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{power._id}}">
-            <img class="sheet-competence-img" src="{{power.img}}" />
+            <a class="item-edit" title="Edit Item"><img class="sheet-competence-img" src="{{power.img}}" /></a>
             <span class="stat-label">
               {{#if power.data.rollneeded}}
               <a class="power-roll">{{power.name}}</a>
@@ -335,7 +327,6 @@
             <div class="item-controls">
               <a class="item-control power-activate" title="Activated">{{#if power.data.activated}}<i
                 class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-              <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
               <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
@@ -343,15 +334,14 @@
         </ul>
 
         <span class="generic-label">
-          <h3>Abilities</h3>
+          <h3 class="items-title-bg">Abilities</h3>
         </span>
         <ul class="stat-list alternate-list">
           {{#each abilities as |ability key|}}
           <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{ability._id}}">
-            <img class="sheet-competence-img" src="{{ability.img}}" />
+            <a class="item-edit" title="Edit Item"><img class="sheet-competence-img" src="{{ability.img}}" /></a>
             <span class="stat-label">{{ability.name}}</span>
             <div class="item-controls">
-              <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
               <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
@@ -372,19 +362,18 @@
       </div>
 
       <div>
-        <h3>Money</h3>
+        <h3 class="items-title-bg">Money</h3>
       </div>
       <ul class="item-list alternate-list">
         {{#each moneys as |money key|}}
         <li class="item flexrow list-item list-item-shadow" data-item-id="{{money._id}}">
-          <img class="sheet-competence-img" src="{{money.img}}" />
+          <a class="item-edit" title="Edit Item"><img class="sheet-competence-img" src="{{money.img}}" /></a>
           <span class="equipement-label">{{money.name}}</span>
           <span class="generic-label">
             Qty {{money.data.quantity}}
             (<a class="quantity-minus plus-minus-button"> -</a>/<a class="quantity-plus plus-minus-button">+</a>)
           </span>
           <div class="item-controls">
-            <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
         </li>
@@ -392,12 +381,12 @@
       </ul>
 
       <div>
-        <h3>Weapons</h3>
+        <h3 class="items-title-bg">Weapons</h3>
       </div>
       <ul class="item-list alternate-list">
         {{#each weapons as |weapon key|}}
         <li class="item flexrow list-item list-item-shadow" data-item-id="{{weapon._id}}">
-          <img class="sheet-competence-img" src="{{weapon.img}}" />
+          <a class="item-edit" title="Edit Item"><img class="sheet-competence-img" src="{{weapon.img}}" /></a>
           <span class="equipement-label">{{weapon.name}}</span>
           
           {{#if (count weapon.data.effects)}}
@@ -413,7 +402,6 @@
           <div class="item-controls">
             <a class="item-control item-equip" title="Worn">{{#if weapon.data.equipped}}<i
                 class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-            <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
         </li>
@@ -421,12 +409,12 @@
       </ul>
 
       <div>
-        <h3>Armors & Shields</h3>
+        <h3 class="items-title-bg">Armors & Shields</h3>
       </div>
       <ul class="item-list alternate-list">
         {{#each armors as |armor key|}}
         <li class="item flexrow list-item list-item-shadow" data-item-id="{{armor._id}}">
-          <img class="sheet-competence-img" src="{{armor.img}}" />
+          <a class="item-edit" title="Edit Item"><img class="sheet-competence-img" src="{{armor.img}}" /></a>
           <span class="equipement-label">{{armor.name}}</span>
           
           {{#if (count armor.data.effects)}}
@@ -442,14 +430,13 @@
           <div class="item-controls">
             <a class="item-control item-equip" title="Worn">{{#if armor.data.equipped}}<i
                 class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-            <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
         </li>
         {{/each}}
         {{#each shields as |shield key|}}
-        <li class="item flexrow list-item" data-item-id="{{shield._id}}">
-          <img class="sheet-competence-img" src="{{shield.img}}" />
+        <li class="item flexrow list-item list-item-shadow" data-item-id="{{shield._id}}">
+          <a class="item-edit" title="Edit Item"><img class="sheet-competence-img" src="{{shield.img}}" /></a>
           <span class="equipement-label">{{shield.name}}</span>
           
           {{#if (count shield.data.effects)}}
@@ -465,7 +452,6 @@
           <div class="item-controls">
             <a class="item-control item-equip" title="Worn">{{#if shield.data.equipped}}<i
                 class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-            <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
         </li>
@@ -473,12 +459,12 @@
       </ul>
 
       <div>
-        <h3>Equipment</h3>
+        <h3 class="items-title-bg">Equipment</h3>
       </div>
       <ul class="item-list alternate-list">
         {{#each containersTree as |equip key|}}
         <li class="item flexrow list-item list-item-shadow" data-item-id="{{equip._id}}">
-          <img class="sheet-competence-img" src="{{equip.img}}" />
+          <a class="item-edit" title="Edit Item"><img class="sheet-competence-img" src="{{equip.img}}" /></a>
           <span class="equipement-label">{{equip.name}}</span>
           <span class="equipement-label">{{upperFirst equip.data.type}}</span>
           <span class="generic-label">Qty {{equip.data.quantity}}</span>
@@ -500,14 +486,13 @@
           <div class="item-controls">
             <a class="item-control item-equip" title="Worn">{{#if equip.data.equipped}}<i
                 class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-            <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
         </li>
           <ul class="item-list alternate-list list-item-shadow2 list-item-margin1">
             {{#each equip.data.contents as |subgear key|}}
             <li class="item flexrow list-item" data-item-id="{{subgear._id}}">
-              <img class="sheet-competence-img" src="{{subgear.img}}"/>
+              <a class="item-edit" title="Edit Item"><img class="sheet-competence-img" src="{{subgear.img}}"/></a>
               <span class="conseq-label">{{subgear.name}}</span>
               <span class="equipement-label">{{upperFirst subgear.data.type}}</span>
               <span class="generic-label">Qty {{subgear.data.quantity}}</span>
@@ -521,7 +506,6 @@
                   <span class="stat-label">&nbsp;</span>
                 {{/if}}
                 <div class="item-controls">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                 <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
               {{/each}}
@@ -537,25 +521,25 @@
     <div class="tab biodata" data-group="primary" data-tab="biodata">
       <div class="grid grid-2col">
         <div>
-          <ul>
-            <li class="flexrow">
+          <ul class="item-list alternate-list">
+            <li class="item flexrow">
               <label class="generic-label">Origin</label>
               <input type="text" class="" name="data.biodata.origin" value="{{data.biodata.origin}}"
                 data-dtype="String" />
             </li>
-            <li class="flexrow">
+            <li class="item flexrow">
               <label class="generic-label">Age</label>
               <input type="text" class="" name="data.biodata.age" value="{{data.biodata.age}}" data-dtype="String" />
             </li>
-            <li class="flexrow">
+            <li class="item flexrow">
               <label class="generic-label">Height</label>
               <input type="text" class="" name="data.biodata.size" value="{{data.biodata.size}}" data-dtype="String" />
             </li>
-            <li class="flexrow">
+            <li class="item flexrow">
               <label class="generic-label">Eyes</label>
               <input type="text" class="" name="data.biodata.eyes" value="{{data.biodata.eyes}}" data-dtype="String" />
             </li>
-            <li class="flexrow">
+            <li class="item flexrow">
               <label class="generic-label">Hair</label>
               <input type="text" class="" name="data.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
             </li>
@@ -563,41 +547,40 @@
         </div>
         <div>
           <ul>
-            <li class="flexrow">
+            <li class="flexrow item">
               <label class="generic-label">Weight</label>
               <input type="text" class="" name="data.biodata.weight" value="{{data.biodata.weight}}"
                 data-dtype="String" />
             </li>
-            <li class="flexrow">
+            <li class="flexrow item">
               <label class="generic-label">Sex</label>
               <input type="text" class="" name="data.biodata.sex" value="{{data.biodata.sex}}" data-dtype="String" />
             </li>
-            <li class="flexrow">
+            <li class="flexrow item">
               <label class="generic-label">Preferred Hand</label>
               <input type="text" class="" name="data.biodata.preferredhand" value="{{data.biodata.preferredhand}}" data-dtype="String" />
             </li>            
-            <li class="flexrow item list_item" data-item-id="{{race._id}}">
+            <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>
               <input type="text" class="" name="data.biodata.racename" value="{{race.name}}" disabled  data-dtype="String" />
               <div class="item-controls">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                 <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
-            <li class="flexrow item list_item" data-item-id="{{role._id}}">
+            <li class="flexrow item" data-item-id="{{role._id}}">
               <label class="generic-label">Role</label>
+              <a class="item-edit"><img class="stat-icon" src="{{role.img}}"></a>
               <input type="text" class="" name="data.biodata.rolename" value="{{role.name}}" disabled data-dtype="String" />
               <div class="item-controls">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                 <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
           </ul>
         </div>
       </div>
-      <hr>
 
-      <h3>Psychology : </h3>
+      <h3 class="items-title-bg">Psychology : </h3>
       <ul>
         <li class="flexrow">
           <label class="short-label">Worst Fear </label>
@@ -629,8 +612,7 @@
         </li>
       </ul>
 
-      <hr>
-      <h3>Development : </h3>
+      <h3 class="items-title-bg">Development : </h3>
       <ul>
         <li class="flexrow">
           <label class="short-label">Character Value : </label>
diff --git a/templates/item-ability-sheet.html b/templates/item-ability-sheet.html
index b9be0ce..a45ad6d 100644
--- a/templates/item-ability-sheet.html
+++ b/templates/item-ability-sheet.html
@@ -1,6 +1,6 @@
 <form class="{{cssClass}}" autocomplete="off">
     <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+        <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
         <div class="header-fields">
             <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
         </div>
diff --git a/templates/item-armor-sheet.html b/templates/item-armor-sheet.html
index f765274..b6fd3c2 100644
--- a/templates/item-armor-sheet.html
+++ b/templates/item-armor-sheet.html
@@ -1,6 +1,6 @@
 <form class="{{cssClass}}" autocomplete="off">
     <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+        <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
         <div class="header-fields">
             <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
         </div>
diff --git a/templates/item-effect-sheet.html b/templates/item-effect-sheet.html
index b5e4a45..48fe87f 100644
--- a/templates/item-effect-sheet.html
+++ b/templates/item-effect-sheet.html
@@ -1,6 +1,6 @@
 <form class="{{cssClass}}" autocomplete="off">
     <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+        <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
         <div class="header-fields">
             <h1 class="charname">
               <input name="name" type="text" value="{{name}}" placeholder="Name"/>
diff --git a/templates/item-equipment-sheet.html b/templates/item-equipment-sheet.html
index a8a7194..0fc1c3d 100644
--- a/templates/item-equipment-sheet.html
+++ b/templates/item-equipment-sheet.html
@@ -1,6 +1,6 @@
 <form class="{{cssClass}}" autocomplete="off">
   <header class="sheet-header">
-      <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+      <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
       <div class="header-fields">
           <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
       </div>
diff --git a/templates/item-money-sheet.html b/templates/item-money-sheet.html
index 29ef5c4..f4d41fe 100644
--- a/templates/item-money-sheet.html
+++ b/templates/item-money-sheet.html
@@ -1,6 +1,6 @@
 <form class="{{cssClass}}" autocomplete="off">
   <header class="sheet-header">
-      <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+      <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
       <div class="header-fields">
           <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
       </div>
diff --git a/templates/item-perk-sheet.html b/templates/item-perk-sheet.html
index f5ac1d4..d353c99 100644
--- a/templates/item-perk-sheet.html
+++ b/templates/item-perk-sheet.html
@@ -1,6 +1,6 @@
 <form class="{{cssClass}}" autocomplete="off">
     <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+        <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
         <div class="header-fields">
             <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
         </div>
diff --git a/templates/item-power-sheet.html b/templates/item-power-sheet.html
index b406be3..abb84fb 100644
--- a/templates/item-power-sheet.html
+++ b/templates/item-power-sheet.html
@@ -1,6 +1,6 @@
 <form class="{{cssClass}}" autocomplete="off">
   <header class="sheet-header">
-    <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
+    <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}" />
     <div class="header-fields">
       <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
     </div>
@@ -12,21 +12,19 @@
   <section class="sheet-body">
 
     <div class="tab description" data-group="primary" data-tab="description">
-      <div class="small-editor item-text-long-line">
+      <div class="medium-editor item-text-long-line">
         <label class="generic-label">Description</label>
         {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
       </div>
-      <li class="flexrow"><label class="generic-label">Available Effects</label>
-        <div class="small-editor item-text-long-line">
-          {{editor content=data.effects target="data.effects" button=true owner=owner editable=editable}}
-        </div>
-      </li>
-      <li class="flexrow"><label class="generic-label">Purchased Effects</label>
-        <div class="small-editor item-text-long-line">
+      <div class="medium-editor item-text-long-line">
+        <label class="generic-label">Available Effects</label>
+        {{editor content=data.effects target="data.effects" button=true owner=owner editable=editable}}
+      </div>
+      <div class="medium-editor item-text-long-line">
+        <label class="generic-label">Purchased Effects</label>
           {{editor content=data.purchasedeffects target="data.purchasedeffects" button=true owner=owner
           editable=editable}}
-        </div>
-      </li>
+      </div>
     </div>
 
     <div class="tab details" data-group="primary" data-tab="details">
diff --git a/templates/item-race-sheet.html b/templates/item-race-sheet.html
index 226cd10..ec9bb16 100644
--- a/templates/item-race-sheet.html
+++ b/templates/item-race-sheet.html
@@ -1,6 +1,6 @@
 <form class="{{cssClass}}" autocomplete="off">
   <header class="sheet-header">
-    <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
+    <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}" />
     <div class="header-fields">
       <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
     </div>
@@ -13,19 +13,19 @@
     <div class="tab details" data-group="primary" data-tab="description">
 
       <label class="generic-label">Description</label>
-      <div class="small-editor item-text-long-line">
+      <div class="medium-editor item-text-long-line">
         {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
       </div>
       <label class="generic-label">Environment</label>
-      <div class="small-editor item-text-long-line">
+      <div class="medium-editor item-text-long-line">
         {{editor content=data.environment target="data.environment" button=true owner=owner editable=editable}}
       </div>
       <label class="generic-label">Society/Culture</label>
-      <div class="small-editor item-text-long-line">
+      <div class="medium-editor item-text-long-line">
         {{editor content=data.society_culture target="data.society_culture" button=true owner=owner editable=editable}}
       </div>
       <label class="generic-label">Outlook</label>
-      <div class="small-editor item-text-long-line">
+      <div class="medium-editor item-text-long-line">
         {{editor content=data.outlook target="data.outlook" button=true owner=owner editable=editable}}
       </div>
     </div>
diff --git a/templates/item-role-sheet.html b/templates/item-role-sheet.html
index a88d120..b0aa6eb 100644
--- a/templates/item-role-sheet.html
+++ b/templates/item-role-sheet.html
@@ -1,6 +1,6 @@
 <form class="{{cssClass}}" autocomplete="off">
     <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+        <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
         <div class="header-fields">
             <h1 class="charname">
               <input name="name" type="text" value="{{name}}" placeholder="Name"/>
diff --git a/templates/item-shield-sheet.html b/templates/item-shield-sheet.html
index 0738964..5614e11 100644
--- a/templates/item-shield-sheet.html
+++ b/templates/item-shield-sheet.html
@@ -1,6 +1,6 @@
 <form class="{{cssClass}}" autocomplete="off">
     <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+        <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
         <div class="header-fields">
             <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
         </div>
diff --git a/templates/item-specialisation-sheet.html b/templates/item-specialisation-sheet.html
index fc729eb..2652683 100644
--- a/templates/item-specialisation-sheet.html
+++ b/templates/item-specialisation-sheet.html
@@ -1,6 +1,6 @@
 <form class="{{cssClass}}" autocomplete="off">
     <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+        <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
         <div class="header-fields">
             <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
         </div>
diff --git a/templates/item-weapon-sheet.html b/templates/item-weapon-sheet.html
index c0532bf..4acd7f0 100644
--- a/templates/item-weapon-sheet.html
+++ b/templates/item-weapon-sheet.html
@@ -1,6 +1,6 @@
 <form class="{{cssClass}}" autocomplete="off">
   <header class="sheet-header">
-      <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+      <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
       <div class="header-fields">
           <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
       </div>
diff --git a/templates/partial-actor-stat-block.html b/templates/partial-actor-stat-block.html
index 8b858af..d2cdb82 100644
--- a/templates/partial-actor-stat-block.html
+++ b/templates/partial-actor-stat-block.html
@@ -3,7 +3,7 @@
     <img class="stat-icon" src="systems/fvtt-pegasus-rpg/images/icons/{{stat.abbrev}}.webp">
   </span>
   <span class="stat-label stat-margin" name="{{key}}">
-    <h4 class="stat-text-white"><a class="roll-stat" data-stat-key="{{key}}">{{stat.abbrev}}</a></h4>
+    <h4 class="stat-text-white stat-margin"><a class="roll-stat stat-margin" data-stat-key="{{key}}">{{stat.abbrev}}</a></h4>
   </span>
   <select class="status-small-label color-class-common" type="text" name="data.statistics.{{key}}.value" value="{{stat.value}}"
     data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
diff --git a/templates/partial-actor-status.html b/templates/partial-actor-status.html
index 1b0f75c..a097d4a 100644
--- a/templates/partial-actor-status.html
+++ b/templates/partial-actor-status.html
@@ -20,6 +20,11 @@
       <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">
@@ -29,7 +34,36 @@
     <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"/>
+    <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>
   </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"><strong>Momentum</strong></label>               
+    </span>
+    <input type="text" class="padd-right status-small-label no-grow" name="data.momentum.value" value="{{data.momentum.value}}" data-dtype="Number"/>
+    <input type="text" class="padd-right status-small-label no-grow" name="data.momentum.max" value="{{data.momentum.max}}" data-dtype="Number"/>
+    <span>
+      <a class="momentum-plus plus-minus-button">+</a>
+      <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" 
+      src="systems/fvtt-pegasus-rpg/images/icons/{{#if editStatSkill}}unlocked.svg{{else}}locked.svg{{/if}}" alt="lock/unlock"
+      ></a>
+    </span>-->
+  </li>
+
 </ul>
 
 <!--    <span class="small-label padd-right packed-left">Act</span>
diff --git a/templates/partial-item-description.html b/templates/partial-item-description.html
index f86966b..a78040b 100644
--- a/templates/partial-item-description.html
+++ b/templates/partial-item-description.html
@@ -1,7 +1,7 @@
 <div class="tab description" data-group="primary" data-tab="description">
   <div>
     <label class="generic-label">Description</label>
-    <div class="small-editor item-text-long-line">
+    <div class="medium-editor item-text-long-line">
     {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
     </div>
   </div>