diff --git a/src/lang/en.json b/src/lang/en.json
index a7ff5c8..5d63ab1 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -2,6 +2,7 @@
     "OSE.Edit": "Edit",
     "OSE.Delete": "Delete",
     "OSE.Add": "Add",
+    "OSE.Ok": "Ok",
     "OSE.Cancel": "Cancel",
     "OSE.Roll": "Roll",
 
@@ -63,7 +64,7 @@
     "OSE.MovementEncounterShort": "ENC",
     "OSE.MovementOverland": "Overland Movement Rate",
     "OSE.MovementOverlandShort": "OVE",
-    "OSE.MovementShort": "MR",
+    "OSE.MovementShort": "MV",
     "OSE.ArmorClass": "Armor Class",
     "OSE.ArmorClassShort": "AC",
     "OSE.AscArmorClassShort": "AAC",
diff --git a/src/module/actor/entity.js b/src/module/actor/entity.js
index 6c4f2ba..de6c976 100644
--- a/src/module/actor/entity.js
+++ b/src/module/actor/entity.js
@@ -44,7 +44,24 @@ export class OseActor extends Actor {
 
   rollAttack(attack, options={}) {
     const label = game.i18n.localize(`OSE.${attack}`);
-    const rollParts = ['1d20'];
+    const rollParts = ['1d20',];
+
+    const mods = this.computeModifiers();
+    if (attack == 'Missile') {
+      rollParts.push(
+        '+',
+        mods.dex.toString(),
+        '+',
+        this.data.data.thac0.mod.missile.toString()
+      );
+    } else if (attack == 'Melee') {
+      rollParts.push(
+        '+',
+        mods.str.toString(),
+        '+',
+        this.data.data.thac0.mod.melee.toString()
+      );
+    }
 
     // Roll and return
     return OseDice.Roll({
diff --git a/src/scss/actor-base.scss b/src/scss/actor-base.scss
index a3282b4..445b6d0 100644
--- a/src/scss/actor-base.scss
+++ b/src/scss/actor-base.scss
@@ -89,7 +89,9 @@
       border-top-left-radius: 80px;
       box-shadow: 0 0 6px 1px $colorDark;
       font-size: 12px;
+      filter: brightness(0.9);
       &.active {
+        filter: none;
         z-index: 1;
         font-weight: bold;
         text-shadow: none;
@@ -128,6 +130,10 @@
         .attribute-value {
           text-align: center;
           padding: 4px;
+          .sep {
+            flex: 0 0 5px;
+            line-height: 24px;
+          }
         }
         .attribute-mod {
           position: absolute;
@@ -160,6 +166,9 @@
           .attribute-value {
             width: 45px;
             flex-grow: 0;
+            input {
+              padding: 0;
+            }
           }
         }
       }
diff --git a/src/scss/monster.scss b/src/scss/monster.scss
index 5cd0557..75f0482 100644
--- a/src/scss/monster.scss
+++ b/src/scss/monster.scss
@@ -5,5 +5,19 @@
     .editor {
       height: 300px;
     }
+    .attributes .attribute.health {
+      min-width: 75px;
+    }
+  }
+  .attribute-group {
+    .attacks-description {
+      margin: 2px;
+      padding: 0;
+      text-align: center;
+      label {
+        color: $colorTan;
+        font-size: 10px;
+      }
+    }
   }
 }
diff --git a/src/template.json b/src/template.json
index e9aebb5..c4688e6 100644
--- a/src/template.json
+++ b/src/template.json
@@ -133,9 +133,7 @@
         "appearing": "",
         "morale": 0
       },
-      "attacks": {
-        "value": 1
-      }
+      "attacks": ""
     }
   },
   "Item": {
@@ -155,7 +153,7 @@
       "qualities": "",
       "slow": false,
       "missile": true,
-      "ranged": true,
+      "melee": true,
       "cost": 0,
       "equipped": false,
       "weight": 0
diff --git a/src/templates/actors/dialogs/tweaks-dialog.html b/src/templates/actors/dialogs/tweaks-dialog.html
index 42fff28..a6284f3 100644
--- a/src/templates/actors/dialogs/tweaks-dialog.html
+++ b/src/templates/actors/dialogs/tweaks-dialog.html
@@ -43,6 +43,7 @@
           name="data.thac0.mod.melee"
           id="melee"
           value="{{data.thac0.mod.melee}}"
+          data-dtype="Number"
         />
       </div>
     </div>
@@ -54,6 +55,7 @@
           name="data.thac0.mod.missile"
           id="missile"
           value="{{data.thac0.mod.missile}}"
+          data-dtype="Number"
         />
       </div>
     </div>
diff --git a/src/templates/actors/partials/character-attributes-tab.html b/src/templates/actors/partials/character-attributes-tab.html
index df6db7a..2dbaaec 100644
--- a/src/templates/actors/partials/character-attributes-tab.html
+++ b/src/templates/actors/partials/character-attributes-tab.html
@@ -121,8 +121,8 @@
                         </div>
                     </div>
                 </li>
-                <li class="attribute">
-                    <h4 class="attribute-name box-title" title="{{ localize 'OSE.Thac0' }}">{{ localize "OSE.Thac0" }}
+                <li class="attribute attack" data-attack="Attack">
+                    <h4 class="attribute-name box-title" title="{{ localize 'OSE.Thac0' }}"><a>{{ localize "OSE.Thac0" }}</a>
                     </h4>
                     <div class="flexrow">
                         <div class="attribute-value">
diff --git a/src/templates/actors/partials/monster-attributes-tab.html b/src/templates/actors/partials/monster-attributes-tab.html
index ccb33b5..2b18606 100644
--- a/src/templates/actors/partials/monster-attributes-tab.html
+++ b/src/templates/actors/partials/monster-attributes-tab.html
@@ -9,6 +9,13 @@
                 <input name="data.hp.max" type="text" value="{{data.hp.max}}" data-dtype="Number" placeholder="10" />
             </div>
         </li>
+        <li class="attribute">
+            <h4 class="attribute-name box-title" title="{{localize 'OSE.HitDice'}}">{{ localize "OSE.HitDiceShort" }}
+            </h4>
+            <div class="attribute-value">
+                <input name="data.hp.hd" type="text" value="{{data.hp.hd}}" placeholder="0" data-dtype="String" />
+            </div>
+        </li>
         <li class="attribute">
             {{#if config.ascendingAC}}
             <h4 class="attribute-name box-title" title="{{ localize 'OSE.ArmorClass' }}">
@@ -33,14 +40,6 @@
                     data-dtype="Number" />
             </div>
         </li>
-        <li class="attribute">
-            <h4 class="attribute-name box-title" title="{{localize 'OSE.Attacks'}}">{{ localize "OSE.AttacksShort" }}
-            </h4>
-            <div class="attribute-value">
-                <input name="data.att.value" type="text" value="{{data.att.value}}" placeholder="0"
-                    data-dtype="Number" />
-            </div>
-        </li>
         {{#if data.retainer.enabled}}
         <li class="attribute">
             <h4 class="attribute-name box-title" title="{{ localize 'OSE.Loyalty' }}">{{ localize "OSE.LoyaltyShort" }}
@@ -65,13 +64,13 @@
     <div class="flex3 panel inventory abilities">
         <div>
             <li class="item-titles flexrow panel-title">
-              <div class="item-name">{{localize 'OSE.panel.abilities'}} & {{localize 'OSE.panel.equipment'}}</div>
-              <div class="item-controls">
-                {{#if owner}}
-                <a class="item-control item-create" title='{{localize "OSE.Add"}}' data-type="choice"
-                    data-choices="weapon,ability,armor,item"><i class="fas fa-plus"></i></a>
-                {{/if}}
-              </div>
+                <div class="item-name">{{localize 'OSE.panel.abilities'}} & {{localize 'OSE.panel.equipment'}}</div>
+                <div class="item-controls">
+                    {{#if owner}}
+                    <a class="item-control item-create" title='{{localize "OSE.Add"}}' data-type="choice"
+                        data-choices="weapon,ability,armor,item"><i class="fas fa-plus"></i></a>
+                    {{/if}}
+                </div>
             </li>
             <ol class="item-list resizable" data-base-size="240">
                 {{#each abilities as |item|}}
@@ -121,6 +120,10 @@
     </div>
     {{!-- Saving throws --}}
     <div class="attribute-group">
+        <div class="attacks-description">
+            <label>{{ localize "OSE.Attacks" }}</label>
+            <input name="data.att" type="text" value="{{data.att}}" placeholder="0" data-dtype="String" />
+        </div>
         <ul class="attributes">
             <li class="attribute saving-throw" data-save="death">
                 <h4 class="attribute-name box-title" title="{{ localize 'OSE.saves.death.long' }}">