diff --git a/templates/components/home_fragment.rs.html b/templates/components/home_fragment.rs.html
index 8d23adb..32b062a 100644
--- a/templates/components/home_fragment.rs.html
+++ b/templates/components/home_fragment.rs.html
@@ -10,13 +10,13 @@
   @if open_shift.is_some() {
   <div hx-boost="true">
     <a href="/shifts/@open_shift.unwrap().id/drinks">
-      <button>Drinks</button>
+      <button type="button">Drinks</button>
     </a>
   </div>
   }
   <div hx-boost="true">
     <a href="/management">
-      <button>Management</button>
+      <button type="button">Management</button>
     </a>
   </div>
 </main>
diff --git a/templates/components/return_to_main.rs.html b/templates/components/return_to_main.rs.html
new file mode 100644
index 0000000..3f91ec5
--- /dev/null
+++ b/templates/components/return_to_main.rs.html
@@ -0,0 +1,7 @@
+@()
+
+<div hx-boost="true">
+  <a href="/">
+    <button type="button">Return to Main Page</button>
+  </a>
+</div>
diff --git a/templates/dancers.rs.html b/templates/dancers.rs.html
new file mode 100644
index 0000000..bf870ac
--- /dev/null
+++ b/templates/dancers.rs.html
@@ -0,0 +1,14 @@
+@use super::base_html;
+@use super::components::return_to_main_html;
+
+@()
+
+@:base_html({
+
+@:return_to_main_html()
+
+<div>
+  I have no dancers to show you :(
+</div>
+
+})
diff --git a/templates/shift_report.rs.html b/templates/shift_report.rs.html
index a20472f..ef97d5e 100644
--- a/templates/shift_report.rs.html
+++ b/templates/shift_report.rs.html
@@ -9,12 +9,12 @@
 <div style="display: flex; gap: 2rem;">
   <div hx-boost="true">
     <a href="/">
-      <button>Return to Main Page</button>
+      <button type="button">Return to Main Page</button>
     </a>
   </div>
   <div hx-boost="true">
     <a href="/shift_reports">
-      <button>Return to Shift Reports</button>
+      <button type="button">Return to Shift Reports</button>
     </a>
   </div>
 </div>
diff --git a/templates/shift_reports.rs.html b/templates/shift_reports.rs.html
index 1625158..a8812ef 100644
--- a/templates/shift_reports.rs.html
+++ b/templates/shift_reports.rs.html
@@ -1,15 +1,12 @@
 @use super::base_html;
+@use super::components::return_to_main_html;
 @use cm_lib::models::Shift;
 
 @(shifts: Vec<Shift>)
 
 @:base_html({
 
-<div hx-boost="true">
-  <a href="/">
-    <button>Return to Main Page</button>
-  </a>
-</div>
+@:return_to_main_html()
 
 <table>
   <thead>
@@ -34,7 +31,7 @@
       </td>
       <td hx-boost="true">
         <a href="/shifts/@shift.id/report">
-          <button>View Shift</button>
+          <button type="button">View Shift</button>
         </a>
       </td>
     </tr>