diff --git a/web/src/components/recipe_plan.rs b/web/src/components/recipe_plan.rs
index 697c2ee..7a6ab7b 100644
--- a/web/src/components/recipe_plan.rs
+++ b/web/src/components/recipe_plan.rs
@@ -54,15 +54,15 @@ pub fn RecipePlan<'ctx, G: Html>(cx: Scope<'ctx>, sh: StateHandler<'ctx>) -> Vie
                 }).collect()
             ))
         }
-        input(type="button", value="Reset", on:click=move |_| {
+        span(role="button", on:click=move |_| {
             sh.dispatch(cx, Message::LoadState(None));
-        })
-        input(type="button", value="Clear All", on:click=move |_| {
+        }) { "Reset" } " "
+        span(role="button", on:click=move |_| {
             sh.dispatch(cx, Message::ResetRecipeCounts);
-        })
-        input(type="button", value="Save Plan", on:click=move |_| {
+        }) { "Clear All" } " "
+        span(role="button", on:click=move |_| {
             // Poor man's click event signaling.
             sh.dispatch(cx, Message::SaveState(None));
-        })
+        }) { "Save Plan" } " "
     }
 }
diff --git a/web/src/components/shopping_list.rs b/web/src/components/shopping_list.rs
index 41bd1a2..273d0bd 100644
--- a/web/src/components/shopping_list.rs
+++ b/web/src/components/shopping_list.rs
@@ -200,17 +200,17 @@ pub fn ShoppingList<'ctx, G: Html>(cx: Scope<'ctx>, sh: StateHandler<'ctx>) -> V
         label(for="show_staples_cb") { "Show staples" }
         input(id="show_staples_cb", type="checkbox", bind:checked=show_staples)
         (make_shopping_table(cx, sh, show_staples))
-        input(type="button", value="Add Item", class="no-print", on:click=move |_| {
+        span(role="button", class="no-print", on:click=move |_| {
             info!("Registering add item request for inventory");
             sh.dispatch(cx, Message::AddExtra(String::new(), String::new()));
-        })
-        input(type="button", value="Reset", class="no-print", on:click=move |_| {
+        }) { "Add Item" } " "
+        span(role="button", class="no-print", on:click=move |_| {
             info!("Registering reset request for inventory");
             sh.dispatch(cx, Message::ResetInventory);
-        })
-        input(type="button", value="Save", class="no-print", on:click=move |_| {
+        }) { "Reset" } " "
+        span(role="button", class="no-print", on:click=move |_| {
             info!("Registering save request for inventory");
             sh.dispatch(cx, Message::SaveState(None));
-        })
+        }) { "Save" } " "
     }
 }
diff --git a/web/src/pages/login.rs b/web/src/pages/login.rs
index d16c495..09d3a0d 100644
--- a/web/src/pages/login.rs
+++ b/web/src/pages/login.rs
@@ -27,7 +27,7 @@ pub fn LoginForm<'ctx, G: Html>(cx: Scope<'ctx>, sh: StateHandler<'ctx>) -> View
             input(type="text", id="username", bind:value=username)
             label(for="password") { "Password" }
             input(type="password", bind:value=password)
-            input(type="button", value="Login", on:click=move |_| {
+            span(role="button", on:click=move |_| {
                 info!("Attempting login request");
                 let (username, password) = ((*username.get_untracked()).clone(), (*password.get_untracked()).clone());
                 if username != "" && password != "" {
@@ -41,7 +41,7 @@ pub fn LoginForm<'ctx, G: Html>(cx: Scope<'ctx>, sh: StateHandler<'ctx>) -> View
                     });
                 }
                 debug!("triggering login click subscribers");
-            }) {  }
+            }) { "Login" } " "
         }
     }
 }