diff --git a/lang/en.json b/lang/en.json
index 426ad21..02e0a33 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -390,6 +390,8 @@
       "newArmor": "New Armor",
       "newWeapon": "New Weapon",
       "newTalent": "New Talent",
+      "newTrait": "New Trait",
+      "newAbility": "New Ability",
       "newSkill": "New Skill",
       "newImplant": "New Implant",
       "newEquipment": "New Equipment",
diff --git a/module/applications/sheets/creature-sheet.mjs b/module/applications/sheets/creature-sheet.mjs
index 6188e45..8ce5a27 100644
--- a/module/applications/sheets/creature-sheet.mjs
+++ b/module/applications/sheets/creature-sheet.mjs
@@ -26,7 +26,7 @@ export default class FTLNomadCreatureSheet extends FTLNomadActorSheet {
       template: "templates/generic/tab-navigation.hbs",
     },
     traits: {
-      template: "systems/fvtt-ftl-nomad/templates/creature-trait.hbs",
+      template: "systems/fvtt-ftl-nomad/templates/creature-sheet-trait.hbs",
     },
     biography: {
       template: "systems/fvtt-ftl-nomad/templates/creature-biography.hbs",
diff --git a/templates/character-main.hbs b/templates/character-main.hbs
index 2c29396..cc384c9 100644
--- a/templates/character-main.hbs
+++ b/templates/character-main.hbs
@@ -33,7 +33,7 @@
           {{formField systemFields.species value=system.species rootId=partId disabled=isPlayMode}}
           {{formField systemFields.archetype value=system.archetype rootId=partId disabled=isPlayMode}}
           <div class="hero-armor">          
-            {{formField systemFields.heroPoints value=system.heroPoints rootId=partId disabled=isPlayMode}}
+            {{formField systemFields.heroPoints value=system.heroPoints rootId=partId }}
             {{formField systemFields.armor.fields.value value=system.armor.value rootId=partId disabled=isPlayMode}}
           </div>
         </fieldset>
diff --git a/templates/creature-sheet-trait.hbs b/templates/creature-sheet-trait.hbs
new file mode 100644
index 0000000..db48efc
--- /dev/null
+++ b/templates/creature-sheet-trait.hbs
@@ -0,0 +1,50 @@
+<section class="tab creature-{{tab.id}} {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
+
+  <fieldset>
+    <legend>{{localize "FTLNOMAD.Label.traits"}}{{#if isEditMode}}
+      <a class="action" data-tooltip="{{localize "FTLNOMAD.Tooltip.addTrait"}}" data-tooltip-direction="UP"><i
+          class="fas fa-plus" data-action="createTrait"></i></a>{{/if}}
+    </legend>
+    <div class="traits">
+      {{#each traits as |item|}}
+      <div class="trait item" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-drag="true">
+        <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
+        <div class="name" data-tooltip="{{{item.system.description}}}">
+          {{item.name}}
+        </div>
+        <div class="controls">
+          <a data-tooltip="{{localize 'FTLNOMAD.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
+            data-item-uuid="{{item.uuid}}"><i class="fas fa-edit"></i></a>
+          <a data-tooltip="{{localize 'FTLNOMAD.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
+            data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
+        </div>
+      </div>
+      {{/each}}
+    </div>
+  </fieldset>
+
+  <fieldset>
+    <legend>{{localize "FTLNOMAD.Label.abilities"}}{{#if isEditMode}}
+      <a class="action" data-tooltip="{{localize "FTLNOMAD.Tooltip.addAbility"}}" data-tooltip-direction="UP"><i
+          class="fas fa-plus" data-action="createAbility"></i></a>{{/if}}
+    </legend>
+    <div class="abilities">
+      {{#each abilities as |item|}}
+      {{!log 'armor' this}}
+      <div class="ability" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
+        <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
+        <div class="name" data-tooltip="{{{item.system.description}}}">
+          {{item.name}}
+        </div>
+        <div class="controls">
+          <a data-tooltip="{{localize 'FTLNOMAD.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
+            data-item-uuid="{{item.uuid}}"><i class="fas fa-edit"></i></a>
+          <a data-tooltip="{{localize 'FTLNOMAD.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
+            data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
+        </div>
+      </div>
+      {{/each}}
+    </div>
+  </fieldset>
+
+</section>
\ No newline at end of file
diff --git a/templates/creature-trait.hbs b/templates/creature-trait.hbs
index db48efc..e4f83a8 100644
--- a/templates/creature-trait.hbs
+++ b/templates/creature-trait.hbs
@@ -1,50 +1,17 @@
-<section class="tab creature-{{tab.id}} {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
-
+<section>
+  <div class="header">
+    <img class="item-img" src="{{item.img}}" data-edit="img" data-action="editImage" data-tooltip="{{item.name}}" />
+    {{formInput fields.name value=source.name}}
+  </div> 
+  
   <fieldset>
-    <legend>{{localize "FTLNOMAD.Label.traits"}}{{#if isEditMode}}
-      <a class="action" data-tooltip="{{localize "FTLNOMAD.Tooltip.addTrait"}}" data-tooltip-direction="UP"><i
-          class="fas fa-plus" data-action="createTrait"></i></a>{{/if}}
-    </legend>
-    <div class="traits">
-      {{#each traits as |item|}}
-      <div class="trait item" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-drag="true">
-        <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
-        <div class="name" data-tooltip="{{{item.system.description}}}">
-          {{item.name}}
-        </div>
-        <div class="controls">
-          <a data-tooltip="{{localize 'FTLNOMAD.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
-            data-item-uuid="{{item.uuid}}"><i class="fas fa-edit"></i></a>
-          <a data-tooltip="{{localize 'FTLNOMAD.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
-            data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
-        </div>
-      </div>
-      {{/each}}
-    </div>
+    {{formField systemFields.isAdvantage value=system.isAdvantage}}
   </fieldset>
 
   <fieldset>
-    <legend>{{localize "FTLNOMAD.Label.abilities"}}{{#if isEditMode}}
-      <a class="action" data-tooltip="{{localize "FTLNOMAD.Tooltip.addAbility"}}" data-tooltip-direction="UP"><i
-          class="fas fa-plus" data-action="createAbility"></i></a>{{/if}}
-    </legend>
-    <div class="abilities">
-      {{#each abilities as |item|}}
-      {{!log 'armor' this}}
-      <div class="ability" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
-        <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
-        <div class="name" data-tooltip="{{{item.system.description}}}">
-          {{item.name}}
-        </div>
-        <div class="controls">
-          <a data-tooltip="{{localize 'FTLNOMAD.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
-            data-item-uuid="{{item.uuid}}"><i class="fas fa-edit"></i></a>
-          <a data-tooltip="{{localize 'FTLNOMAD.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
-            data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
-        </div>
-      </div>
-      {{/each}}
-    </div>
+    <legend>{{localize "FTLNOMAD.Label.description"}}</legend>
+    {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description"
+    toggled=true}}
   </fieldset>
 
 </section>
\ No newline at end of file