diff --git a/styles/v3/elements/button.scss b/styles/v3/elements/button.scss
index b758bee..33ad097 100644
--- a/styles/v3/elements/button.scss
+++ b/styles/v3/elements/button.scss
@@ -1,43 +1,46 @@
 @use "../mixins/material" as material;
 
-.dotdungeon.style-v3 > .window-content button {
-	@include material.elevate(2);
-	align-items: center;
-	border-radius: 4px;
-	border: none;
-	box-sizing: border-box;
-	color: inherit;
-	cursor: pointer;
-	display: inline-flex;
-	font-family: sans-serif;
-	gap: 4px;
-	justify-content: center;
-	margin: 0;
-	outline: none;
-	padding: 4px 8px;
-	transition: all 200ms ease-in-out;
-	width: initial;
+.dotdungeon.style-v3 > .window-content {
+	button, a.button {
+		@include material.elevate(2);
+		align-items: center;
+		border-radius: 4px;
+		border: none;
+		box-sizing: border-box;
+		color: inherit;
+		cursor: pointer;
+		display: inline-flex;
+		font-family: sans-serif;
+		gap: 4px;
+		justify-content: center;
+		margin: 0;
+		outline: none;
+		padding: 4px 8px;
+		transition: all 200ms ease-in-out;
+		width: initial;
 
-	&:hover, &:focus-visible {
-		@include material.elevate(4);
-	}
-	&:active {
-		@include material.elevate(6);
-	}
+		&:hover, &:focus-visible {
+			@include material.elevate(4);
+			text-shadow: none;
+		}
+		&:active {
+			@include material.elevate(6);
+		}
 
-	&:disabled {
-		opacity: 50%;
-		cursor: default;
-	}
+		&:disabled {
+			opacity: 50%;
+			cursor: default;
+		}
 
-	/* Icon buttons don't use Material styling */
-	&.icon {
-		@include material.undo;
-		padding: 4px;
-
-		&:focus-visible {
+		/* Icon buttons don't use Material styling */
+		&.icon {
 			@include material.undo;
-			// TODO : Accessible focus state
+			padding: 4px;
+
+			&:focus-visible {
+				@include material.undo;
+				// TODO : Accessible focus state
+			}
 		}
 	}
 }
diff --git a/styles/v3/elements/utilities.scss b/styles/v3/elements/utilities.scss
index 2a3cb42..32cc792 100644
--- a/styles/v3/elements/utilities.scss
+++ b/styles/v3/elements/utilities.scss
@@ -6,4 +6,7 @@
 	.text-center {
 		text-align: center;
 	}
+	.text-right {
+		text-align: right;
+	}
 }
diff --git a/templates/items/untyped/v2/index.hbs b/templates/items/untyped/v2/index.hbs
index d57f46e..c8509ac 100644
--- a/templates/items/untyped/v2/index.hbs
+++ b/templates/items/untyped/v2/index.hbs
@@ -10,11 +10,11 @@
 
 	<div class="nav-bar">
 		<nav data-group="page" class="page" aria-label="">
-			<button type="button" data-group="page" data-tab="general">General</button>
-			<button type="button" data-group="page" data-tab="details">Details</button>
-			<button type="button" data-group="page" data-tab="effects">Effects</button>
+			<a class="button" data-group="page" data-tab="general">General</a>
+			<a class="button" data-group="page" data-tab="details">Details</a>
+			<a class="button" data-group="page" data-tab="effects">Effects</a>
 			{{#if meta.showSettingsTab}}
-				<button type="button" data-group="page" data-tab="settings">Settings</button>
+				<a class="button" data-group="page" data-tab="settings">Settings</a>
 			{{/if}}
 		</nav>
 	</div>
diff --git a/templates/items/untyped/v2/tabs/details.v2.untyped.hbs b/templates/items/untyped/v2/tabs/details.v2.untyped.hbs
index 37591e8..bc8d57f 100644
--- a/templates/items/untyped/v2/tabs/details.v2.untyped.hbs
+++ b/templates/items/untyped/v2/tabs/details.v2.untyped.hbs
@@ -15,8 +15,8 @@
 				id="{{meta.idp}}-purchase-cost"
 			>
 		{{else}}
-			Purchase Cost
-			{{dd-empty-state system.buy}}
+			<span>Purchase Cost</span>
+			<span class="text-right">{{dd-empty-state system.buy}}</span>
 		{{/if}}
 	</div>
 	<div class="number panel">
@@ -35,12 +35,12 @@
 				id="{{meta.idp}}-usage-cost"
 			>
 		{{else}}
-			Usage Cost
-			{{dd-empty-state system.usage_cost}}
+			<span>Usage Cost</span>
+			<span class="text-right">{{dd-empty-state system.usage_cost}}</span>
 		{{/if}}
 	</div>
 	<div class="detail panel--row space-between">
-		Rarity
+		<span>Rarity</span>
 		{{#if meta.isEditable}}
 			<select
 				class="text-center"
@@ -50,7 +50,7 @@
 				{{{ dd-options system.tier config.itemTiers localize=true }}}
 			</select>
 		{{else}}
-			{{dd-i18n (concat "dotdungeon.rarity." system.tier)}}
+			<span>{{dd-i18n (concat "dotdungeon.rarity." system.tier)}}</span>
 		{{/if}}
 	</div>
 	{{#if meta.isEmbedded}}