diff --git a/lib/lokal_web/templates/layout/app.html.heex b/lib/lokal_web/templates/layout/app.html.heex
index 3c8a34e..ec9a6b3 100644
--- a/lib/lokal_web/templates/layout/app.html.heex
+++ b/lib/lokal_web/templates/layout/app.html.heex
@@ -1,19 +1,17 @@
 <main class="m-0 p-0 w-full h-full">
   <header>
-    <.topbar current_user={assigns[:current_user]}></.topbar>
-
+    <.topbar current_user={assigns[:current_user]}>
+    </.topbar>
     <%= if get_flash(@conn, :info) do %>
       <p class="alert alert-info" role="alert">
         <%= get_flash(@conn, :info) %>
       </p>
     <% end %>
-
     <%= if get_flash(@conn, :error) do %>
       <p class="alert alert-danger" role="alert">
         <%= get_flash(@conn, :error) %>
       </p>
     <% end %>
   </header>
-
   <%= @inner_content %>
 </main>
diff --git a/lib/lokal_web/templates/layout/live.html.heex b/lib/lokal_web/templates/layout/live.html.heex
index f99debf..77cb1b0 100644
--- a/lib/lokal_web/templates/layout/live.html.heex
+++ b/lib/lokal_web/templates/layout/live.html.heex
@@ -1,19 +1,17 @@
 <main class="m-0 p-0 w-full h-full">
   <header>
-    <.topbar current_user={assigns[:current_user]}></.topbar>
-
+    <.topbar current_user={assigns[:current_user]}>
+    </.topbar>
     <%= if @flash && @flash |> Map.has_key?(:info) do %>
       <p class="alert alert-info" role="alert" phx-click="lv:clear-flash" phx-value-key="info">
         <%= live_flash(@flash, :info) %>
       </p>
     <% 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">
         <%= live_flash(@flash, :error) %>
       </p>
     <% end %>
   </header>
-
   <%= @inner_content %>
 </main>
diff --git a/lib/lokal_web/templates/user_confirmation/new.html.heex b/lib/lokal_web/templates/user_confirmation/new.html.heex
index 4d71f6c..2a579c6 100644
--- a/lib/lokal_web/templates/user_confirmation/new.html.heex
+++ b/lib/lokal_web/templates/user_confirmation/new.html.heex
@@ -2,23 +2,25 @@
   <h1 class="title text-primary-500 text-xl">
     Resend confirmation instructions
   </h1>
-
-  <%= form_for :user, Routes.user_confirmation_path(@conn, :create),
-    [class: "flex flex-col justify-center items-center space-y-4"], fn f -> %>
+  <%= form_for :user,
+           Routes.user_confirmation_path(@conn, :create),
+           [class: "flex flex-col justify-center items-center space-y-4"],
+           fn f -> %>
     <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
-      <%= label f, :email, class: "title text-lg text-primary-500" %>
-      <%= email_input f, :email, required: true, class: "input input-primary col-span-2" %>
+      <%= label(f, :email, class: "title text-lg text-primary-500") %>
+      <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
     </div>
-
-    <%= submit "Resend confirmation instructions", class: "btn btn-primary" %>
-    
+    <%= submit("Resend confirmation instructions", class: "btn btn-primary") %>
     <hr class="hr">
-    
-    <div class="flex flex-row justify-center items-center space-x-4">
-      <%= link "Register", to: Routes.user_registration_path(@conn, :new),
-        class: "btn btn-primary" %>
-      <%= link "Log in", to: Routes.user_session_path(@conn, :new),
-        class: "btn btn-primary" %>
-    </div>
-  <% end %>
-</div>
\ No newline at end of file
+      <div class="flex flex-row justify-center items-center space-x-4">
+        <%= link("Register",
+          to: Routes.user_registration_path(@conn, :new),
+          class: "btn btn-primary"
+        ) %>
+        <%= link("Log in",
+          to: Routes.user_session_path(@conn, :new),
+          class: "btn btn-primary"
+        ) %>
+      </div>
+    <% end %>
+  </div>
diff --git a/lib/lokal_web/templates/user_registration/new.html.heex b/lib/lokal_web/templates/user_registration/new.html.heex
index efd16e0..71f4aaf 100644
--- a/lib/lokal_web/templates/user_registration/new.html.heex
+++ b/lib/lokal_web/templates/user_registration/new.html.heex
@@ -2,36 +2,36 @@
   <h1 class="title text-primary-500 text-xl">
     Register
   </h1>
-
-  <%= form_for @changeset, Routes.user_registration_path(@conn, :create),
-    [class: "flex flex-col justify-center items-center space-y-4"], fn f -> %>
-    <%= if @changeset.action && not(@changeset.valid?) do %>
+  <%= form_for @changeset,
+           Routes.user_registration_path(@conn, :create),
+           [class: "flex flex-col justify-center items-center space-y-4"],
+           fn f -> %>
+    <%= if @changeset.action && not @changeset.valid? do %>
       <div class="alert alert-danger">
         <p>Oops, something went wrong! Please check the errors below.</p>
       </div>
     <% end %>
-
     <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
-      <%= label f, :email, class: "title text-lg text-primary-500" %>
-      <%= email_input f, :email, required: true, class: "input input-primary col-span-2" %>
+      <%= label(f, :email, class: "title text-lg text-primary-500") %>
+      <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
     </div>
-    <%= error_tag f, :email %>
-
+    <%= error_tag(f, :email) %>
     <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
-      <%= label f, :password, class: "title text-lg text-primary-500" %>
-      <%= password_input f, :password, required: true, class: "input input-primary col-span-2" %>
+      <%= label(f, :password, class: "title text-lg text-primary-500") %>
+      <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
     </div>
-    <%= error_tag f, :password %>
-
-    <%= submit "Register", class: "btn btn-primary" %>
-
+    <%= error_tag(f, :password) %>
+    <%= submit("Register", class: "btn btn-primary") %>
     <hr class="hr">
-
-    <div class="flex flex-row justify-center items-center space-x-4">
-      <%= link "Log in", to: Routes.user_session_path(@conn, :new),
-        class: "btn btn-primary" %>
-      <%= link "Forgot your password?", to: Routes.user_reset_password_path(@conn, :new),
-        class: "btn btn-primary" %>
-    </div>
-  <% end %>
-</div>
+      <div class="flex flex-row justify-center items-center space-x-4">
+        <%= link("Log in",
+          to: Routes.user_session_path(@conn, :new),
+          class: "btn btn-primary"
+        ) %>
+        <%= link("Forgot your password?",
+          to: Routes.user_reset_password_path(@conn, :new),
+          class: "btn btn-primary"
+        ) %>
+      </div>
+    <% end %>
+  </div>
diff --git a/lib/lokal_web/templates/user_reset_password/edit.html.heex b/lib/lokal_web/templates/user_reset_password/edit.html.heex
index 7d1c570..cbe8d91 100644
--- a/lib/lokal_web/templates/user_reset_password/edit.html.heex
+++ b/lib/lokal_web/templates/user_reset_password/edit.html.heex
@@ -2,36 +2,36 @@
   <h1 class="title text-primary-500 text-xl">
     Reset password
   </h1>
-
-  <%= form_for @changeset, Routes.user_reset_password_path(@conn, :update, @token),
-    [class: "flex flex-col justify-center items-center space-y-4"], fn f -> %>
-    <%= if @changeset.action && not(@changeset.valid?) do %>
+  <%= form_for @changeset,
+           Routes.user_reset_password_path(@conn, :update, @token),
+           [class: "flex flex-col justify-center items-center space-y-4"],
+           fn f -> %>
+    <%= if @changeset.action && not @changeset.valid? do %>
       <div class="alert alert-danger">
         <p>Oops, something went wrong! Please check the errors below.</p>
       </div>
     <% end %>
-
     <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
-      <%= label f, :password, "New password", class: "title text-lg text-primary-500" %>
-      <%= password_input f, :password, required: true, class: "input input-primary col-span-2" %>
+      <%= label(f, :password, "New password", class: "title text-lg text-primary-500") %>
+      <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
     </div>
-    <%= error_tag f, :password %>
-
+    <%= error_tag(f, :password) %>
     <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
-      <%= 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") %>
     </div>
-    <%= error_tag f, :password_confirmation %>
-
-    <%= submit "Reset password", class: "btn btn-primary" %>
-
+    <%= error_tag(f, :password_confirmation) %>
+    <%= submit("Reset password", class: "btn btn-primary") %>
     <hr class="hr">
-
-    <div class="flex flex-row justify-center items-center space-x-4">
-      <%= link "Register", to: Routes.user_registration_path(@conn, :new),
-        class: "btn btn-primary" %>
-      <%= link "Log in", to: Routes.user_session_path(@conn, :new),
-        class: "btn btn-primary" %>
-    </div>
-  <% end %>
-</div>
+      <div class="flex flex-row justify-center items-center space-x-4">
+        <%= link("Register",
+          to: Routes.user_registration_path(@conn, :new),
+          class: "btn btn-primary"
+        ) %>
+        <%= link("Log in",
+          to: Routes.user_session_path(@conn, :new),
+          class: "btn btn-primary"
+        ) %>
+      </div>
+    <% end %>
+  </div>
diff --git a/lib/lokal_web/templates/user_reset_password/new.html.heex b/lib/lokal_web/templates/user_reset_password/new.html.heex
index 731ba7d..a82c7d5 100644
--- a/lib/lokal_web/templates/user_reset_password/new.html.heex
+++ b/lib/lokal_web/templates/user_reset_password/new.html.heex
@@ -2,24 +2,25 @@
   <h1 class="title text-primary-500 text-xl">
     Forgot your password?
   </h1>
-
-  <%= form_for :user, Routes.user_reset_password_path(@conn, :create),
-    [class: "flex flex-col justify-center items-center space-y-4"], fn f -> %>
-    
+  <%= form_for :user,
+           Routes.user_reset_password_path(@conn, :create),
+           [class: "flex flex-col justify-center items-center space-y-4"],
+           fn f -> %>
     <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
-      <%= label f, :email, class: "title text-lg text-primary-500" %>
-      <%= email_input f, :email, required: true, class: "input input-primary col-span-2" %>
+      <%= label(f, :email, class: "title text-lg text-primary-500") %>
+      <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
     </div>
-
-    <%= submit "Send instructions to reset password", class: "btn btn-primary" %>
-    
+    <%= submit("Send instructions to reset password", class: "btn btn-primary") %>
     <hr class="hr">
-    
-    <div class="flex flex-row justify-center items-center space-x-4">
-      <%= link "Register", to: Routes.user_registration_path(@conn, :new),
-        class: "btn btn-primary" %>
-      <%= link "Log in", to: Routes.user_session_path(@conn, :new),
-        class: "btn btn-primary" %>
-    </div>
-  <% end %>
-</div>
\ No newline at end of file
+      <div class="flex flex-row justify-center items-center space-x-4">
+        <%= link("Register",
+          to: Routes.user_registration_path(@conn, :new),
+          class: "btn btn-primary"
+        ) %>
+        <%= link("Log in",
+          to: Routes.user_session_path(@conn, :new),
+          class: "btn btn-primary"
+        ) %>
+      </div>
+    <% end %>
+  </div>
diff --git a/lib/lokal_web/templates/user_session/new.html.heex b/lib/lokal_web/templates/user_session/new.html.heex
index 33b5ba0..6edc948 100644
--- a/lib/lokal_web/templates/user_session/new.html.heex
+++ b/lib/lokal_web/templates/user_session/new.html.heex
@@ -2,40 +2,40 @@
   <h1 class="title text-primary-500 text-xl">
     Log in
   </h1>
-
-  <%= form_for @conn, Routes.user_session_path(@conn, :create), [as: :user,
-    class: "flex flex-col justify-center items-center space-y-4"], fn f -> %>
+  <%= form_for @conn,
+           Routes.user_session_path(@conn, :create),
+           [as: :user, class: "flex flex-col justify-center items-center space-y-4"],
+           fn f -> %>
     <%= if @error_message do %>
       <div class="alert alert-danger">
-        <p><%= @error_message %></p>
+        <p>
+          <%= @error_message %>
+        </p>
       </div>
     <% end %>
-
     <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
-      <%= label f, :email, class: "title text-lg text-primary-500" %>
-      <%= email_input f, :email, required: true, class: "input input-primary col-span-2" %>
+      <%= label(f, :email, class: "title text-lg text-primary-500") %>
+      <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
     </div>
-
     <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
-      <%= label f, :password, class: "title text-lg text-primary-500" %>
-      <%= password_input f, :password, required: true, class: "input input-primary col-span-2" %>
+      <%= label(f, :password, class: "title text-lg text-primary-500") %>
+      <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
     </div>
-
     <div class="flex flex-row justify-center items-center text-center space-x-4">
-      <%= label f, :remember_me, "Keep me logged in for 60 days",
-        class: "title text-lg text-primary-500" %>
-      <%= checkbox f, :remember_me, class: "checkbox" %>
+      <%= label(f, :remember_me, "Keep me logged in for 60 days", class: "title text-lg text-primary-500") %>
+      <%= checkbox(f, :remember_me, class: "checkbox") %>
     </div>
-
-    <%= submit "Log in", class: "btn btn-primary" %>
-    
+    <%= submit("Log in", class: "btn btn-primary") %>
     <hr class="hr">
-    
-    <div class="flex flex-row justify-center items-center space-x-4">
-      <%= link "Register", to: Routes.user_registration_path(@conn, :new),
-        class: "btn btn-primary" %>
-      <%= link "Forgot your password?", to: Routes.user_reset_password_path(@conn, :new),
-        class: "btn btn-primary" %>
-    </div>
-  <% end %>
-</div>
\ No newline at end of file
+      <div class="flex flex-row justify-center items-center space-x-4">
+        <%= link("Register",
+          to: Routes.user_registration_path(@conn, :new),
+          class: "btn btn-primary"
+        ) %>
+        <%= link("Forgot your password?",
+          to: Routes.user_reset_password_path(@conn, :new),
+          class: "btn btn-primary"
+        ) %>
+      </div>
+    <% end %>
+  </div>
diff --git a/lib/lokal_web/templates/user_settings/edit.html.heex b/lib/lokal_web/templates/user_settings/edit.html.heex
index c01db3a..6bd12cb 100644
--- a/lib/lokal_web/templates/user_settings/edit.html.heex
+++ b/lib/lokal_web/templates/user_settings/edit.html.heex
@@ -2,84 +2,81 @@
   <h1 class="title text-primary-500 text-xl">
     Settings
   </h1>
-
   <h3 class="title text-primary-500 text-lg">
     Change email
   </h3>
-
-  <%= form_for @email_changeset, Routes.user_settings_path(@conn, :update),
-    [class: "flex flex-col justify-center items-center space-y-4"], fn f -> %>
+  <%= form_for @email_changeset,
+           Routes.user_settings_path(@conn, :update),
+           [class: "flex flex-col justify-center items-center space-y-4"],
+           fn f -> %>
     <%= if @email_changeset.action do %>
       <div class="alert alert-danger">
         <p>Oops, something went wrong! Please check the errors below.</p>
       </div>
     <% end %>
-
-    <%= hidden_input f, :action, name: "action", value: "update_email" %>
-
+    <%= hidden_input(f, :action, name: "action", value: "update_email") %>
     <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
-      <%= label f, :email, class: "title text-lg text-primary-500" %>
-      <%= email_input f, :email, required: true, class: "input input-primary col-span-2" %>
+      <%= label(f, :email, class: "title text-lg text-primary-500") %>
+      <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
     </div>
-    <%= error_tag f, :email %>
-    
+    <%= error_tag(f, :email) %>
     <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
-      <%= label f, :current_password, for: "current_password_for_email", class: "title text-lg text-primary-500" %>
-      <%= password_input f, :current_password,
+      <%= label(f, :current_password,
+        for: "current_password_for_email",
+        class: "title text-lg text-primary-500"
+      ) %>
+      <%= password_input(f, :current_password,
         required: true,
         name: "current_password",
         id: "current_password_for_email",
-        class: "input input-primary col-span-2" %>
+        class: "input input-primary col-span-2"
+      ) %>
     </div>
-    <%= error_tag f, :current_password %>
-
-    <%= submit "Change email", class: "btn btn-primary" %>
+    <%= error_tag(f, :current_password) %>
+    <%= submit("Change email", class: "btn btn-primary") %>
   <% end %>
-
   <h3 class="title text-primary-500 text-lg">
     Change password
   </h3>
-
-  <%= form_for @password_changeset, Routes.user_settings_path(@conn, :update),
-    [class: "flex flex-col justify-center items-center space-y-4"], fn f -> %>
+  <%= form_for @password_changeset,
+           Routes.user_settings_path(@conn, :update),
+           [class: "flex flex-col justify-center items-center space-y-4"],
+           fn f -> %>
     <%= if @password_changeset.action do %>
       <div class="alert alert-danger">
         <p>Oops, something went wrong! Please check the errors below.</p>
       </div>
     <% end %>
-
-    <%= hidden_input f, :action, name: "action", value: "update_password" %>
-
+    <%= hidden_input(f, :action, name: "action", value: "update_password") %>
     <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
-      <%= label f, :password, "New password",
-        class: "title text-lg text-primary-500" %>
-      <%= password_input f, :password,
+      <%= label(f, :password, "New password", class: "title text-lg text-primary-500") %>
+      <%= password_input(f, :password,
         required: true,
-        class: "input input-primary col-span-2" %>
+        class: "input input-primary col-span-2"
+      ) %>
     </div>
-    <%= error_tag f, :password %>
-    
+    <%= error_tag(f, :password) %>
     <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
-      <%= label f, :password_confirmation, "Confirm new password",
-        class: "title text-lg text-primary-500" %>
-      <%= password_input f, :password_confirmation,
+      <%= 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" %>
+        class: "input input-primary col-span-2"
+      ) %>
     </div>
-    <%= error_tag f, :password_confirmation %>
-    
+    <%= error_tag(f, :password_confirmation) %>
     <div class="grid grid-cols-3 justify-center items-center text-center space-x-4">
-      <%= label f, :current_password,
+      <%= label(f, :current_password,
         for: "current_password_for_password",
-        class: "title text-lg text-primary-500" %>
-      <%= password_input f, :current_password,
+        class: "title text-lg text-primary-500"
+      ) %>
+      <%= password_input(f, :current_password,
         required: true,
         name: "current_password",
         id: "current_password_for_password",
-        class: "input input-primary col-span-2" %>
+        class: "input input-primary col-span-2"
+      ) %>
     </div>
-    <%= error_tag f, :current_password %>
-
-    <%= submit "Change password", class: "btn btn-primary" %>
+    <%= error_tag(f, :current_password) %>
+    <%= submit("Change password", class: "btn btn-primary") %>
   <% end %>
-</div>
\ No newline at end of file
+</div>