diff --git a/modules/hero6-config.js b/modules/hero6-config.js
index b12a5a4..0eeed7a 100644
--- a/modules/hero6-config.js
+++ b/modules/hero6-config.js
@@ -30,12 +30,12 @@ export const Hero6_CONFIG = {
     "none": "None",
     "attack": "Attack",
     "automaton": "Automaton",
-    "bodyaffecting": "Bodyaffecting",
+    "bodyaffecting": "Body-Affecting",
     "defense": "Defense",
     "sensory": "Sensory"
   },
   powerSenseAffecting: {
     "none": "None",
-    "senseaffecting": "Senseaffecting",
+    "senseaffecting": "Sense-Affecting",
   }
 }
\ No newline at end of file
diff --git a/modules/hero6-utility.js b/modules/hero6-utility.js
index cfeb2eb..e21545a 100644
--- a/modules/hero6-utility.js
+++ b/modules/hero6-utility.js
@@ -43,7 +43,7 @@ export class Hero6Utility {
       return __locationNames[key]      
     })
     Handlebars.registerHelper('isSkillCustom', function (key) {
-      if (key == "custom" || key == "background" || key == "combat" ) {
+      if (key == "custom" || key == "background"  ) {
         return true;
       }
       return false
@@ -158,6 +158,7 @@ export class Hero6Utility {
       'systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.hbs',
+      'systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs',
     ]
     return loadTemplates(templatePaths);
   }
diff --git a/system.json b/system.json
index 316b0a8..ad2a020 100644
--- a/system.json
+++ b/system.json
@@ -23,7 +23,7 @@
   "packs": [
     {
       "type": "Item",
-      "label": "Equipments",
+      "label": "Equipment",
       "name": "equipment",
       "path": "packs/equipment.db",
       "system": "fvtt-hero-system-6",
@@ -82,7 +82,7 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "10.0.3",
+  "version": "10.0.4",
   "compatibility": {
     "minimum": "10",
     "verified": "10",
@@ -90,7 +90,7 @@
   },
   "title": "Hero System v6 for FoundrtVTT (Official)",
   "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/raw/branch/main/system.json",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.3.zip",   
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.4.zip",   
   "url": "https://www.uberwald.me/gitea/uberwald/",
   "background": "images/ui/hro6_welcome_page.webp",
   "id": "fvtt-hero-system-6"
diff --git a/template.json b/template.json
index 91fdbb0..b788245 100644
--- a/template.json
+++ b/template.json
@@ -236,7 +236,7 @@
       "skilltype": "agility",
       "characteristic": "",
       "base": "",
-      "skillroll": 0,
+      "levelscost": 0,
       "levels": 0,
       "templates": [
         "common"
@@ -309,12 +309,14 @@
       "velValue": 0
     },
     "perk": {
+      "hasroll": false,
       "roll": 0,
       "templates": [
         "common"
       ]
     },
     "talent": {
+      "hasroll": false,
       "roll": 0,
       "templates": [
         "common"
diff --git a/templates/items/item-advantage-sheet.hbs b/templates/items/item-advantage-sheet.hbs
index 10e8d29..1016fd8 100644
--- a/templates/items/item-advantage-sheet.hbs
+++ b/templates/items/item-advantage-sheet.hbs
@@ -14,9 +14,11 @@
       {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
 
       <div class="tab details" data-group="primary" data-tab="details">
-        <li class="flexrow"><label class="generic-label">Cost</label>
-          <input type="text" class="" name="system.cost" value="{{system.cost}}" data-dtype="Number"/>
-        </li>
+        <ul>
+          <li class="flexrow"><label class="generic-label">Cost</label>
+            <input type="text" class="" name="system.cost" value="{{system.cost}}" data-dtype="Number"/>
+          </li>
+        </ul>
       </div>
       
     </section>
diff --git a/templates/items/item-complication-sheet.hbs b/templates/items/item-complication-sheet.hbs
index 05ca9c9..0c34d8f 100644
--- a/templates/items/item-complication-sheet.hbs
+++ b/templates/items/item-complication-sheet.hbs
@@ -15,18 +15,11 @@
 
       <div class="tab details" data-group="primary" data-tab="details">
         
-        <li class="flexrow"><label class="item-field-label-long">Has Roll ?</label>
-          <label class="item-field-label-medium"><input type="checkbox" name="system.hasroll" {{checked system.hasroll}}/></label>
-        </li>
-
-        {{#if system.hasroll}}
-        <li class="flexrow"><label class="item-field-label-long">Roll</label>
-          <input type="text" class="item-field-label-medium" name="system.roll" value="{{system.roll}}" data-dtype="Number"/>
-        </li>
-        {{/if}}
-
-        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+        <ul>
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}}
 
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+        </ul>
       </div>
     </section>
 </form>
diff --git a/templates/items/item-limitation-sheet.hbs b/templates/items/item-limitation-sheet.hbs
index d7b032a..42a6cc6 100644
--- a/templates/items/item-limitation-sheet.hbs
+++ b/templates/items/item-limitation-sheet.hbs
@@ -12,10 +12,12 @@
     <section class="sheet-body">
 
       <div class="tab details" data-group="primary" data-tab="details">
-        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
-
-        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
-
+        
+        <ul>
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+        </ul>
+        
       </div>
     </section>
 </form>
diff --git a/templates/items/item-perk-sheet.hbs b/templates/items/item-perk-sheet.hbs
index df2ea45..416a95e 100644
--- a/templates/items/item-perk-sheet.hbs
+++ b/templates/items/item-perk-sheet.hbs
@@ -14,12 +14,12 @@
       {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
 
       <div class="tab details" data-group="primary" data-tab="details">
-        <li class="flexrow"><label class="item-field-label-long">Roll</label>
-          <input type="text" class="item-field-label-medium" name="system.roll" value="{{system.roll}}" data-dtype="Number"/>
-        </li>
 
-        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+        <ul>
+         {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}}
 
-        </div>
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+        </ul>
+      </div>
     </section>
 </form>
diff --git a/templates/items/item-power-sheet.hbs b/templates/items/item-power-sheet.hbs
index 776c190..d53025a 100644
--- a/templates/items/item-power-sheet.hbs
+++ b/templates/items/item-power-sheet.hbs
@@ -14,20 +14,14 @@
       {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
 
       <div class="tab details" data-group="primary" data-tab="details">
-        {{> systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.hbs}}
 
-        <li class="flexrow"><label class="item-field-label-long">Has Roll ?</label>
-          <label class="item-field-label-medium"><input type="checkbox" name="system.hasroll" {{checked system.hasroll}}/></label>
-        </li>
+        <ul>
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}}
 
-        {{#if system.hasroll}}
-        <li class="flexrow"><label class="item-field-label-long">Roll</label>
-          <input type="text" class="item-field-label-medium" name="system.roll" value="{{system.roll}}" data-dtype="Number"/>
-        </li>
-        {{/if}}
-
-        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.hbs}}
 
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+        </ul>
       </div>
     </section>
 </form>
diff --git a/templates/items/item-skill-sheet.hbs b/templates/items/item-skill-sheet.hbs
index fd7bbc5..e7b4d0f 100644
--- a/templates/items/item-skill-sheet.hbs
+++ b/templates/items/item-skill-sheet.hbs
@@ -46,9 +46,11 @@
               <input type="text" class="item-field-label-medium" name="system.levels" value="{{system.levels}}" data-dtype="Number"/>
             </li>
 
-            <li class="flexrow"><label class="item-field-label-long">Skill Roll points</label>
-              <input type="text" class="item-field-label-medium" name="system.skillroll" value="{{system.skillroll}}" data-dtype="Number"/>
-            </li>
+            {{#if (ne system.skilltype "combat")}}
+              <li class="flexrow"><label class="item-field-label-long">Levels Cost</label>
+                <input type="text" class="item-field-label-medium" name="system.levelscost" value="{{system.levelscost}}" data-dtype="Number"/>
+              </li>
+            {{/if}}
 
             {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
 
diff --git a/templates/items/item-talent-sheet.hbs b/templates/items/item-talent-sheet.hbs
index 558ec48..7b2b996 100644
--- a/templates/items/item-talent-sheet.hbs
+++ b/templates/items/item-talent-sheet.hbs
@@ -14,7 +14,12 @@
       {{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
 
       <div class="tab details" data-group="primary" data-tab="details">
-        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+
+        <ul>
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}}
+          
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
+        </ul>
 
       </div>
   
diff --git a/templates/partials/partial-item-hasroll.hbs b/templates/partials/partial-item-hasroll.hbs
new file mode 100644
index 0000000..6dc5d4f
--- /dev/null
+++ b/templates/partials/partial-item-hasroll.hbs
@@ -0,0 +1,9 @@
+        <li class="flexrow"><label class="item-field-label-long">Has Roll ?</label>
+          <label class="item-field-label-medium"><input type="checkbox" name="system.hasroll" {{checked system.hasroll}}/></label>
+        </li>
+
+        {{#if system.hasroll}}
+        <li class="flexrow"><label class="item-field-label-long">Roll</label>
+          <input type="text" class="item-field-label-medium" name="system.roll" value="{{system.roll}}" data-dtype="Number"/>
+        </li>
+        {{/if}}