diff --git a/lang/en.json b/lang/en.json
index e6486d7b..0bfaf246 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -337,7 +337,7 @@
             "NPC": {
                 "FIELDS": {
                     "difficulty": { "label": "Difficulty" },
-                    "motive": { "label": "Motive" },
+                    "motives": { "label": "Motives" },
                     "description": { "label": "Description" }
                 }
             },
diff --git a/module/data/actor/npc.mjs b/module/data/actor/npc.mjs
index 6fd08f65..2a702943 100644
--- a/module/data/actor/npc.mjs
+++ b/module/data/actor/npc.mjs
@@ -19,8 +19,8 @@ export default class DhpNPC extends BaseDataActor {
         return {
             ...super.defineSchema(),
             difficulty: new fields.NumberField({ nullable: true, initial: null, integer: true }),
-            description: new fields.StringField(),
-            motive: new fields.StringField(),
+            description: new fields.HTMLField(),
+            motives: new fields.HTMLField(),
             notes: new fields.HTMLField()
         };
     }
diff --git a/styles/less/sheets/actors/adversary/header.less b/styles/less/sheets/actors/adversary/header.less
index 8bd3fcee..d3f9bf63 100644
--- a/styles/less/sheets/actors/adversary/header.less
+++ b/styles/less/sheets/actors/adversary/header.less
@@ -35,7 +35,7 @@
         .tags {
             display: flex;
             gap: 10px;
-            padding-bottom: 16px;
+            padding-bottom: 8px;
 
             .tag {
                 display: flex;
diff --git a/styles/less/sheets/actors/npc/header.less b/styles/less/sheets/actors/npc/header.less
index 1b787f4f..bea9410c 100644
--- a/styles/less/sheets/actors/npc/header.less
+++ b/styles/less/sheets/actors/npc/header.less
@@ -12,19 +12,48 @@
             }
         }
 
+        .tags {
+            display: flex;
+            gap: 10px;
+            padding-bottom: 8px;
+
+            .tag {
+                display: flex;
+                flex-direction: row;
+                gap: 4px;
+                justify-content: center;
+                align-items: center;
+                padding: 3px 5px;
+                font-size: var(--font-size-12);
+                font: @font-body;
+
+                background: light-dark(@dark-15, @beige-15);
+                border: 1px solid light-dark(@dark, @beige);
+                border-radius: 3px;
+            }
+
+            .label {
+                display: flex;
+                flex-direction: row;
+                justify-content: center;
+                align-items: center;
+                font-size: var(--font-size-12);
+            }
+        }
+
         .info-section {
             flex: 1;
             padding: 0 15px;
             padding-top: var(--header-height);
             display: flex;
             flex-direction: column;
-            gap: 8px;
 
             .name-row {
                 display: flex;
                 gap: 5px;
                 align-items: center;
                 justify-content: space-between;
+                padding: 8px 0;
 
                 h1 {
                     display: flex;
@@ -48,6 +77,12 @@
                 flex-direction: column;
                 gap: 12px;
                 padding: 16px 0;
+
+                .motives-and-tactics {
+                    p:first-of-type {
+                        margin: 0;
+                    }
+                }
             }
         }
     }
diff --git a/templates/sheets-settings/npc-settings/details.hbs b/templates/sheets-settings/npc-settings/details.hbs
index fd4fb386..844b083a 100644
--- a/templates/sheets-settings/npc-settings/details.hbs
+++ b/templates/sheets-settings/npc-settings/details.hbs
@@ -3,7 +3,15 @@
     data-tab='{{tabs.details.id}}'
     data-group='{{tabs.details.group}}'
 >
-        {{formField systemFields.description value=document._source.system.description}}
-        {{formField systemFields.motive value=document._source.system.motive}}
-        {{formGroup systemFields.difficulty value=document._source.system.difficulty localize=true}}
+    <fieldset>
+        <legend>{{localize "DAGGERHEART.ACTORS.NPC.FIELDS.description.label"}}</legend>
+        {{formInput systemFields.description value=document._source.system.description}}
+    </fieldset>
+
+    <fieldset>
+        <legend>{{localize "DAGGERHEART.ACTORS.NPC.FIELDS.motives.label"}}</legend>
+        {{formInput systemFields.motives value=document._source.system.motives}}
+    </fieldset>
+
+    {{formGroup systemFields.difficulty value=document._source.system.difficulty localize=true}}
 </section>
diff --git a/templates/sheets/actors/npc/header.hbs b/templates/sheets/actors/npc/header.hbs
index 465b5e68..11c6abbe 100644
--- a/templates/sheets/actors/npc/header.hbs
+++ b/templates/sheets/actors/npc/header.hbs
@@ -16,15 +16,25 @@
             >{{source.name}}</h1>
         </div>
 
+        {{#if source.system.difficulty}} 
+            <div class="tags">
+                <div class="tag">
+                    <span>{{localize "DAGGERHEART.GENERAL.difficulty"}}</span>
+                    <span>{{source.system.difficulty}}</span>
+                </div>
+            </div>
+        {{/if}}
+
         <line-div></line-div>
 
         <div class="npc-info">
             <span class="description">
                 <i>{{{description}}}</i>
             </span>
-            <span class="motives-and-tatics">
-                <b>{{localize 'DAGGERHEART.ACTORS.NPC.FIELDS.motive.label'}}: </b>{{{source.system.motive}}}
-            </span>
+            <div class="motives-and-tactics">
+                <b>{{localize 'DAGGERHEART.ACTORS.NPC.FIELDS.motives.label'}}</b>
+                {{{source.system.motives}}}
+            </div>
         </div>
     </div>
 </header>
\ No newline at end of file