diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs
index 4fe4b5e3..9d5f6a45 100644
--- a/module/applications/sheets/actors/character.mjs
+++ b/module/applications/sheets/actors/character.mjs
@@ -517,9 +517,10 @@ export default class CharacterSheet extends DHBaseActorSheet {
         const item = getDocFromElement(event.currentTarget);
         if (!item) return;
 
-        const max = item.system.resource.max ? itemAbleRollParse(item.system.resource.max, this.document, item) : null;
+        const max = event.currentTarget.max ? Number(event.currentTarget.max) : null;
         const value = max ? Math.min(Number(event.currentTarget.value), max) : event.currentTarget.value;
         await item.update({ 'system.resource.value': value });
+        this.render();
     }
 
     async updateItemQuantity(event) {
@@ -527,6 +528,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
         if (!item) return;
 
         await item.update({ 'system.quantity': event.currentTarget.value });
+        this.render();
     }
 
     async updateArmorMarks(event) {
diff --git a/module/data/fields/actorField.mjs b/module/data/fields/actorField.mjs
index 0b1113fb..5fde9394 100644
--- a/module/data/fields/actorField.mjs
+++ b/module/data/fields/actorField.mjs
@@ -8,7 +8,7 @@ const attributeField = label =>
 
 const resourceField = (max = 0, label, reverse = false) =>
     new fields.SchemaField({
-        value: new fields.NumberField({ initial: 0, integer: true, label }),
+        value: new fields.NumberField({ initial: 0, min: 0, integer: true, label }),
         max: new fields.NumberField({ initial: max, integer: true }),
         isReversed: new fields.BooleanField({ initial: reverse })
     });
diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs
index f0b374f7..0540073c 100644
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -568,13 +568,7 @@ export default class DhpActor extends Actor {
     }
 
     convertDamageToThreshold(damage) {
-        return damage >= this.system.damageThresholds.severe
-            ? 3
-            : damage >= this.system.damageThresholds.major
-              ? 2
-              : damage >= this.system.damageThresholds.minor
-                ? 1
-                : 0;
+        return damage >= this.system.damageThresholds.severe ? 3 : damage >= this.system.damageThresholds.major ? 2 : 1;
     }
 
     convertStressDamageToHP(resources) {
diff --git a/module/helpers/handlebarsHelper.mjs b/module/helpers/handlebarsHelper.mjs
index 9e769d2e..751b2c38 100644
--- a/module/helpers/handlebarsHelper.mjs
+++ b/module/helpers/handlebarsHelper.mjs
@@ -48,8 +48,8 @@ export default class RegisterHandlebarsHelpers {
 
     static rollParsed(value, actor, item, numerical) {
         const isNumerical = typeof numerical === 'boolean' ? numerical : false;
-        const result = itemAbleRollParse(value, actor, item);
-        return isNumerical && !result ? 0 : result;
+        const result = itemAbleRollParse(value, actor.getRollData(), item);
+        return isNumerical ? (!result ? 0 : Number(result)) : result;
     }
 
     static setVar(name, value, context) {
diff --git a/styles/less/dialog/damage-reduction/damage-reduction-container.less b/styles/less/dialog/damage-reduction/damage-reduction-container.less
index 25ca5ff9..7dab4f5d 100644
--- a/styles/less/dialog/damage-reduction/damage-reduction-container.less
+++ b/styles/less/dialog/damage-reduction/damage-reduction-container.less
@@ -46,10 +46,6 @@
                 display: flex;
                 gap: 2px;
 
-                &:not(:last-child) {
-                    margin-right: 8px;
-                }
-
                 .mark-container {
                     cursor: pointer;
                     border: 1px solid light-dark(@dark-blue, @golden);
@@ -62,6 +58,10 @@
                     justify-content: center;
                     opacity: 0.4;
 
+                    &:not(:last-child) {
+                        margin-right: 8px;
+                    }
+
                     &.selected {
                         opacity: 1;
                     }
diff --git a/templates/sheets/actors/character/header.hbs b/templates/sheets/actors/character/header.hbs
index 9e930fd6..5ab8fdd0 100644
--- a/templates/sheets/actors/character/header.hbs
+++ b/templates/sheets/actors/character/header.hbs
@@ -118,10 +118,10 @@
 
     {{#> 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs'}}
         <div class="character-downtime-container">
-            <button data-action="useDowntime" data-type="shortRest" data-tooltip="{{localize "DAGGERHEART.APPLICATIONS.Downtime.shortRest.title"}}">
+            <button type="button" data-action="useDowntime" data-type="shortRest" data-tooltip="{{localize "DAGGERHEART.APPLICATIONS.Downtime.shortRest.title"}}">
                 <i class="fa-solid fa-chair"></i>
             </button>
-            <button data-action="useDowntime" data-type="longRest" data-tooltip="{{localize "DAGGERHEART.APPLICATIONS.Downtime.longRest.title"}}">
+            <button type="button" data-action="useDowntime" data-type="longRest" data-tooltip="{{localize "DAGGERHEART.APPLICATIONS.Downtime.longRest.title"}}">
                 <i class="fa-solid fa-bed"></i>
             </button>
         </div>
diff --git a/templates/sheets/actors/character/sidebar.hbs b/templates/sheets/actors/character/sidebar.hbs
index 860f50cc..ffe3eb5e 100644
--- a/templates/sheets/actors/character/sidebar.hbs
+++ b/templates/sheets/actors/character/sidebar.hbs
@@ -4,20 +4,19 @@
         <a class="death-roll-btn" data-tooltip="DAGGERHEART.UI.Tooltip.makeDeathMove" {{#if
             isDeath}}data-action="makeDeathMove" {{/if}}><i class="fas fa-skull death-save"></i></a>
     </div>
-
     <div class="info-section">
         <div class="resources-section">
             <div class="status-bar">
                 <div class='status-value'>
-                    <p><input class="bar-input" name="system.resources.hitPoints.value"
+                    <p><input class="bar-input" name="system.resources.hitPoints.value" min="0" max='{{document.system.resources.hitPoints.max}}'
                             value="{{document.system.resources.hitPoints.value}}" type="number"></p>
                     <p>/</p>
                     <p class="bar-label">{{document.system.resources.hitPoints.max}}</p>
                 </div>
                 <progress
                     class='progress-bar'
-                    value='{{document.system.resources.hitPoints.value}}'
                     max='{{document.system.resources.hitPoints.max}}'
+                    value='{{document.system.resources.hitPoints.value}}'
                 ></progress>
                 <div class="status-label">
                     <h4>{{localize "DAGGERHEART.GENERAL.HitPoints.short"}}</h4>
@@ -26,7 +25,7 @@
             </div>
             <div class="status-bar">
                 <div class='status-value'>
-                    <p><input class="bar-input" name="system.resources.stress.value"
+                    <p><input class="bar-input" name="system.resources.stress.value" min="0" max='{{document.system.resources.stress.max}}'
                             value="{{document.system.resources.stress.value}}" type="number"></p>
                     <p>/</p>
                     <p class="bar-label">{{document.system.resources.stress.max}}</p>
@@ -34,6 +33,7 @@
                 <progress
                     class='progress-bar stress-color'
                     value='{{document.system.resources.stress.value}}'
+                    min="0"
                     max='{{document.system.resources.stress.max}}'
                 ></progress>
                 <div class="status-label">
diff --git a/templates/sheets/global/partials/inventory-item-V2.hbs b/templates/sheets/global/partials/inventory-item-V2.hbs
index 71b06202..10ff20eb 100644
--- a/templates/sheets/global/partials/inventory-item-V2.hbs
+++ b/templates/sheets/global/partials/inventory-item-V2.hbs
@@ -186,7 +186,7 @@ Parameters:
     {{/if}}
     {{#if (and (not hideResources) item.system.quantity)}}
     <div class="item-resource">
-      <input type="number" class="inventory-item-quantity" value="{{item.system.quantity}}" step="1" />
+      <input type="number" class="inventory-item-quantity" value="{{item.system.quantity}}" min="0" />
     </div>
     {{/if}}
 
diff --git a/templates/sheets/global/partials/item-resource.hbs b/templates/sheets/global/partials/item-resource.hbs
index d90f0b3f..b29c818e 100644
--- a/templates/sheets/global/partials/item-resource.hbs
+++ b/templates/sheets/global/partials/item-resource.hbs
@@ -1,7 +1,7 @@
 {{#if (eq item.system.resource.type 'simple')}}
     <div class="item-resource">
         <i class="{{#if item.system.resource.icon}}{{item.system.resource.icon}}{{else}}fa-solid fa-hashtag{{/if}}"></i>
-        <input type="number" class="inventory-item-resource" value="{{item.system.resource.value}}" step="1" />
+        <input type="number" class="inventory-item-resource" value="{{item.system.resource.value}}" min="0" max="{{rollParsed item.system.resource.max item.actor item true}}" />
     </div>
 {{else}}
     <div class="item-resources">