diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 6dc4ded5c2a..54df55b33a7 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -67,7 +67,7 @@
 /obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
 	SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
 	if (!ui)
-		ui = new(user, src, ui_key, "chem_dispenser.tmpl", name, 490, 710)
+		ui = new(user, src, ui_key, "chem_dispenser.tmpl", name, 500, 650)
 		ui.open()
 
 /obj/machinery/chem_dispenser/get_ui_data()
@@ -1489,7 +1489,7 @@
 /obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 0)
 	SSnano.try_update_ui(user, src, ui_key, ui, force_open = force_open)
 	if (!ui)
-		ui = new(user, src, ui_key, "chem_heater.tmpl", name, 350, 270)
+		ui = new(user, src, ui_key, "chem_heater.tmpl", name, 350, 400)
 		ui.open()
 
 /obj/machinery/chem_heater/get_ui_data()
diff --git a/nano/interfaces/chem_dispenser.tmpl b/nano/interfaces/chem_dispenser.tmpl
index d8906e1caed..21550c9241c 100644
--- a/nano/interfaces/chem_dispenser.tmpl
+++ b/nano/interfaces/chem_dispenser.tmpl
@@ -1,62 +1,54 @@
-<!-- 
-Title: Chem Dispenser 5000 UI 
-Used In File(s): \code\modules\reagents\Chemistry-Machinery.dm
- -->
-<div class="item">
-	<div class="itemLabel">
-		Energy:
-	</div>
-	<div class="itemContent">
-		{{:helper.displayBar(data.energy, 0, data.maxEnergy, 'good', data.energy + ' Units')}}
-	</div>
-</div>
-
-<div class="item">
-	<div class="itemLabel">
-		Dispense:
-	</div>
-	<div class="itemContent">
-		{{:helper.link('5', 'gear', {'amount' : 5}, (data.amount == 5) ? 'selected' : null)}}
-		{{:helper.link('10', 'gear', {'amount' : 10}, (data.amount == 10) ? 'selected' : null)}}
-		{{:helper.link('20', 'gear', {'amount' : 20}, (data.amount == 20) ? 'selected' : null)}}
-		{{:helper.link('30', 'gear', {'amount' : 30}, (data.amount == 30) ? 'selected' : null)}}
-		{{:helper.link('50', 'gear', {'amount' : 50}, (data.amount == 50) ? 'selected' : null)}}
-	</div>
-</div>
-<div class="item">&nbsp;</div>
-<div class="item">
-	<div class="itemLabel" style="width: 100%;">
-		Chemical Dispenser
-	</div>
-</div>
-<div class="item">
-	<div class="itemContent" style="width: 100%;">
-		{{for data.chemicals}}
-			{{:helper.link(value.title, 'circle-arrow-s', value.commands, null, 'fixedLeft')}}
-		{{/for}}
-	</div>
-</div>
-<div class="item">&nbsp;</div>
-<div class="item">
-	<div class="itemLabel">
-		Beaker Contents
-	</div>
-	<div class="itemContent">
-		{{:helper.link('Eject Beaker', 'eject', {'ejectBeaker' : 1}, data.isBeakerLoaded ? null : 'disabled', 'floatRight')}}
-	</div>
-</div>
-<div class="statusDisplay" style="height: 225px; overflow: auto;">
+<h2>Status</h2>
+<div class="statusDisplay">
 	<div class="item">
-		<div class="itemContent" style="width: 100%;">
+		<div class="itemLabel">
+			Energy:
+		</div>
+		<div class="itemContent">
+			{{:helper.displayBar(data.energy, 0, data.maxEnergy, 'good')}}
+			{{:data.energy}} Units
+		</div>
+	</div>
+	<div class="item">
+		<div class="itemLabel">
+			Amount:
+		</div>
+		<div class="itemContent">
+			{{:helper.link('5', 'gear', {'amount' : 5}, (data.amount == 5) ? 'selected' : null)}}
+			{{:helper.link('10', 'gear', {'amount' : 10}, (data.amount == 10) ? 'selected' : null)}}
+			{{:helper.link('20', 'gear', {'amount' : 20}, (data.amount == 20) ? 'selected' : null)}}
+			{{:helper.link('30', 'gear', {'amount' : 30}, (data.amount == 30) ? 'selected' : null)}}
+			{{:helper.link('50', 'gear', {'amount' : 50}, (data.amount == 50) ? 'selected' : null)}}
+		</div>
+	</div>
+</div>
+<h2>Dispense</h2>
+<div class="statusDisplay">
+	<div class="item">
+		<div class="itemContentWidest">
+			{{for data.chemicals}}
+				{{:helper.link(value.title, 'circle-arrow-s', value.commands, null, 'link fixedLeft')}}
+			{{/for}}
+		</div>
+	</div>
+</div>
+<h2>Beaker</h2>
+<div class="statusDisplay">
+	{{:helper.link('Eject Beaker', 'eject', {'ejectBeaker' : 1}, data.isBeakerLoaded ? null : 'disabled')}}
+	<div class="item">
+		<div class="itemLabel">
+			Contents:
+		</div>
+		<div class="itemContent" style="min-height: 175px;">
 			{{if data.isBeakerLoaded}}
-				<b>Volume:&nbsp;{{:data.beakerCurrentVolume}}&nbsp;/&nbsp;{{:data.beakerMaxVolume}}</b><br>
+				<b>Volume: {{:data.beakerCurrentVolume}}/{{:data.beakerMaxVolume}} Units</b><br />
 				{{for data.beakerContents}}
-					<span class="highlight">{{:value.volume}} units of {{:value.name}}</span><br>
+					<span class="good">{{:value.volume}} units of {{:value.name}}</span><br />
 				{{empty}}
-					<span class="bad">Beaker is empty</span>
+					<span class="bad">Beaker Empty</span>
 				{{/for}}
 			{{else}}
-				<span class="average"><i>No beaker loaded</i></span>
+				<span class="average">No Beaker Loaded</span>
 			{{/if}}
 		</div>
 	</div>
diff --git a/nano/interfaces/chem_heater.tmpl b/nano/interfaces/chem_heater.tmpl
index c33718cb5eb..48b4916bbb9 100644
--- a/nano/interfaces/chem_heater.tmpl
+++ b/nano/interfaces/chem_heater.tmpl
@@ -1,45 +1,40 @@
-<!-- 
-Title: ChemHeater UI 
-Used In File(s): \code\modules\reagents\Chemistry-Machinery.dm
- -->
-<div class="item">
-	<div class="itemLabel">
-		Status:
-	</div>
-	<div class="itemContent">
-		{{:helper.link(data.isActive ? 'On' : 'Off', 'power', {'toggle_on' : 1}, data.isBeakerLoaded ? null : 'disabled')}}
-	</div>
-</div>
-<div class="item">
-	<div class="itemLabel">
-		Target:
-	</div>
-	<div class="itemContent">
-	        {{:helper.link(data.targetTemp + 'K', 'gear', {'adjust_temperature' : 'input'}, null)}}
-	</div>
-</div>
-<div class="item">
-	<div class="itemLabel">
-		Beaker
-	</div>
-	<div class="itemContent">
-		{{:helper.link('Eject', 'eject', {'eject_beaker' : 1}, data.isBeakerLoaded ? null : 'disabled', 'floatRight')}}
-	</div>
-</div>
-<div class="statusDisplay" style="height: 110px; overflow: auto;">
+<h2>Status</h2>
+<div class="statusDisplay">
 	<div class="item">
-		<div class="itemContent" style="width: 100%;">
-			{{if data.isBeakerLoaded}}
-				<b>Volume:&nbsp;{{:data.beakerCurrentVolume}}&nbsp;/&nbsp;{{:data.beakerMaxVolume}}</b><br>
-				<b>Temperature:&nbsp;{{:data.currentTemp}}&nbsp;Kelvin</b><br>
-				{{for data.beakerContents}}
-					<span class="highlight">{{:value.volume}} units of {{:value.name}}</span><br>
-				{{empty}}
-					<span class="bad">Beaker is empty</span>
-				{{/for}}
-			{{else}}
-				<span class="average"><i>No beaker loaded</i></span>
-			{{/if}}
+		<div class="itemLabel">
+			Power:
+		</div>
+		<div class="itemContent">
+			{{:helper.link(data.isActive ? 'On' : 'Off', data.isActive ? 'power' : 'close', {'toggle_on' : 1}, data.isBeakerLoaded ? null : 'disabled')}}
+		</div>
+	</div>
+	<div class="item">
+		<div class="itemLabel">
+			Target:
+		</div>
+		<div class="itemContent">
+			{{:helper.link(data.targetTemp + 'K', 'pencil', {'adjust_temperature' : 'input'})}}
 		</div>
 	</div>
 </div>
+<h2>Beaker</h2>
+<div class="statusDisplay">
+	{{:helper.link('Eject Beaker', 'eject', {'eject_beaker' : 1}, data.isBeakerLoaded ? null : 'disabled')}}
+	<div class="item">
+		<div class="itemLabel">
+			Contents:
+		</div>
+		<div class="itemContent" style="min-height: 175px;">
+			{{if data.isBeakerLoaded}}
+				<b>Temperature: {{:data.currentTemp}}K</b><br />
+				{{for data.beakerContents}}
+					<span class="good">{{:value.volume}} units of {{:value.name}}</span><br />
+				{{empty}}
+					<span class="bad">Beaker Empty</span>
+				{{/for}}
+			{{else}}
+				<span class="average">No Beaker Loaded</span>
+			{{/if}}
+		</div>
+	</div>
+</div>
\ No newline at end of file