diff --git a/lib/cannery_web/components/ammo_group_card.ex b/lib/cannery_web/components/ammo_group_card.ex
index 59cd2dc0..3686cdcb 100644
--- a/lib/cannery_web/components/ammo_group_card.ex
+++ b/lib/cannery_web/components/ammo_group_card.ex
@@ -40,7 +40,9 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
         <%= if @ammo_group.price_paid do %>
           <span class="rounded-lg title text-lg">
             <%= gettext("Price paid:") %>
-            <%= gettext("$%{amount}", amount: @ammo_group.price_paid |> :erlang.float_to_binary(decimals: 2)) %>
+            <%= gettext("$%{amount}",
+              amount: @ammo_group.price_paid |> :erlang.float_to_binary(decimals: 2)
+            ) %>
           </span>
         <% end %>
       </div>
diff --git a/lib/cannery_web/components/invite_card.ex b/lib/cannery_web/components/invite_card.ex
index ed8aac07..2d9f877e 100644
--- a/lib/cannery_web/components/invite_card.ex
+++ b/lib/cannery_web/components/invite_card.ex
@@ -8,9 +8,11 @@ defmodule CanneryWeb.Components.InviteCard do
 
   def invite_card(assigns) do
     ~H"""
-    <div class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center space-y-4
+    <div
+      class="mx-4 my-2 px-8 py-4 flex flex-col justify-center items-center space-y-4
       border border-gray-400 rounded-lg shadow-lg hover:shadow-md
-      transition-all duration-300 ease-in-out">
+      transition-all duration-300 ease-in-out"
+    >
       <h1 class="title text-xl">
         <%= @invite.name %>
       </h1>
@@ -30,7 +32,8 @@ defmodule CanneryWeb.Components.InviteCard do
         <code
           id={"code-#{@invite.id}"}
           class="mx-2 my-1 text-xs px-4 py-2 rounded-lg text-center break-all text-gray-100 bg-primary-800"
-        ><%= Routes.user_registration_url(Endpoint, :new, invite: @invite.token) %>
+        >
+          <%= Routes.user_registration_url(Endpoint, :new, invite: @invite.token) %>
         </code>
 
         <%= if @code_actions do %>
diff --git a/lib/cannery_web/components/topbar.ex b/lib/cannery_web/components/topbar.ex
index a9ee062d..a6710e89 100644
--- a/lib/cannery_web/components/topbar.ex
+++ b/lib/cannery_web/components/topbar.ex
@@ -30,10 +30,12 @@ defmodule CanneryWeb.Components.Topbar do
           <% end %>
         </div>
 
-        <hr class="mb-2 sm:hidden hr-light">
+        <hr class="mb-2 sm:hidden hr-light" />
 
-        <ul class="flex flex-row flex-wrap justify-center items-center
-          text-lg text-white text-ellipsis">
+        <ul
+          class="flex flex-row flex-wrap justify-center items-center
+          text-lg text-white text-ellipsis"
+        >
           <%= if @current_user do %>
             <li class="mx-2 my-1">
               <%= link(gettext("Tags"),
diff --git a/lib/cannery_web/components/user_card.ex b/lib/cannery_web/components/user_card.ex
index c44155fb..a75f7d9a 100644
--- a/lib/cannery_web/components/user_card.ex
+++ b/lib/cannery_web/components/user_card.ex
@@ -21,7 +21,7 @@ defmodule CanneryWeb.Components.UserCard do
         <%= if @user.confirmed_at |> is_nil() do %>
           Email unconfirmed
         <% else %>
-          User was confirmed at <%= @user.confirmed_at |> display_datetime() %>
+          User was confirmed at<%= @user.confirmed_at |> display_datetime() %>
         <% end %>
       </h3>
 
diff --git a/lib/cannery_web/live/ammo_group_live/index.html.heex b/lib/cannery_web/live/ammo_group_live/index.html.heex
index 74175fca..4cfcc30a 100644
--- a/lib/cannery_web/live/ammo_group_live/index.html.heex
+++ b/lib/cannery_web/live/ammo_group_live/index.html.heex
@@ -61,7 +61,9 @@
 
               <td class="p-2">
                 <%= if ammo_group.price_paid do %>
-                  <%= gettext("$%{amount}", amount: ammo_group.price_paid |> :erlang.float_to_binary(decimals: 2)) %>
+                  <%= gettext("$%{amount}",
+                    amount: ammo_group.price_paid |> :erlang.float_to_binary(decimals: 2)
+                  ) %>
                 <% end %>
               </td>
 
@@ -143,7 +145,6 @@
         current_user={@current_user}
       />
     </.modal>
-
   <% @live_action == :add_shot_group -> %>
     <.modal return_to={Routes.ammo_group_index_path(Endpoint, :index)}>
       <.live_component
@@ -156,7 +157,6 @@
         current_user={@current_user}
       />
     </.modal>
-
   <% @live_action == :move -> %>
     <.modal return_to={Routes.ammo_group_index_path(Endpoint, :index)}>
       <.live_component
@@ -169,6 +169,5 @@
         current_user={@current_user}
       />
     </.modal>
-
   <% true -> %>
-<% end %>
+  <% end %>
diff --git a/lib/cannery_web/live/ammo_group_live/show.html.heex b/lib/cannery_web/live/ammo_group_live/show.html.heex
index 881ce3de..97578081 100644
--- a/lib/cannery_web/live/ammo_group_live/show.html.heex
+++ b/lib/cannery_web/live/ammo_group_live/show.html.heex
@@ -19,7 +19,9 @@
     <%= if @ammo_group.price_paid do %>
       <span class="rounded-lg title text-lg">
         <%= gettext("Price paid:") %>
-        <%= gettext("$%{amount}", amount: @ammo_group.price_paid |> :erlang.float_to_binary(decimals: 2)) %>
+        <%= gettext("$%{amount}",
+          amount: @ammo_group.price_paid |> :erlang.float_to_binary(decimals: 2)
+        ) %>
       </span>
     <% end %>
   </div>
@@ -51,7 +53,9 @@
 
     <div class="flex flex-wrap justify-center items-center text-primary-500">
       <button type="button" class="mx-4 my-2 btn btn-primary" phx-click="toggle_staged">
-        <%= if @ammo_group.staged, do: gettext("Unstage from range"), else: gettext("Stage for range") %>
+        <%= if @ammo_group.staged,
+          do: gettext("Unstage from range"),
+          else: gettext("Stage for range") %>
       </button>
 
       <%= live_patch(dgettext("actions", "Move containers"),
@@ -67,7 +71,7 @@
     </div>
   </div>
 
-  <hr class="mb-4 w-full">
+  <hr class="mb-4 w-full" />
 
   <div>
     <%= if @ammo_group.container do %>
@@ -95,7 +99,6 @@
         current_user={@current_user}
       />
     </.modal>
-
   <% :add_shot_group -> %>
     <.modal return_to={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}>
       <.live_component
@@ -108,7 +111,6 @@
         current_user={@current_user}
       />
     </.modal>
-
   <% :move -> %>
     <.modal return_to={Routes.ammo_group_show_path(Endpoint, :show, @ammo_group)}>
       <.live_component
@@ -121,6 +123,5 @@
         current_user={@current_user}
       />
     </.modal>
-
   <% _show -> %>
-<% end %>
+  <% end %>
diff --git a/lib/cannery_web/live/ammo_type_live/form_component.html.heex b/lib/cannery_web/live/ammo_type_live/form_component.html.heex
index b5b7f0dc..234db8e6 100644
--- a/lib/cannery_web/live/ammo_type_live/form_component.html.heex
+++ b/lib/cannery_web/live/ammo_type_live/form_component.html.heex
@@ -34,14 +34,18 @@
     >
       <%= gettext("Example bullet type abbreviations") %>
     </a>
-    <%= label(f, :bullet_type, gettext("Bullet type"), class: "mr-4 title text-lg text-primary-500") %>
+    <%= label(f, :bullet_type, gettext("Bullet type"),
+      class: "mr-4 title text-lg text-primary-500"
+    ) %>
     <%= text_input(f, :bullet_type,
       class: "text-center col-span-2 input input-primary",
       placeholder: gettext("FMJ")
     ) %>
     <%= error_tag(f, :bullet_type, "col-span-3 text-center") %>
 
-    <%= label(f, :bullet_core, gettext("Bullet core"), class: "mr-4 title text-lg text-primary-500") %>
+    <%= label(f, :bullet_core, gettext("Bullet core"),
+      class: "mr-4 title text-lg text-primary-500"
+    ) %>
     <%= text_input(f, :bullet_core,
       class: "text-center col-span-2 input input-primary",
       placeholder: gettext("Steel")
@@ -62,14 +66,18 @@
     ) %>
     <%= error_tag(f, :caliber, "col-span-3 text-center") %>
 
-    <%= label(f, :case_material, gettext("Case material"), class: "mr-4 title text-lg text-primary-500") %>
+    <%= label(f, :case_material, gettext("Case material"),
+      class: "mr-4 title text-lg text-primary-500"
+    ) %>
     <%= text_input(f, :case_material,
       class: "text-center col-span-2 input input-primary",
       placeholder: gettext("Brass")
     ) %>
     <%= error_tag(f, :case_material, "col-span-3 text-center") %>
 
-    <%= label(f, :jacket_type, gettext("Jacket type"), class: "mr-4 title text-lg text-primary-500") %>
+    <%= label(f, :jacket_type, gettext("Jacket type"),
+      class: "mr-4 title text-lg text-primary-500"
+    ) %>
     <%= text_input(f, :jacket_type,
       class: "text-center col-span-2 input input-primary",
       placeholder: gettext("Bimetal")
@@ -86,7 +94,9 @@
     ) %>
     <%= error_tag(f, :muzzle_velocity, "col-span-3 text-center") %>
 
-    <%= label(f, :powder_type, gettext("Powder type"), class: "mr-4 title text-lg text-primary-500") %>
+    <%= label(f, :powder_type, gettext("Powder type"),
+      class: "mr-4 title text-lg text-primary-500"
+    ) %>
     <%= text_input(f, :powder_type,
       class: "text-center col-span-2 input input-primary",
       placeholder: gettext("Brass")
@@ -118,14 +128,18 @@
     ) %>
     <%= error_tag(f, :pressure, "col-span-3 text-center") %>
 
-    <%= label(f, :primer_type, gettext("Primer type"), class: "mr-4 title text-lg text-primary-500") %>
+    <%= label(f, :primer_type, gettext("Primer type"),
+      class: "mr-4 title text-lg text-primary-500"
+    ) %>
     <%= text_input(f, :primer_type,
       class: "text-center col-span-2 input input-primary",
       placeholder: "Boxer"
     ) %>
     <%= error_tag(f, :primer_type, "col-span-3 text-center") %>
 
-    <%= label(f, :firing_type, gettext("Firing type"), class: "mr-4 title text-lg text-primary-500") %>
+    <%= label(f, :firing_type, gettext("Firing type"),
+      class: "mr-4 title text-lg text-primary-500"
+    ) %>
     <%= text_input(f, :firing_type,
       class: "text-center col-span-2 input input-primary",
       placeholder: "Centerfire"
@@ -148,7 +162,9 @@
     <%= checkbox(f, :corrosive, class: "text-center col-span-2 checkbox") %>
     <%= error_tag(f, :corrosive, "col-span-3 text-center") %>
 
-    <%= label(f, :manufacturer, gettext("Manufacturer"), class: "mr-4 title text-lg text-primary-500") %>
+    <%= label(f, :manufacturer, gettext("Manufacturer"),
+      class: "mr-4 title text-lg text-primary-500"
+    ) %>
     <%= text_input(f, :manufacturer, class: "text-center col-span-2 input input-primary") %>
     <%= error_tag(f, :manufacturer, "col-span-3 text-center") %>
 
diff --git a/lib/cannery_web/live/ammo_type_live/show.html.heex b/lib/cannery_web/live/ammo_type_live/show.html.heex
index 26061c02..2087d568 100644
--- a/lib/cannery_web/live/ammo_type_live/show.html.heex
+++ b/lib/cannery_web/live/ammo_type_live/show.html.heex
@@ -5,9 +5,11 @@
   </h1>
 
   <%= if @ammo_type.desc do %>
-    <span class="max-w-2xl w-full px-8 py-4 rounded-lg
+    <span
+      class="max-w-2xl w-full px-8 py-4 rounded-lg
       text-center title text-lg
-      border border-primary-600">
+      border border-primary-600"
+    >
       <%= @ammo_type.desc %>
     </span>
   <% end %>
@@ -31,7 +33,7 @@
     <% end %>
   </div>
 
-  <hr class="hr">
+  <hr class="hr" />
 
   <div class="grid sm:grid-cols-2 text-center justify-center items-center">
     <%= for {field_name, field} <- [
@@ -50,7 +52,7 @@
         ] do %>
       <%= if @ammo_type |> Map.get(field) do %>
         <h3 class="mb-2 sm:mr-4 title text-lg">
-          <%= field_name %> :
+          <%= field_name %>:
         </h3>
 
         <span class="mb-4 sm:mb-2 text-primary-600">
@@ -67,7 +69,7 @@
           {"Corrosive", :corrosive}
         ] do %>
       <h3 class="mb-2 sm:mr-4 title text-lg">
-        <%= field_name %> :
+        <%= field_name %>:
       </h3>
 
       <span class="mb-4 sm:mb-2 text-primary-600">
@@ -78,7 +80,7 @@
     <%= for {field_name, field} <- [{"Manufacturer", :manufacturer}, {"UPC", :upc}] do %>
       <%= if @ammo_type |> Map.get(field) do %>
         <h3 class="mb-2 sm:mr-4 title text-lg">
-          <%= field_name %> :
+          <%= field_name %>:
         </h3>
 
         <span class="mb-4 sm:mb-2 text-primary-600">
@@ -89,16 +91,18 @@
 
     <%= if @avg_cost_per_round do %>
       <h3 class="mb-2 sm:mr-4 title text-lg">
-        <%= gettext("Average Price paid") %> :
+        <%= gettext("Average Price paid") %>:
       </h3>
 
       <span class="mb-4 sm:mb-2 text-primary-600">
-        <%= gettext("$%{amount}", amount: @avg_cost_per_round |> :erlang.float_to_binary(decimals: 2)) %>
+        <%= gettext("$%{amount}",
+          amount: @avg_cost_per_round |> :erlang.float_to_binary(decimals: 2)
+        ) %>
       </span>
     <% end %>
   </div>
 
-  <hr class="hr">
+  <hr class="hr" />
 
   <div>
     <%= if @ammo_groups |> Enum.empty?() do %>
diff --git a/lib/cannery_web/live/container_live/show.html.heex b/lib/cannery_web/live/container_live/show.html.heex
index dcbe521a..36b43226 100644
--- a/lib/cannery_web/live/container_live/show.html.heex
+++ b/lib/cannery_web/live/container_live/show.html.heex
@@ -41,7 +41,7 @@
     <% end %>
   </div>
 
-  <hr class="mb-4 hr">
+  <hr class="mb-4 hr" />
 
   <%= if @container.tags |> Enum.empty?() do %>
     <div class="flex flex-row justify-center items-center space-x-4">
@@ -81,7 +81,7 @@
     <% end %>
   <% end %>
 
-  <hr class="mb-4 hr">
+  <hr class="mb-4 hr" />
 
   <p>
     <%= if @container.ammo_groups |> Enum.empty?() do %>
diff --git a/lib/cannery_web/live/home_live.ex b/lib/cannery_web/live/home_live.ex
index f2ffe4c0..f7532331 100644
--- a/lib/cannery_web/live/home_live.ex
+++ b/lib/cannery_web/live/home_live.ex
@@ -34,7 +34,9 @@ defmodule CanneryWeb.HomeLive do
   @impl true
   def render(assigns) do
     ~H"""
-    <div class="mx-auto px-8 sm:px-16 flex flex-col justify-center items-center text-center space-y-4 max-w-3xl">
+    <div
+      class="mx-auto px-8 sm:px-16 flex flex-col justify-center items-center text-center space-y-4 max-w-3xl"
+    >
       <h1 class="title text-primary-500 text-2xl">
         <%= gettext("Welcome to %{name}", name: "Cannery") %>
       </h1>
@@ -52,7 +54,8 @@ defmodule CanneryWeb.HomeLive do
             <%= gettext("Easy to Use:") %>
           </b>
           <p>
-            <%= gettext("%{name} lets you easily keep an eye on your ammo levels before and after range day",
+            <%= gettext(
+              "%{name} lets you easily keep an eye on your ammo levels before and after range day",
               name: "Cannery"
             ) %>
           </p>
@@ -78,7 +81,7 @@ defmodule CanneryWeb.HomeLive do
         </li>
       </ul>
 
-      <hr class="hr">
+      <hr class="hr" />
 
       <ul class="flex flex-col space-y-2 text-center justify-center">
         <h2 class="title text-primary-500 text-lg">
diff --git a/lib/cannery_web/live/invite_live/index.html.heex b/lib/cannery_web/live/invite_live/index.html.heex
index 6b820ff4..cf0cdcc8 100644
--- a/lib/cannery_web/live/invite_live/index.html.heex
+++ b/lib/cannery_web/live/invite_live/index.html.heex
@@ -71,7 +71,11 @@
             class="btn btn-primary"
             phx-click="set_unlimited"
             phx-value-id={invite.id}
-            data-confirm={dgettext("prompts", "Are you sure you want to make %{name} unlimited?", name: invite.name)}
+            data-confirm={
+              dgettext("prompts", "Are you sure you want to make %{name} unlimited?",
+                name: invite.name
+              )
+            }
           >
             <%= gettext("Set Unlimited") %>
           </a>
@@ -81,7 +85,7 @@
   </div>
 
   <%= unless @admins |> Enum.empty?() do %>
-    <hr class="hr">
+    <hr class="hr" />
 
     <h1 class="title text-2xl text-primary-500">
       <%= gettext("Admins") %>
@@ -110,7 +114,7 @@
   <% end %>
 
   <%= unless @users |> Enum.empty?() do %>
-    <hr class="hr">
+    <hr class="hr" />
 
     <h1 class="title text-2xl text-primary-500">
       <%= gettext("Users") %>
diff --git a/lib/cannery_web/live/range_live/index.html.heex b/lib/cannery_web/live/range_live/index.html.heex
index 18d5a55d..75387702 100644
--- a/lib/cannery_web/live/range_live/index.html.heex
+++ b/lib/cannery_web/live/range_live/index.html.heex
@@ -28,7 +28,9 @@
           phx-value-ammo_group_id={ammo_group.id}
           data-confirm={"#{dgettext("prompts", "Are you sure you want to unstage this ammo?")}"}
         >
-          <%= if ammo_group.staged, do: gettext("Unstage from range"), else: gettext("Stage for range") %>
+          <%= if ammo_group.staged,
+            do: gettext("Unstage from range"),
+            else: gettext("Stage for range") %>
         </button>
 
         <%= live_patch(dgettext("actions", "Record shots"),
@@ -39,7 +41,7 @@
     <% end %>
   <% end %>
 
-  <hr class="hr">
+  <hr class="hr" />
 
   <%= if @shot_groups |> Enum.empty?() do %>
     <h1 class="title text-xl text-primary-500">
diff --git a/lib/cannery_web/templates/error/error.html.heex b/lib/cannery_web/templates/error/error.html.heex
index a34b410b..30ec1e3b 100644
--- a/lib/cannery_web/templates/error/error.html.heex
+++ b/lib/cannery_web/templates/error/error.html.heex
@@ -5,11 +5,10 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>
-      <%= dgettext("errors", "Error") %> | Cannery
+      <%= dgettext("errors", "Error") %>| Cannery
     </title>
     <link rel="stylesheet" href="/css/app.css" />
-    <script defer type="text/javascript" src="/js/app.js">
-    </script>
+    <script defer type="text/javascript" src="/js/app.js"></script>
   </head>
   <body class="pb-8 m-0 p-0 w-full h-full">
     <header>
@@ -17,12 +16,14 @@
     </header>
 
     <div class="pb-8 w-full flex flex-col justify-center items-center text-center">
-      <div class="p-8 sm:p-16 w-full flex flex-col justify-center items-center space-y-4 max-w-3xl">
+      <div
+        class="p-8 sm:p-16 w-full flex flex-col justify-center items-center space-y-4 max-w-3xl"
+      >
         <h1 class="title text-primary-500 text-3xl">
           <%= @error_string %>
         </h1>
 
-        <hr class="w-full hr">
+        <hr class="w-full hr" />
 
         <a href={Routes.live_path(Endpoint, HomeLive)} class="link title text-primary-500 text-lg">
           <%= dgettext("errors", "Go back home") %>
diff --git a/lib/cannery_web/templates/layout/email.html.heex b/lib/cannery_web/templates/layout/email.html.heex
index bc324238..17e484b3 100644
--- a/lib/cannery_web/templates/layout/email.html.heex
+++ b/lib/cannery_web/templates/layout/email.html.heex
@@ -7,7 +7,9 @@
   <body>
     <%= @inner_content %>
 
-    <hr style="border-width: 1px; border-color: rgb(212, 212, 216); width: 100%; max-width: 42rem;">
+    <hr
+      style="border-width: 1px; border-color: rgb(212, 212, 216); width: 100%; max-width: 42rem;"
+    />
 
     <a href={Routes.live_url(Endpoint, HomeLive)}>
       <%= dgettext("emails", "This email was sent from %{name}", name: "Cannery") %>
diff --git a/lib/cannery_web/templates/layout/live.html.heex b/lib/cannery_web/templates/layout/live.html.heex
index 8c697a62..55f20ebb 100644
--- a/lib/cannery_web/templates/layout/live.html.heex
+++ b/lib/cannery_web/templates/layout/live.html.heex
@@ -10,7 +10,12 @@
       <% end %>
 
       <%= if @flash && @flash |> Map.has_key?("error") do %>
-        <p class="alert alert-danger" role="alert" phx-click="lv:clear-flash" phx-value-key="error">
+        <p
+          class="alert alert-danger"
+          role="alert"
+          phx-click="lv:clear-flash"
+          phx-value-key="error"
+        >
           <%= live_flash(@flash, "error") %>
         </p>
       <% end %>
diff --git a/lib/cannery_web/templates/user_confirmation/new.html.heex b/lib/cannery_web/templates/user_confirmation/new.html.heex
index 83befa36..4f6fdc2a 100644
--- a/lib/cannery_web/templates/user_confirmation/new.html.heex
+++ b/lib/cannery_web/templates/user_confirmation/new.html.heex
@@ -19,7 +19,7 @@
     ) %>
   <% end %>
 
-  <hr class="hr">
+  <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
     <%= if Accounts.allow_registration?() do %>
diff --git a/lib/cannery_web/templates/user_registration/new.html.heex b/lib/cannery_web/templates/user_registration/new.html.heex
index 8872e8ca..e0049aa0 100644
--- a/lib/cannery_web/templates/user_registration/new.html.heex
+++ b/lib/cannery_web/templates/user_registration/new.html.heex
@@ -34,7 +34,7 @@
     <%= submit(dgettext("actions", "Register"), class: "mx-auto my-4 btn btn-primary col-span-3") %>
   <% end %>
 
-  <hr class="hr">
+  <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
     <%= link(dgettext("actions", "Log in"),
diff --git a/lib/cannery_web/templates/user_reset_password/edit.html.heex b/lib/cannery_web/templates/user_reset_password/edit.html.heex
index e0ecf6b4..6c118bb8 100644
--- a/lib/cannery_web/templates/user_reset_password/edit.html.heex
+++ b/lib/cannery_web/templates/user_reset_password/edit.html.heex
@@ -23,14 +23,21 @@
     <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :password, "col-span-3") %>
 
-    <%= label(f, :password_confirmation, "Confirm new password", class: "title text-lg text-primary-500") %>
-    <%= password_input(f, :password_confirmation, required: true, class: "input input-primary col-span-2") %>
+    <%= label(f, :password_confirmation, "Confirm new password",
+      class: "title text-lg text-primary-500"
+    ) %>
+    <%= password_input(f, :password_confirmation,
+      required: true,
+      class: "input input-primary col-span-2"
+    ) %>
     <%= error_tag(f, :password_confirmation, "col-span-3") %>
 
-    <%= submit(dgettext("actions", "Reset password"), class: "mx-auto my-4 btn btn-primary col-span-3") %>
+    <%= submit(dgettext("actions", "Reset password"),
+      class: "mx-auto my-4 btn btn-primary col-span-3"
+    ) %>
   <% end %>
 
-  <hr class="hr">
+  <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
     <%= if Accounts.allow_registration?() do %>
diff --git a/lib/cannery_web/templates/user_reset_password/new.html.heex b/lib/cannery_web/templates/user_reset_password/new.html.heex
index f66b8544..3b0d7d66 100644
--- a/lib/cannery_web/templates/user_reset_password/new.html.heex
+++ b/lib/cannery_web/templates/user_reset_password/new.html.heex
@@ -11,7 +11,6 @@
                  "justify-center items-center text-center space-y-4"
            ],
            fn f -> %>
-
     <%= label(f, :email, class: "title text-lg text-primary-500") %>
     <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
 
@@ -20,7 +19,7 @@
     ) %>
   <% end %>
 
-  <hr class="hr">
+  <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
     <%= if Accounts.allow_registration?() do %>
diff --git a/lib/cannery_web/templates/user_session/new.html.heex b/lib/cannery_web/templates/user_session/new.html.heex
index 1871242e..ffd9e846 100644
--- a/lib/cannery_web/templates/user_session/new.html.heex
+++ b/lib/cannery_web/templates/user_session/new.html.heex
@@ -34,7 +34,7 @@
     <%= submit(dgettext("actions", "Log in"), class: "mx-auto my-4 btn btn-primary col-span-3") %>
   <% end %>
 
-  <hr class="hr">
+  <hr class="hr" />
 
   <div class="flex flex-row justify-center items-center space-x-4">
     <%= if Accounts.allow_registration?() do %>
diff --git a/lib/cannery_web/templates/user_settings/edit.html.heex b/lib/cannery_web/templates/user_settings/edit.html.heex
index 401fcdb8..cee4de23 100644
--- a/lib/cannery_web/templates/user_settings/edit.html.heex
+++ b/lib/cannery_web/templates/user_settings/edit.html.heex
@@ -3,7 +3,7 @@
     <%= gettext("Settings") %>
   </h1>
 
-  <hr class="hr">
+  <hr class="hr" />
 
   <%= form_for @email_changeset,
            Routes.user_settings_path(@conn, :update),
@@ -43,10 +43,12 @@
     ) %>
     <%= error_tag(f, :current_password, "col-span-3") %>
 
-    <%= submit(dgettext("actions", "Change email"), class: "mx-auto my-4 btn btn-primary col-span-3") %>
+    <%= submit(dgettext("actions", "Change email"),
+      class: "mx-auto my-4 btn btn-primary col-span-3"
+    ) %>
   <% end %>
 
-  <hr class="hr">
+  <hr class="hr" />
 
   <%= form_for @password_changeset,
            Routes.user_settings_path(@conn, :update),
@@ -97,10 +99,12 @@
     ) %>
     <%= error_tag(f, :current_password, "col-span-3") %>
 
-    <%= submit(dgettext("actions", "Change password"), class: "mx-auto my-4 btn btn-primary col-span-3") %>
+    <%= submit(dgettext("actions", "Change password"),
+      class: "mx-auto my-4 btn btn-primary col-span-3"
+    ) %>
   <% end %>
 
-  <hr class="hr">
+  <hr class="hr" />
 
   <%= link(dgettext("actions", "Delete User"),
     to: Routes.user_settings_path(@conn, :delete, @current_user),
diff --git a/lib/cannery_web/views/view_helpers.ex b/lib/cannery_web/views/view_helpers.ex
index 7cc81326..899591d9 100644
--- a/lib/cannery_web/views/view_helpers.ex
+++ b/lib/cannery_web/views/view_helpers.ex
@@ -20,15 +20,11 @@ defmodule CanneryWeb.ViewHelpers do
     }
 
     ~H"""
-    <time
-      datetime={@datetime}
-      x-data={"{
+    <time datetime={@datetime} x-data={"{
         date:
           Intl.DateTimeFormat([], {dateStyle: 'short', timeStyle: 'long'})
             .format(new Date(\"#{@datetime}\"))
-      }"}
-      x-text="date"
-    >
+      }"} x-text="date">
       <%= @datetime %>
     </time>
     """
@@ -45,14 +41,10 @@ defmodule CanneryWeb.ViewHelpers do
     assigns = %{date: date |> Date.to_iso8601(:extended)}
 
     ~H"""
-    <time
-      datetime={@date}
-      x-data={"{
+    <time datetime={@date} x-data={"{
         date:
           Intl.DateTimeFormat([], {timeZone: 'Etc/UTC', dateStyle: 'short'}).format(new Date(\"#{@date}\"))
-      }"}
-      x-text="date"
-    >
+      }"} x-text="date">
       <%= @date %>
     </time>
     """
diff --git a/mix.exs b/mix.exs
index 030ca97d..93bd09a7 100644
--- a/mix.exs
+++ b/mix.exs
@@ -47,13 +47,13 @@ defmodule Cannery.MixProject do
   defp deps do
     [
       {:bcrypt_elixir, "~> 2.0"},
-      {:phoenix, "~> 1.6.6"},
+      {:phoenix, "~> 1.6"},
       {:phoenix_ecto, "~> 4.4"},
       {:ecto_sql, "~> 3.6"},
       {:postgrex, ">= 0.0.0"},
       {:phoenix_html, "~> 3.0"},
       {:phoenix_live_reload, "~> 1.2", only: :dev},
-      {:phoenix_live_view, "~> 0.17", override: true},
+      {:phoenix_live_view, "~> 0.17"},
       {:phoenix_view, "~> 1.1"},
       {:floki, ">= 0.30.0", only: :test},
       {:phoenix_live_dashboard, "~> 0.6"},
diff --git a/mix.lock b/mix.lock
index b0164acc..93c01392 100644
--- a/mix.lock
+++ b/mix.lock
@@ -23,7 +23,7 @@
   "floki": {:hex, :floki, "0.32.0", "f915dc15258bc997d49be1f5ef7d3992f8834d6f5695270acad17b41f5bcc8e2", [:mix], [{:html_entities, "~> 0.5.0", [hex: :html_entities, repo: "hexpm", optional: false]}], "hexpm", "1c5a91cae1fd8931c26a4826b5e2372c284813904c8bacb468b5de39c7ececbd"},
   "gen_smtp": {:hex, :gen_smtp, "1.1.1", "bf9303c31735100631b1d708d629e4c65944319d1143b5c9952054f4a1311d85", [:rebar3], [{:hut, "1.3.0", [hex: :hut, repo: "hexpm", optional: false]}, {:ranch, ">= 1.7.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "51bc50cc017efd4a4248cbc39ea30fb60efa7d4a49688986fafad84434ff9ab7"},
   "gettext": {:hex, :gettext, "0.19.1", "564953fd21f29358e68b91634799d9d26989f8d039d7512622efb3c3b1c97892", [:mix], [], "hexpm", "10c656c0912b8299adba9b061c06947511e3f109ab0d18b44a866a4498e77222"},
-  "heex_formatter": {:git, "https://github.com/feliperenan/heex_formatter.git", "adafd2639e1612657e89f82c571fe8298f52a599", []},
+  "heex_formatter": {:git, "https://github.com/feliperenan/heex_formatter.git", "dfefc9ae267fb0874c287ceb6c47dda106c59552", []},
   "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"},
   "hut": {:hex, :hut, "1.3.0", "71f2f054e657c03f959cf1acc43f436ea87580696528ca2a55c8afb1b06c85e7", [:"erlang.mk", :rebar, :rebar3], [], "hexpm", "7e15d28555d8a1f2b5a3a931ec120af0753e4853a4c66053db354f35bf9ab563"},
   "jason": {:hex, :jason, "1.3.0", "fa6b82a934feb176263ad2df0dbd91bf633d4a46ebfdffea0c8ae82953714946", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "53fc1f51255390e0ec7e50f9cb41e751c260d065dcba2bf0d08dc51a4002c2ac"},
diff --git a/priv/gettext/actions.pot b/priv/gettext/actions.pot
index b2abdc7e..fc07273b 100644
--- a/priv/gettext/actions.pot
+++ b/priv/gettext/actions.pot
@@ -37,8 +37,8 @@ msgid "Change email"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:59
-#: lib/cannery_web/templates/user_settings/edit.html.heex:100
+#: lib/cannery_web/templates/user_settings/edit.html.heex:61
+#: lib/cannery_web/templates/user_settings/edit.html.heex:102
 msgid "Change password"
 msgstr ""
 
@@ -48,7 +48,7 @@ msgid "Create Invite"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:105
+#: lib/cannery_web/templates/user_settings/edit.html.heex:109
 msgid "Delete User"
 msgstr ""
 
@@ -65,11 +65,11 @@ msgid "Invite someone new!"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:106
+#: lib/cannery_web/components/topbar.ex:108
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:31
 #: lib/cannery_web/templates/user_registration/new.html.heex:40
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:42
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:32
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:49
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:31
 #: lib/cannery_web/templates/user_session/new.html.heex:3
 #: lib/cannery_web/templates/user_session/new.html.heex:34
 msgid "Log in"
@@ -101,12 +101,12 @@ msgid "New Tag"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:99
+#: lib/cannery_web/components/topbar.ex:101
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:26
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
 #: lib/cannery_web/templates/user_registration/new.html.heex:34
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:37
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:27
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:26
 #: lib/cannery_web/templates/user_session/new.html.heex:41
 msgid "Register"
 msgstr ""
@@ -119,14 +119,14 @@ msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:30
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:35
 msgid "Reset password"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:42
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:54
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:159
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:175
 #: lib/cannery_web/live/container_live/form_component.html.heex:50
 #: lib/cannery_web/live/invite_live/form_component.html.heex:28
 #: lib/cannery_web/live/range_live/form_component.html.heex:40
@@ -135,7 +135,7 @@ msgid "Save"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_reset_password/new.html.heex:18
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:17
 msgid "Send instructions to reset password"
 msgstr ""
 
@@ -160,14 +160,14 @@ msgid "Why not get some ready to shoot?"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:83
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:63
-#: lib/cannery_web/live/range_live/index.html.heex:34
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:85
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:67
+#: lib/cannery_web/live/range_live/index.html.heex:36
 msgid "Record shots"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:29
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:31
 msgid "Ammo Details"
 msgstr ""
 
@@ -177,7 +177,7 @@ msgid "Add another container!"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:57
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:61
 msgid "Move containers"
 msgstr ""
 
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 220a6f5b..935d6372 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -11,29 +11,29 @@ msgid ""
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:55
+#: lib/cannery_web/live/home_live.ex:57
 msgid "%{name} lets you easily keep an eye on your ammo levels before and after range day"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:76
+#: lib/cannery_web/live/home_live.ex:79
 msgid "Access from any internet-capable device"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:87
+#: lib/cannery_web/live/invite_live/index.html.heex:91
 msgid "Admins"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:90
+#: lib/cannery_web/live/home_live.ex:93
 msgid "Admins:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:51
+#: lib/cannery_web/components/topbar.ex:53
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:3
-#: lib/cannery_web/live/range_live/index.html.heex:59
+#: lib/cannery_web/live/range_live/index.html.heex:61
 msgid "Ammo"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgid "Ammo type"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:92
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:94
 msgid "Average Price paid"
 msgstr ""
 
@@ -54,49 +54,49 @@ msgid "Background color"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:143
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157
 #: lib/cannery_web/live/ammo_type_live/index.ex:67
 msgid "Blank"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:68
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:92
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:74
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:102
 msgid "Brass"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:44
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:46
 #: lib/cannery_web/live/ammo_type_live/index.ex:53
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:39
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:41
 msgid "Bullet core"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:37
 #: lib/cannery_web/live/ammo_type_live/index.ex:52
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:38
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:40
 msgid "Bullet type"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:58
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:62
 #: lib/cannery_web/live/ammo_type_live/index.ex:55
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:41
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:43
 msgid "Caliber"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:55
 #: lib/cannery_web/live/ammo_type_live/index.ex:54
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:40
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:42
 msgid "Cartridge"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:65
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:69
 #: lib/cannery_web/live/ammo_type_live/index.ex:56
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:42
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:44
 msgid "Case material"
 msgstr ""
 
@@ -108,13 +108,13 @@ msgid "Container"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:45
+#: lib/cannery_web/components/topbar.ex:47
 #: lib/cannery_web/live/container_live/index.html.heex:3
 msgid "Containers"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:147
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:161
 #: lib/cannery_web/live/ammo_type_live/index.ex:68
 msgid "Corrosive"
 msgstr ""
@@ -149,7 +149,7 @@ msgid "Disable"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:52
+#: lib/cannery_web/live/home_live.ex:54
 msgid "Easy to Use:"
 msgstr ""
 
@@ -192,40 +192,40 @@ msgid "Example bullet type abbreviations"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:40
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:42
 msgid "FMJ"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:106
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:116
 #: lib/cannery_web/live/ammo_type_live/index.ex:61
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:47
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:49
 msgid "Grains"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:139
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:153
 #: lib/cannery_web/live/ammo_type_live/index.ex:66
 msgid "Incendiary"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:85
+#: lib/cannery_web/live/home_live.ex:88
 msgid "Instance Information"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/invite_card.ex:25
+#: lib/cannery_web/components/invite_card.ex:27
 msgid "Invite Disabled"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:116
+#: lib/cannery_web/live/home_live.ex:119
 msgid "Invite Only"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:70
+#: lib/cannery_web/components/topbar.ex:72
 #: lib/cannery_web/live/invite_live/index.html.heex:3
 msgid "Invites"
 msgstr ""
@@ -273,12 +273,12 @@ msgid "Magazine, Clip, Ammo Box, etc"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:57
+#: lib/cannery_web/components/topbar.ex:59
 msgid "Manage"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:151
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:165
 #: lib/cannery_web/live/ammo_type_live/index.ex:69
 msgid "Manufacturer"
 msgstr ""
@@ -333,7 +333,7 @@ msgid "No Ammo Types"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:105
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:109
 msgid "No ammo for this type"
 msgstr ""
 
@@ -362,7 +362,7 @@ msgstr ""
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:41
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:36
 #: lib/cannery_web/live/range_live/form_component.html.heex:29
-#: lib/cannery_web/live/range_live/index.html.heex:65
+#: lib/cannery_web/live/range_live/index.html.heex:67
 msgid "Notes"
 msgstr ""
 
@@ -378,9 +378,9 @@ msgid "On the bookshelf"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:114
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:124
 #: lib/cannery_web/live/ammo_type_live/index.ex:62
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:48
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:50
 msgid "Pressure"
 msgstr ""
 
@@ -397,14 +397,14 @@ msgid "Price paid:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:121
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:131
 #: lib/cannery_web/live/ammo_type_live/index.ex:63
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:49
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:51
 msgid "Primer type"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:115
+#: lib/cannery_web/live/home_live.ex:118
 msgid "Public Signups"
 msgstr ""
 
@@ -414,17 +414,17 @@ msgid "Rimfire"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:63
+#: lib/cannery_web/live/home_live.ex:66
 msgid "Secure:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:66
+#: lib/cannery_web/live/home_live.ex:69
 msgid "Self-host your own instance, or use an instance from someone you trust."
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:76
+#: lib/cannery_web/live/invite_live/index.html.heex:80
 msgid "Set Unlimited"
 msgstr ""
 
@@ -449,22 +449,22 @@ msgid "Show Container"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:73
+#: lib/cannery_web/live/home_live.ex:76
 msgid "Simple:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51
 msgid "Steel"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:75
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:79
 msgid "Stored in"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:39
+#: lib/cannery_web/components/topbar.ex:41
 #: lib/cannery_web/live/container_live/show.html.heex:60
 #: lib/cannery_web/live/tag_live/index.html.heex:3
 msgid "Tags"
@@ -481,17 +481,17 @@ msgid "Text color"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:43
+#: lib/cannery_web/live/home_live.ex:45
 msgid "The self-hosted firearm tracker website"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:80
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:84
 msgid "This ammo group is not in a container"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:135
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:149
 #: lib/cannery_web/live/ammo_type_live/index.ex:65
 msgid "Tracer"
 msgstr ""
@@ -509,12 +509,12 @@ msgid "Type:"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:116
+#: lib/cannery_web/live/invite_live/index.html.heex:120
 msgid "Users"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/invite_card.ex:20
+#: lib/cannery_web/components/invite_card.ex:22
 msgid "Uses Left:"
 msgstr ""
 
@@ -524,12 +524,12 @@ msgid "Uses left"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:39
+#: lib/cannery_web/live/home_live.ex:41
 msgid "Welcome to %{name}"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:67
+#: lib/cannery_web/live/home_live.ex:70
 msgid "Your data stays with you, period"
 msgstr ""
 
@@ -544,7 +544,7 @@ msgid "No tags for this container"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:63
+#: lib/cannery_web/components/topbar.ex:65
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:39
 msgid "Range"
 msgstr ""
@@ -555,7 +555,7 @@ msgid "Range day"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.html.heex:68
+#: lib/cannery_web/live/range_live/index.html.heex:70
 msgid "Date"
 msgstr ""
 
@@ -570,14 +570,14 @@ msgid "No ammo staged"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:54
-#: lib/cannery_web/live/range_live/index.html.heex:31
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:58
+#: lib/cannery_web/live/range_live/index.html.heex:33
 msgid "Stage for range"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:54
-#: lib/cannery_web/live/range_live/index.html.heex:31
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:57
+#: lib/cannery_web/live/range_live/index.html.heex:32
 msgid "Unstage from range"
 msgstr ""
 
@@ -620,7 +620,7 @@ msgid "New Shot Records"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.html.heex:46
+#: lib/cannery_web/live/range_live/index.html.heex:48
 msgid "No shots recorded"
 msgstr ""
 
@@ -630,7 +630,7 @@ msgid "Rounds left"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.html.heex:62
+#: lib/cannery_web/live/range_live/index.html.heex:64
 msgid "Rounds shot"
 msgstr ""
 
@@ -656,7 +656,7 @@ msgid "No other containers"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.html.heex:51
+#: lib/cannery_web/live/range_live/index.html.heex:53
 msgid "Shot log"
 msgstr ""
 
@@ -664,76 +664,76 @@ msgstr ""
 #: lib/cannery_web/components/ammo_group_card.ex:43
 #: lib/cannery_web/live/ammo_group_live/index.html.heex:64
 #: lib/cannery_web/live/ammo_group_live/show.html.heex:22
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:96
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:98
 msgid "$%{amount}"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:83
 msgid "Bimetal"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:72
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:78
 #: lib/cannery_web/live/ammo_type_live/index.ex:57
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:43
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:45
 msgid "Jacket type"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:87
 #: lib/cannery_web/live/ammo_type_live/index.ex:58
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:44
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:46
 msgid "Muzzle velocity"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:96
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:106
 #: lib/cannery_web/live/ammo_type_live/index.ex:60
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:46
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:48
 msgid "Powder grains per charge"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:89
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:97
 #: lib/cannery_web/live/ammo_type_live/index.ex:59
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:45
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:47
 msgid "Powder type"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:155
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:171
 #: lib/cannery_web/live/ammo_type_live/index.ex:70
 msgid "UPC"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:79
+#: lib/cannery_web/templates/user_settings/edit.html.heex:81
 msgid "Confirm new password"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/templates/user_settings/edit.html.heex:34
-#: lib/cannery_web/templates/user_settings/edit.html.heex:88
+#: lib/cannery_web/templates/user_settings/edit.html.heex:90
 msgid "Current password"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:72
+#: lib/cannery_web/templates/user_settings/edit.html.heex:74
 msgid "New password"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:80
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:82
 msgid "Stage"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:80
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:82
 msgid "Unstage"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:128
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:140
 msgid "Firing type"
 msgstr ""
diff --git a/priv/gettext/emails.pot b/priv/gettext/emails.pot
index b5444b9b..7d493416 100644
--- a/priv/gettext/emails.pot
+++ b/priv/gettext/emails.pot
@@ -45,7 +45,7 @@ msgid "Reset your %{name} password"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/layout/email.html.heex:13
+#: lib/cannery_web/templates/layout/email.html.heex:15
 msgid "This email was sent from %{name}"
 msgstr ""
 
diff --git a/priv/gettext/errors.pot b/priv/gettext/errors.pot
index 2f820259..a270ba9c 100644
--- a/priv/gettext/errors.pot
+++ b/priv/gettext/errors.pot
@@ -37,7 +37,7 @@ msgid "Error"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/error/error.html.heex:28
+#: lib/cannery_web/templates/error/error.html.heex:29
 msgid "Go back home"
 msgstr ""
 
@@ -60,7 +60,7 @@ msgstr ""
 #: lib/cannery_web/templates/user_registration/new.html.heex:17
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:17
 #: lib/cannery_web/templates/user_settings/edit.html.heex:23
-#: lib/cannery_web/templates/user_settings/edit.html.heex:65
+#: lib/cannery_web/templates/user_settings/edit.html.heex:67
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""
 
diff --git a/priv/gettext/prompts.pot b/priv/gettext/prompts.pot
index c89cea55..4f3fbf8a 100644
--- a/priv/gettext/prompts.pot
+++ b/priv/gettext/prompts.pot
@@ -78,13 +78,13 @@ msgid "Ammo group updated successfully"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:99
-#: lib/cannery_web/live/invite_live/index.html.heex:128
+#: lib/cannery_web/live/invite_live/index.html.heex:103
+#: lib/cannery_web/live/invite_live/index.html.heex:132
 msgid "Are you sure you want to delete %{email}? This action is permanent!"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:27
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:29
 #: lib/cannery_web/live/container_live/index.html.heex:38
 #: lib/cannery_web/live/container_live/show.html.heex:37
 #: lib/cannery_web/live/tag_live/index.html.heex:38
@@ -97,24 +97,24 @@ msgid "Are you sure you want to delete the invite for %{name}?"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/ammo_group_live/index.html.heex:118
-#: lib/cannery_web/live/ammo_group_live/show.html.heex:45
+#: lib/cannery_web/live/ammo_group_live/index.html.heex:120
+#: lib/cannery_web/live/ammo_group_live/show.html.heex:47
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:68
 msgid "Are you sure you want to delete this ammo?"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/templates/user_settings/edit.html.heex:109
+#: lib/cannery_web/templates/user_settings/edit.html.heex:113
 msgid "Are you sure you want to delete your account?"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/components/topbar.ex:85
+#: lib/cannery_web/components/topbar.ex:87
 msgid "Are you sure you want to log out?"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/invite_live/index.html.heex:74
+#: lib/cannery_web/live/invite_live/index.html.heex:75
 msgid "Are you sure you want to make %{name} unlimited?"
 msgstr ""
 
@@ -154,14 +154,14 @@ msgid "Please check your email to verify your account"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/home_live.ex:94
+#: lib/cannery_web/live/home_live.ex:97
 msgid "Register to setup %{name}"
 msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/cannery_web/components/add_shot_group_component.html.heex:44
 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:55
-#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:160
+#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:176
 #: lib/cannery_web/live/container_live/form_component.html.heex:52
 #: lib/cannery_web/live/invite_live/form_component.html.heex:30
 #: lib/cannery_web/live/range_live/form_component.html.heex:42
@@ -210,7 +210,7 @@ msgid "Ammo group unstaged succesfully"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/cannery_web/live/range_live/index.html.heex:106
+#: lib/cannery_web/live/range_live/index.html.heex:108
 msgid "Are you sure you want to delete this shot record?"
 msgstr ""