diff --git a/styles/simple.css b/styles/simple.css
index 918d55f..f004b4b 100644
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -1466,19 +1466,28 @@ Focus FOC: #ff0084
 }
 .item-field-label-short {
   flex-grow:1;
+  margin-top: 4px;
   max-width: 4rem;
   min-width: 4rem;
 }
 .item-field-label-medium {
   flex-grow:1;
+  margin-top: 4px;
   max-width: 6rem;
   min-width: 6rem;
 }
 .item-field-label-long {
   flex-grow:1;
+  margin-top: 4px;
   max-width: 8rem;
   min-width: 8rem;
 }
+.item-field-label-vlong {
+  flex-grow:1;
+  margin-top: 4px;
+  max-width: 14rem;
+  min-width: 14rem;
+}
 .item-control-end {
   align-self: flex-end;
 }
diff --git a/templates/items/item-equipment-sheet.hbs b/templates/items/item-equipment-sheet.hbs
index a7d13fa..ddc4fd1 100644
--- a/templates/items/item-equipment-sheet.hbs
+++ b/templates/items/item-equipment-sheet.hbs
@@ -15,16 +15,16 @@
 
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
-          <li class="flexrow"><label class="generic-label">Equipped ?</label>
+          <li class="flexrow"><label class="item-field-label-long">Equipped ?</label>
             <label class="attribute-value checkbox"><input type="checkbox" name="system.equipped" {{checked system.equipped}}/></label>
           </li>
-          <li class="flexrow"><label class="generic-label">Quantity</label>
+          <li class="flexrow"><label class="item-field-label-long">Quantity</label>
             <input type="text" class="input-numeric-short padd-right" name="system.quantity" value="{{system.quantity}}" data-dtype="Number"/>
           </li>
-          <li class="flexrow"><label class="generic-label">Bulk</label>
+          <li class="flexrow"><label class="item-field-label-long">Bulk</label>
             <input type="text" class="input-numeric-short padd-right" name="system.bulk" value="{{system.bulk}}" data-dtype="Number"/>
           </li>
-          <li class="flexrow"><label class="generic-label">Cost</label>
+          <li class="flexrow"><label class="item-field-label-long">Cost</label>
             <input type="text" class="input-numeric-short padd-right" name="system.cost" value="{{system.cost}}" data-dtype="Number"/>
           </li>
       </ul>
diff --git a/templates/items/item-perk-sheet.hbs b/templates/items/item-perk-sheet.hbs
index 258b307..2ca643f 100644
--- a/templates/items/item-perk-sheet.hbs
+++ b/templates/items/item-perk-sheet.hbs
@@ -15,8 +15,9 @@
 
       <div class="tab details" data-group="primary" data-tab="details">
 
-        <li class="flexrow"><label class="generic-label">Skill Cost</label>
-          <input type="text" class="input-numeric-short padd-right" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
+        <li class="flexrow">
+          <label class="item-field-label-long">Skill Cost</label>
+          <input type="text" class="item-field-label-medium input-numeric-short padd-right" name="system.cost" value="{{system.cost}}" data-dtype="Number"/>
         </li>
 
         </div>
diff --git a/templates/items/item-skill-sheet.hbs b/templates/items/item-skill-sheet.hbs
index 1082922..71a0535 100644
--- a/templates/items/item-skill-sheet.hbs
+++ b/templates/items/item-skill-sheet.hbs
@@ -15,8 +15,8 @@
 
       <div class="tab details" data-group="primary" data-tab="details">
         <ul>
-            <li class="flexrow"><label class="generic-label">Base</label>
-              <select class="competence-base flexrow" type="text" name="system.base" value="{{system.base}}" data-dtype="String">
+            <li class="flexrow"><label class="item-field-label-long">Base</label>
+              <select class="item-field-label-long competence-base flexrow" type="text" name="system.base" value="{{system.base}}" data-dtype="String">
                 {{#select system.base}}
                   {{#each config.basebonus as |name key|}}
                   <option value="{{key}}">{{name}}</option>
@@ -25,11 +25,11 @@
               </select> 
             </li>
 
-            <li class="flexrow"><label class="generic-label">Bonus</label>
-              <input type="text" class="" name="system.bonus" value="{{system.bonus}}" data-dtype="Number"/>
+            <li class="flexrow"><label class="item-field-label-long">Bonus</label>
+              <input type="text" class="item-field-label-long" name="system.bonus" value="{{system.bonus}}" data-dtype="Number"/>
             </li>
 
-            <li class="flexrow"><label class="generic-label">Used ?</label>
+            <li class="flexrow"><label class="item-field-label-long">Used ?</label>
               <label class="attribute-value checkbox"><input type="checkbox" name="system.used" {{checked system.used}}/></label>
             </li>
 
diff --git a/templates/items/item-weapon-sheet.hbs b/templates/items/item-weapon-sheet.hbs
index 05d8042..7f231c0 100644
--- a/templates/items/item-weapon-sheet.hbs
+++ b/templates/items/item-weapon-sheet.hbs
@@ -19,8 +19,8 @@
       <div class="tab" data-group="primary">
         <ul>
 
-          <li class="flexrow"><label class="generic-label">Weapon Type</label>
-            <select class="competence-base flexrow" type="text" name="system.weapontype" value="{{system.weapontype}}" data-dtype="String">
+          <li class="flexrow"><label class="item-field-label-long">Weapon Type</label>
+            <select class="item-field-label-vlong" type="text" name="system.weapontype" value="{{system.weapontype}}" data-dtype="String">
               {{#select system.weapontype}}
                 {{#each config.weapontypes as |type key|}}
                 <option value="{{key.name}}">{{type}}</option>
@@ -29,8 +29,8 @@
             </select> 
           </li>
 
-          <li class="flexrow"><label class="generic-label">Associated skill</label>
-            <select class="competence-base flexrow" type="text" name="system.skill" value="{{system.skill}}" data-dtype="String">
+          <li class="flexrow"><label class="item-field-label-long">Associated skill</label>
+            <select class="item-field-label-vlong" type="text" name="system.skill" value="{{system.skill}}" data-dtype="String">
               {{#select system.skill}}
                 {{#each skills as |skill idx|}}
                 <option value="{{skill.name}}">{{skill.name}}</option>
@@ -38,33 +38,33 @@
               {{/select}}
             </select> 
           </li>
-          <li class="flexrow"><label class="generic-label">Penetration</label>
-            <input type="text" class="right" name="system.penetration" value="{{system.penetration}}" data-dtype="String"/>
+          <li class="flexrow"><label class="item-field-label-long">Penetration</label>
+            <input type="text" class="right item-field-label-long" name="system.penetration" value="{{system.penetration}}" data-dtype="String"/>
           </li>
 
 
-          <li class="flexrow"><label class="generic-label">Damage</label>
-            <input type="text" class="right" name="system.damage" value="{{system.damage}}" data-dtype="String"/>
+          <li class="flexrow"><label class="item-field-label-long">Damage</label>
+            <input type="text" class="right item-field-label-long" name="system.damage" value="{{system.damage}}" data-dtype="String"/>
           </li>
 
-          <li class="flexrow"><label class="generic-label">Bulk</label>
+          <li class="flexrow"><label class="item-field-label-long">Bulk</label>
             <input type="text" class="input-numeric-short padd-right" name="system.bulk" value="{{data.bulk}}" data-dtype="Number"/>
           </li>
 
-          <li class="flexrow"><label class="generic-label">BR</label>
+          <li class="flexrow"><label class="item-field-label-long">BR</label>
             <input type="text" class="input-numeric-short padd-right" name="system.br" value="{{data.br}}" data-dtype="Number"/>
           </li>
 
-          <li class="flexrow"><label class="generic-label">RoF</label>
+          <li class="flexrow"><label class="item-field-label-long">RoF</label>
             <input type="text" class="input-numeric-short padd-right" name="system.rof" value="{{data.rof}}" data-dtype="Number"/>
           </li>
 
-          <li class="flexrow"><label class="generic-label">Ammo</label>
+          <li class="flexrow"><label class="item-field-label-long">Ammo</label>
             <input type="text" class="input-numeric-short padd-right" name="system.ammo" value="{{data.ammo}}" data-dtype="Number"/>
           </li>
 
-          <li class="flexrow"><label class="generic-label">Effective Range</label>
-            <select class="competence-base flexrow" type="text" name="system.effectiverange" value="{{system.effectiverange}}" data-dtype="Number">
+          <li class="flexrow"><label class="item-field-label-long">Effective Range</label>
+            <select class="item-field-label-long" type="text" name="system.effectiverange" value="{{system.effectiverange}}" data-dtype="Number">
               {{#select system.effectiverange}}
                 {{#each config.range as |type key|}}
                 <option value="{{key.name}}">{{type}}</option>
@@ -73,8 +73,8 @@
             </select> 
           </li>
 
-          <li class="flexrow"><label class="generic-label">Maximum Range</label>
-            <select class="competence-base flexrow" type="text" name="system.maxrange" value="{{system.maxrange}}" data-dtype="Number">
+          <li class="flexrow"><label class="item-field-label-long">Maximum Range</label>
+            <select class="item-field-label-long" type="text" name="system.maxrange" value="{{system.maxrange}}" data-dtype="Number">
               {{#select system.maxrange}}
                 {{#each config.range as |type key|}}
                 <option value="{{key.name}}">{{type}}</option>
@@ -83,19 +83,19 @@
             </select> 
           </li>
 
-          <li class="flexrow"><label class="generic-label">SP</label>
+          <li class="flexrow"><label class="item-field-label-long">SP</label>
             <input type="text" class="input-numeric-short padd-right" name="system.sp" value="{{data.sp}}" data-dtype="Number"/>
           </li>
 
-          <li class="flexrow"><label class="generic-label">Size (-1 for non applicable)</label>
+          <li class="flexrow"><label class="item-field-label-vlong">Size (-1 for non applicable)</label>
             <input type="text" class="input-numeric-short padd-right" name="system.size" value="{{data.size}}" data-dtype="Number"/>
           </li>
 
-          <li class="flexrow"><label class="generic-label">Equipped ?</label>
+          <li class="flexrow"><label class="item-field-label-long">Equipped ?</label>
             <label class="attribute-value checkbox"><input type="checkbox" name="system.equipped" {{checked data.equipped}}/></label>
           </li>
 
-          <li class="flexrow"><label class="generic-label">Cost</label>
+          <li class="flexrow"><label class="item-field-label-long">Cost</label>
             <input type="text" class="input-numeric-short padd-right" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
           </li>