diff --git a/templates/actors/char-sheet-mvp/panels/aspect.pc.hbs b/templates/actors/char-sheet-mvp/panels/aspect.pc.hbs
index fcaeaff..806976c 100644
--- a/templates/actors/char-sheet-mvp/panels/aspect.pc.hbs
+++ b/templates/actors/char-sheet-mvp/panels/aspect.pc.hbs
@@ -32,12 +32,14 @@
 			</div>
 			<div class="actions">
 				<button
+					type="button"
 					class="confirm"
 					data-embedded-edit="{{aspect.uuid}}"
 				>
 					{{localize "dotdungeon.actor.pc.aspect.edit"}}
 				</button>
 				<button
+					type="button"
 					class="danger equal-padding"
 					aria-label="{{localize "dotdungeon.actor.pc.aspect.aria.delete"}}"
 					data-embedded-delete
@@ -56,6 +58,7 @@
 	{{/each}}
 	{{#if (or computed.canAddAspect (dd-empty items.aspect))}}
 		<button
+			type="button"
 			class="confirm"
 			data-embedded-create="Aspect"
 		>
diff --git a/templates/actors/char-sheet-mvp/panels/pets.pc.hbs b/templates/actors/char-sheet-mvp/panels/pets.pc.hbs
index 34eb9a8..d4e2f68 100644
--- a/templates/actors/char-sheet-mvp/panels/pets.pc.hbs
+++ b/templates/actors/char-sheet-mvp/panels/pets.pc.hbs
@@ -18,6 +18,7 @@
 				{{/if}}
 				<div class="actions">
 					<button
+						type="button"
 						class="confirm equal-padding"
 						data-embedded-edit="{{pet.uuid}}"
 					>
@@ -25,6 +26,7 @@
 					</button>
 					<!--
 					<button
+						type="button"
 						class="neutral equal-padding"
 						data-embedded-chat
 						data-embedded-id="{{pet.uuid}}"
@@ -35,6 +37,7 @@
 					</button>
 					-->
 					<button
+						type="button"
 						class="danger equal-padding"
 						aria-label="{{localize "dotdungeon.actor.pc.pets.aria.delete"}}"
 						data-embedded-delete
@@ -53,6 +56,7 @@
 		</p>
 	{{/each}}
 	<button
+		type="button"
 		class="confirm"
 		data-embedded-create="Pet"
 	>
diff --git a/templates/actors/char-sheet-mvp/panels/spells.pc.hbs b/templates/actors/char-sheet-mvp/panels/spells.pc.hbs
index 26ffb91..db30666 100644
--- a/templates/actors/char-sheet-mvp/panels/spells.pc.hbs
+++ b/templates/actors/char-sheet-mvp/panels/spells.pc.hbs
@@ -32,12 +32,14 @@
 				{{/if}}
 				<div class="actions">
 					<button
+						type="button"
 						class="confirm"
 						data-embedded-edit="{{spell.uuid}}"
 					>
 						{{localize "dotdungeon.actor.pc.spells.edit"}}
 					</button>
 					<button
+						type="button"
 						class="neutral equal-padding"
 						aria-label="{{localize "dotdungeon.actor.pc.spells.aria.chat"}}"
 						data-message-type="Spell"
@@ -50,6 +52,7 @@
 						</div>
 					</button>
 					<button
+						type="button"
 						class="danger equal-padding"
 						aria-label="{{localize "dotdungeon.actor.pc.spells.aria.delete"}}"
 						data-embedded-delete
@@ -70,6 +73,7 @@
 
 
 	<button
+		type="button"
 		class="confirm"
 		data-embedded-create="Spell"
 	>
diff --git a/templates/actors/char-sheet-mvp/panels/weapons.pc.hbs b/templates/actors/char-sheet-mvp/panels/weapons.pc.hbs
index 493c076..da6c67b 100644
--- a/templates/actors/char-sheet-mvp/panels/weapons.pc.hbs
+++ b/templates/actors/char-sheet-mvp/panels/weapons.pc.hbs
@@ -14,6 +14,7 @@
 					type="text"
 					id="{{meta.idp}}-mainHand-name-input"
 					name="system.weapon.mainHand.name"
+					value="{{system.weapon.mainHand.name}}"
 				>
 			</div>
 
@@ -83,6 +84,7 @@
 					type="text"
 					id="{{meta.idp}}-offHand-name-input"
 					name="system.weapon.offHand.name"
+					value="{{system.weapon.offHand.name}}"
 				>
 			</div>
 
diff --git a/templates/actors/char-sheet-mvp/partials/skill.hbs b/templates/actors/char-sheet-mvp/partials/skill.hbs
index edbb675..167901a 100644
--- a/templates/actors/char-sheet-mvp/partials/skill.hbs
+++ b/templates/actors/char-sheet-mvp/partials/skill.hbs
@@ -1,5 +1,6 @@
 <div class="skill">
 	<button
+		type="button"
 		class="skill__label skill__button"
 		aria-label="{{localize "dotdungeon.aria.actor.pc.skill.button.roll" skill=name}}"
 		data-roll-formula="1{{dd-objectValue system (concat "stats." stat)}} {{dd-objectValue system.skills (concat stat "." name)}}"
diff --git a/templates/actors/char-sheet-mvp/partials/stat.hbs b/templates/actors/char-sheet-mvp/partials/stat.hbs
index 11f6dda..087121c 100644
--- a/templates/actors/char-sheet-mvp/partials/stat.hbs
+++ b/templates/actors/char-sheet-mvp/partials/stat.hbs
@@ -1,5 +1,6 @@
 <label class="stat stat--{{name}}">
 	<button
+		type="button"
 		data-stat="{{name}}"
 		data-roll-formula="1{{value}}"
 		data-roll-label="dotdungeon.rolls.stats.{{name}}"