diff --git a/.formatter.exs b/.formatter.exs
index 8a6391c..ef8840c 100644
--- a/.formatter.exs
+++ b/.formatter.exs
@@ -1,5 +1,6 @@
 [
-  import_deps: [:ecto, :phoenix],
-  inputs: ["*.{ex,exs}", "priv/*/seeds.exs", "{config,lib,test}/**/*.{ex,exs}"],
-  subdirectories: ["priv/*/migrations"]
+  import_deps: [:ecto, :ecto_sql, :phoenix],
+  subdirectories: ["priv/*/migrations"],
+  plugins: [Phoenix.LiveView.HTMLFormatter],
+  inputs: ["*.{heex,ex,exs}", "{config,lib,test}/**/*.{heex,ex,exs}", "priv/*/seeds.exs"]
 ]
diff --git a/assets/css/app.css b/assets/css/app.css
index 427b683..6b900c4 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -223,7 +223,6 @@
 
 .alert {
   padding: 15px;
-  margin-bottom: 20px;
   border: 1px solid transparent;
   border-radius: 4px;
 }
@@ -260,7 +259,6 @@
 /* Alerts and form errors used by phx.new */
 .alert {
   padding: 15px;
-  margin-bottom: 20px;
   border: 1px solid transparent;
   border-radius: 4px;
 }
diff --git a/config/config.exs b/config/config.exs
index 7d9ed28..6142657 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -17,8 +17,9 @@ config :fitness, FitnessWeb.Endpoint,
   pubsub_server: Fitness.PubSub,
   live_view: [signing_salt: "vOF6D4CD"]
 
-
-  config :tailwind, version: "3.3.1", default: [
+config :tailwind,
+  version: "3.3.1",
+  default: [
     args: ~w(
       --config=tailwind.config.js
       --input=css/app.css
@@ -27,7 +28,7 @@ config :fitness, FitnessWeb.Endpoint,
     cd: Path.expand("../assets", __DIR__)
   ]
 
-  config :chartkick, json_serializer: Jason
+config :chartkick, json_serializer: Jason
 
 # Configures the mailer
 #
diff --git a/config/test.exs b/config/test.exs
index ed881aa..d00970b 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -27,7 +27,7 @@ config :fitness, FitnessWeb.Endpoint,
 config :fitness, Fitness.Mailer, adapter: Swoosh.Adapters.Test
 
 # Print only warnings and errors during test
-config :logger, level: :warn
+config :logger, level: :warning
 
 # Initialize plugs at runtime for faster test compilation
 config :phoenix, :plug_init_mode, :runtime
diff --git a/lib/fitness/accounts.ex b/lib/fitness/accounts.ex
index 769a869..07de7c1 100644
--- a/lib/fitness/accounts.ex
+++ b/lib/fitness/accounts.ex
@@ -8,7 +8,6 @@ defmodule Fitness.Accounts do
 
   alias Fitness.Accounts.{User, UserToken, UserNotifier}
 
-
   def is_admin?(user) do
     user.is_admin
   end
@@ -16,6 +15,7 @@ defmodule Fitness.Accounts do
   def list_of_users do
     Repo.all(User)
   end
+
   ## Database getters
 
   @doc """
diff --git a/lib/fitness/accounts/services/chart_data.ex b/lib/fitness/accounts/services/chart_data.ex
index 3a16c3b..7797d1f 100644
--- a/lib/fitness/accounts/services/chart_data.ex
+++ b/lib/fitness/accounts/services/chart_data.ex
@@ -1,5 +1,4 @@
 defmodule Fitness.Accounts.Services.ChartData do
-
   alias Fitness.WorkoutTemplates
 
   def all_complete_workout_chart_data(current_user_id) do
diff --git a/lib/fitness/accounts/services/player_scores.ex b/lib/fitness/accounts/services/player_scores.ex
index 8fb3510..76def8f 100644
--- a/lib/fitness/accounts/services/player_scores.ex
+++ b/lib/fitness/accounts/services/player_scores.ex
@@ -3,16 +3,19 @@ defmodule Fitness.Accounts.Services.PlayerScores do
   alias Fitness.WorkoutTemplates
 
   def update_new_player_score_and_broadcast_score_board(current_user, workout_templates) do
-
     list_of_workout_template_is_finish_and_is_belong_to_user =
-      Enum.filter(workout_templates, fn each -> each.is_finished == true and each.user_id == current_user.id end)
+      Enum.filter(workout_templates, fn each ->
+        each.is_finished == true and each.user_id == current_user.id
+      end)
 
     total_workout_template_score =
       Enum.reduce(list_of_workout_template_is_finish_and_is_belong_to_user, 0, fn each, acc ->
         acc + each.workout_template_score
       end)
 
-    Accounts.update_user_player_score(current_user, %{"player_score" => "#{total_workout_template_score}"})
+    Accounts.update_user_player_score(current_user, %{
+      "player_score" => "#{total_workout_template_score}"
+    })
 
     update_users = Accounts.list_of_users()
     update_workout_template = WorkoutTemplates.list_workout_templates()
@@ -23,8 +26,16 @@ defmodule Fitness.Accounts.Services.PlayerScores do
     end)
   end
 
-  defp broadcast_score_board(updated_users, update_workout_template, updated_player_score, user_id) do
-    Phoenix.PubSub.broadcast(Fitness.PubSub, "score_board",
-      {:update_users, {updated_users, update_workout_template, updated_player_score, user_id}})
+  defp broadcast_score_board(
+         updated_users,
+         update_workout_template,
+         updated_player_score,
+         user_id
+       ) do
+    Phoenix.PubSub.broadcast(
+      Fitness.PubSub,
+      "score_board",
+      {:update_users, {updated_users, update_workout_template, updated_player_score, user_id}}
+    )
   end
 end
diff --git a/lib/fitness/accounts/user.ex b/lib/fitness/accounts/user.ex
index a6dee61..5670b22 100644
--- a/lib/fitness/accounts/user.ex
+++ b/lib/fitness/accounts/user.ex
@@ -55,7 +55,10 @@ defmodule Fitness.Accounts.User do
   defp validate_username(changeset) do
     changeset
     |> validate_required([:username])
-    |> validate_format(:username, ~r/^[a-zA-Z0-9!#$_:+-?]+$/, message: "A username should consist of both letters and numbers, and should not contain any spaces")
+    |> validate_format(:username, ~r/^[a-zA-Z0-9!#$_:+-?]+$/,
+      message:
+        "A username should consist of both letters and numbers, and should not contain any spaces"
+    )
     |> validate_length(:username, min: 5, max: 40)
     |> unsafe_validate_unique(:username, Fitness.Repo)
     |> unique_constraint(:username)
@@ -64,7 +67,10 @@ defmodule Fitness.Accounts.User do
   defp validate_name(changeset) do
     changeset
     |> validate_required([:name])
-    |> validate_format(:name, ~r/\A[a-zA-Z ]+\z/, message: "A name must be made up of only letters and should not include any symbols or numbers.")
+    |> validate_format(:name, ~r/\A[a-zA-Z ]+\z/,
+      message:
+        "A name must be made up of only letters and should not include any symbols or numbers."
+    )
     |> validate_length(:name, max: 40)
   end
 
@@ -109,7 +115,6 @@ defmodule Fitness.Accounts.User do
   end
 
   def name_changeset(user, attrs) do
-
     user
     |> cast(attrs, [:name])
     |> validate_name()
@@ -126,11 +131,9 @@ defmodule Fitness.Accounts.User do
       %{changes: %{image: _}} = changeset -> changeset
       %{} = changeset -> add_error(changeset, :image, "did not change")
     end
-
   end
 
   def player_score_changeset(user, attrs) do
-
     user
     |> cast(attrs, [:player_score])
     |> case do
diff --git a/lib/fitness/exercises.ex b/lib/fitness/exercises.ex
index ff3602a..46b0c27 100644
--- a/lib/fitness/exercises.ex
+++ b/lib/fitness/exercises.ex
@@ -19,8 +19,8 @@ defmodule Fitness.Exercises do
 
   """
   def list_exercises(search_query) do
-  exercises = Repo.all(Exercise)
-  SearchTerm.filter_by_search_term(exercises, search_query)
+    exercises = Repo.all(Exercise)
+    SearchTerm.filter_by_search_term(exercises, search_query)
   end
 
   def list_exercises do
diff --git a/lib/fitness/exercises/finder/search_term.ex b/lib/fitness/exercises/finder/search_term.ex
index 7d3dc40..7d62dc3 100644
--- a/lib/fitness/exercises/finder/search_term.ex
+++ b/lib/fitness/exercises/finder/search_term.ex
@@ -1,8 +1,5 @@
 defmodule Fitness.Exercises.Finder.SearchTerm do
-
   def filter_by_search_term(exercises, search_query) do
-
-
     found_search_query =
       case search_query do
         "" ->
@@ -31,5 +28,4 @@ defmodule Fitness.Exercises.Finder.SearchTerm do
 
     found_search_query
   end
-
 end
diff --git a/lib/fitness/workout_templates.ex b/lib/fitness/workout_templates.ex
index 54277e7..4615ed6 100644
--- a/lib/fitness/workout_templates.ex
+++ b/lib/fitness/workout_templates.ex
@@ -38,14 +38,13 @@ defmodule Fitness.WorkoutTemplates do
   """
   def get_workout_template!(id) do
     Repo.get!(WorkoutTemplate, id)
-    |> Repo.preload(workout_items: from(w in WorkoutItem, order_by: w.id))
+    |> Repo.preload(:workout_items)
   end
 
   def get_workout_item!(id) do
     Repo.get!(WorkoutItem, id)
   end
 
-
   @doc """
   Creates a workout_template.
 
diff --git a/lib/fitness/workout_templates/services/workout_item_logic.ex b/lib/fitness/workout_templates/services/workout_item_logic.ex
index fb59e98..f1f9e03 100644
--- a/lib/fitness/workout_templates/services/workout_item_logic.ex
+++ b/lib/fitness/workout_templates/services/workout_item_logic.ex
@@ -1,10 +1,8 @@
 defmodule Fitness.WorkoutTemplates.Services.WorkoutItemLogic do
   alias Fitness.WorkoutTemplates
 
-
   # calculate single workout template score
   def update_workout_template_score(workout_template) do
-
     list_of_complete_workout_items =
       Enum.filter(workout_template.workout_items, fn each ->
         each.check_box == true
@@ -13,21 +11,21 @@ defmodule Fitness.WorkoutTemplates.Services.WorkoutItemLogic do
     if length(list_of_complete_workout_items) == length(workout_template.workout_items) do
       total_score = Enum.reduce(list_of_complete_workout_items, 0, fn _each, acc -> acc + 20 end)
 
-        WorkoutTemplates.update_workout_template(workout_template, %{
-          "workout_template_score" => "#{total_score + 50}",
-          "is_finished" => "true"
-        })
+      WorkoutTemplates.update_workout_template(workout_template, %{
+        "workout_template_score" => "#{total_score + 50}",
+        "is_finished" => "true"
+      })
 
-        true
+      true
     else
       total_score = Enum.reduce(list_of_complete_workout_items, 0, fn _each, acc -> acc + 20 end)
 
-        WorkoutTemplates.update_workout_template(workout_template, %{
-          "workout_template_score" => "#{total_score}",
-          "is_finished" => "true"
-        })
+      WorkoutTemplates.update_workout_template(workout_template, %{
+        "workout_template_score" => "#{total_score}",
+        "is_finished" => "true"
+      })
 
-        false
+      false
     end
   end
 
diff --git a/lib/fitness/workout_templates/workout_item.ex b/lib/fitness/workout_templates/workout_item.ex
index acfc15d..82d6118 100644
--- a/lib/fitness/workout_templates/workout_item.ex
+++ b/lib/fitness/workout_templates/workout_item.ex
@@ -17,7 +17,15 @@ defmodule Fitness.WorkoutTemplates.WorkoutItem do
   @doc false
   def changeset(workout, attrs) do
     workout
-    |> cast(attrs, [:sets, :weight, :weight_unit, :check_box, :reps, :exercise_id, :workout_template_id])
+    |> cast(attrs, [
+      :sets,
+      :weight,
+      :weight_unit,
+      :check_box,
+      :reps,
+      :exercise_id,
+      :workout_template_id
+    ])
     |> validate_required([:sets, :weight, :weight_unit, :reps, :workout_template_id, :exercise_id])
   end
 end
diff --git a/lib/fitness_web.ex b/lib/fitness_web.ex
index 2b5e20c..d1de340 100644
--- a/lib/fitness_web.ex
+++ b/lib/fitness_web.ex
@@ -17,6 +17,8 @@ defmodule FitnessWeb do
   and import those modules here.
   """
 
+  def static_paths, do: ~w(assets fonts images videos favicon.ico robots.txt)
+
   def controller do
     quote do
       use Phoenix.Controller, namespace: FitnessWeb
@@ -24,6 +26,8 @@ defmodule FitnessWeb do
       import Plug.Conn
       import FitnessWeb.Gettext
       alias FitnessWeb.Router.Helpers, as: Routes
+
+      unquote(verified_routes())
     end
   end
 
@@ -45,7 +49,7 @@ defmodule FitnessWeb do
   def live_view do
     quote do
       use Phoenix.LiveView,
-        layout: {FitnessWeb.LayoutView, "live.html"}
+        layout: {FitnessWeb.LayoutView, :live}
 
       unquote(view_helpers())
     end
@@ -90,7 +94,8 @@ defmodule FitnessWeb do
       use Phoenix.HTML
 
       # Import LiveView and .heex helpers (live_render, live_patch, <.form>, etc)
-      import Phoenix.LiveView.Helpers
+
+      import Phoenix.Component
       import FitnessWeb.LiveHelpers
 
       # Import basic rendering functionality (render, render_layout, etc)
@@ -99,6 +104,16 @@ defmodule FitnessWeb do
       import FitnessWeb.ErrorHelpers
       import FitnessWeb.Gettext
       alias FitnessWeb.Router.Helpers, as: Routes
+      unquote(verified_routes())
+    end
+  end
+
+  def verified_routes do
+    quote do
+      use Phoenix.VerifiedRoutes,
+        endpoint: FitnessWeb.Endpoint,
+        router: FitnessWeb.Router,
+        statics: FitnessWeb.static_paths()
     end
   end
 
diff --git a/lib/fitness_web/controllers/user_session_controller.ex b/lib/fitness_web/controllers/user_session_controller.ex
index 6f6e159..7afae3b 100644
--- a/lib/fitness_web/controllers/user_session_controller.ex
+++ b/lib/fitness_web/controllers/user_session_controller.ex
@@ -12,7 +12,6 @@ defmodule FitnessWeb.UserSessionController do
     %{"email" => email, "password" => password} = user_params
 
     if user = Accounts.get_user_by_email_and_password(email, password) do
-
       conn
       |> UserAuth.log_in_user(user, user_params)
     else
diff --git a/lib/fitness_web/endpoint.ex b/lib/fitness_web/endpoint.ex
index 14b19c1..e1a44aa 100644
--- a/lib/fitness_web/endpoint.ex
+++ b/lib/fitness_web/endpoint.ex
@@ -20,7 +20,7 @@ defmodule FitnessWeb.Endpoint do
     at: "/",
     from: :fitness,
     gzip: false,
-    only: ~w(assets fonts images favicon.ico robots.txt)
+    only: FitnessWeb.static_paths()
 
   # Code reloading can be explicitly enabled under the
   # :code_reloader configuration of your endpoint.
diff --git a/lib/fitness_web/live/exercise_live/form_component.ex b/lib/fitness_web/live/exercise_live/form_component.ex
index baa8355..de065f3 100644
--- a/lib/fitness_web/live/exercise_live/form_component.ex
+++ b/lib/fitness_web/live/exercise_live/form_component.ex
@@ -33,7 +33,7 @@ defmodule FitnessWeb.ExerciseLive.FormComponent do
         {:noreply,
          socket
          |> put_flash(:info, "Exercise updated successfully")
-         |> push_redirect(to: socket.assigns.return_to)}
+         |> push_navigate(to: socket.assigns.return_to)}
 
       {:error, %Ecto.Changeset{} = changeset} ->
         {:noreply, assign(socket, :changeset, changeset)}
@@ -46,7 +46,7 @@ defmodule FitnessWeb.ExerciseLive.FormComponent do
         {:noreply,
          socket
          |> put_flash(:info, "Exercise created successfully")
-         |> push_redirect(to: socket.assigns.return_to)}
+         |> push_navigate(to: socket.assigns.return_to)}
 
       {:error, %Ecto.Changeset{} = changeset} ->
         {:noreply, assign(socket, changeset: changeset)}
diff --git a/lib/fitness_web/live/exercise_live/form_component.html.heex b/lib/fitness_web/live/exercise_live/form_component.html.heex
index beee999..b4f4fc5 100644
--- a/lib/fitness_web/live/exercise_live/form_component.html.heex
+++ b/lib/fitness_web/live/exercise_live/form_component.html.heex
@@ -1,63 +1,100 @@
-
-
-
 <div class="max-w-2xl px-4 py-8 mx-auto space-y-4">
-  <h2 class="flex justify-center mb-4 text-4xl font-bold text-gray-700 pb-14 font-poppins"><%= @title %></h2>
+  <h2 class="flex justify-center mb-4 text-4xl font-bold text-gray-700 pb-14 font-poppins">
+    <%= @title %>
+  </h2>
 
   <.form
-    let={f}
+    :let={f}
     for={@changeset}
     id="exercise-form"
     phx-target={@myself}
     phx-change="validate"
-    phx-submit="save">
-
+    phx-submit="save"
+  >
     <div class="grid grid-cols-1 gap-4">
       <div class="flex flex-col">
-        <%= label f, :name, class: "font-semibold mb-1 text-gray-700" %>
-        <%= text_input f, :name, class: "rounded-lg border-gray-300 px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-400" %>
-        <%= error_tag f, :name %>
+        <%= label(f, :name, class: "font-semibold mb-1 text-gray-700") %>
+        <%= text_input(f, :name,
+          class:
+            "rounded-lg border-gray-300 px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-400"
+        ) %>
+        <%= error_tag(f, :name) %>
       </div>
 
       <div class="flex flex-col">
-        <%= label f, :body_part, class: "font-semibold mb-1 text-gray-700" %>
-        <%= select f, :body_part, ["Others","chest","back", "legs", "arms","Abdominals", "Shoulders", "Glutes", "Triceps", "Hamstrings"], class: "rounded-lg border-gray-300 px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-400" %>
-        <%= error_tag f, :body_part %>
+        <%= label(f, :body_part, class: "font-semibold mb-1 text-gray-700") %>
+        <%= select(
+          f,
+          :body_part,
+          [
+            "Others",
+            "chest",
+            "back",
+            "legs",
+            "arms",
+            "Abdominals",
+            "Shoulders",
+            "Glutes",
+            "Triceps",
+            "Hamstrings"
+          ],
+          class:
+            "rounded-lg border-gray-300 px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-400"
+        ) %>
+        <%= error_tag(f, :body_part) %>
       </div>
 
       <div class="flex flex-col">
-        <%= label f, :equipment, class: "font-semibold mb-1 text-gray-700" %>
-        <%= select f, :equipment, ["Others", "Machine", "Barbell", "Dumbbell", "Body Only"], class: "rounded-lg border-gray-300 px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-400" %>
-        <%= error_tag f, :equipment %>
+        <%= label(f, :equipment, class: "font-semibold mb-1 text-gray-700") %>
+        <%= select(f, :equipment, ["Others", "Machine", "Barbell", "Dumbbell", "Body Only"],
+          class:
+            "rounded-lg border-gray-300 px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-400"
+        ) %>
+        <%= error_tag(f, :equipment) %>
       </div>
 
       <div class="flex flex-col">
-        <%= label f, :description, class: "font-semibold mb-1 text-gray-700" %>
-        <%= textarea f, :description, class: "rounded-lg border-gray-300 px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-400" %>
-        <%= error_tag f, :description %>
+        <%= label(f, :description, class: "font-semibold mb-1 text-gray-700") %>
+        <%= textarea(f, :description,
+          class:
+            "rounded-lg border-gray-300 px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-400"
+        ) %>
+        <%= error_tag(f, :description) %>
       </div>
 
       <div class="flex flex-col col-span-2">
-        <%= label f, :gif_url, class: "font-semibold mb-1 text-gray-700" %>
-        <%= text_input f, :gif_url, class: "rounded-lg border-gray-300 px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-400" %>
-        <%= error_tag f, :gif_url %>
+        <%= label(f, :gif_url, class: "font-semibold mb-1 text-gray-700") %>
+        <%= text_input(f, :gif_url,
+          class:
+            "rounded-lg border-gray-300 px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-400"
+        ) %>
+        <%= error_tag(f, :gif_url) %>
       </div>
 
       <div class="flex flex-col">
-        <%= label f, :level, class: "font-semibold mb-1 text-gray-700" %>
-        <%= select f, :level, ["Others", "Beginner", "Intermediate", "Expert"],class: "rounded-lg border-gray-300 px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-400" %>
-        <%= error_tag f, :level %>
+        <%= label(f, :level, class: "font-semibold mb-1 text-gray-700") %>
+        <%= select(f, :level, ["Others", "Beginner", "Intermediate", "Expert"],
+          class:
+            "rounded-lg border-gray-300 px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-400"
+        ) %>
+        <%= error_tag(f, :level) %>
       </div>
 
       <div class="flex flex-col">
-        <%= label f, :type, class: "font-semibold mb-1 text-gray-700" %>
-        <%= select f, :type, ["Others", "strength", "cardio", "power-lifting", "stretching"], class: "rounded-lg border-gray-300 px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-400" %>
-        <%= error_tag f, :type %>
+        <%= label(f, :type, class: "font-semibold mb-1 text-gray-700") %>
+        <%= select(f, :type, ["Others", "strength", "cardio", "power-lifting", "stretching"],
+          class:
+            "rounded-lg border-gray-300 px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-400"
+        ) %>
+        <%= error_tag(f, :type) %>
       </div>
     </div>
 
     <div class="flex justify-center pt-4">
-      <%= submit "Create Exercise", class: "bg-green-400 hover:bg-green-600 text-white font-poppins py-2 px-4 rounded", phx_disable_with: "Saving..." %>
+      <%= submit("Create Exercise",
+        class: "bg-green-400 hover:bg-green-600 text-white font-poppins py-2 px-4 rounded",
+        phx_disable_with: "Saving..."
+      ) %>
     </div>
   </.form>
-</div>
\ No newline at end of file
+</div>
diff --git a/lib/fitness_web/live/exercise_live/index.ex b/lib/fitness_web/live/exercise_live/index.ex
index d4b83d3..6b05be8 100644
--- a/lib/fitness_web/live/exercise_live/index.ex
+++ b/lib/fitness_web/live/exercise_live/index.ex
@@ -7,10 +7,9 @@ defmodule FitnessWeb.ExerciseLive.Index do
 
   @impl true
   def mount(_params, session, socket) do
-
     if session["user_token"] do
       current_user = Accounts.get_user_by_session_token(session["user_token"])
-      
+
       case current_user do
         nil ->
           {:ok, assign(socket, exercises: Exercises.list_exercises(), search: "")}
diff --git a/lib/fitness_web/live/exercise_live/index.html.heex b/lib/fitness_web/live/exercise_live/index.html.heex
index 098aede..d2b015f 100644
--- a/lib/fitness_web/live/exercise_live/index.html.heex
+++ b/lib/fitness_web/live/exercise_live/index.html.heex
@@ -1,61 +1,127 @@
 <div class="p-6 mb-8 bg-blue-100 rounded-lg shadow-lg">
-
-<%= if @live_action in [:new, :edit] do %>
+  <%= if @live_action in [:new, :edit] do %>
     <.modal return_to={Routes.exercise_index_path(@socket, :index)}>
-        <.live_component
+      <.live_component
         module={FitnessWeb.ExerciseLive.FormComponent}
         id={@exercise.id || :new}
         title={@page_title}
         action={@live_action}
         exercise={@exercise}
         return_to={Routes.exercise_index_path(@socket, :index)}
-        />
-    </.modal>         
-<% end %>
+      />
+    </.modal>
+  <% end %>
 
-<form class="relative flex items-center p-2 border border-gray-200 rounded-md" action="#" phx-submit="search" phx-change="search">
-  <%= text_input :search, :text, autocomplete: "off", placeholder: "Search Exercises", value: @search, class: "flex-grow outline-none pl-10 font-poppins rounded" %>
-  <div class="absolute inset-y-0 left-0 flex items-center pl-4">
-    <svg class="w-6 h-8 text-blue-400" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" viewBox="0 0 24 24" stroke="currentColor">
-      <path d="M15.5 15.5L20 20" />
-      <path d="M10 6C7.23858 6 5 8.23858 5 11C5 13.7614 7.23858 16 10 16C12.7614 16 15 13.7614 15 11C15 8.23858 12.7614 6 10 6Z" />
-    </svg>
-  </div>
-  <%= submit "" %>
-</form>
+  <form
+    class="relative flex items-center p-2 border border-gray-200 rounded-md"
+    action="#"
+    phx-submit="search"
+    phx-change="search"
+  >
+    <%= text_input(:search, :text,
+      autocomplete: "off",
+      placeholder: "Search Exercises",
+      value: @search,
+      class: "flex-grow outline-none pl-10 font-poppins rounded"
+    ) %>
+    <div class="absolute inset-y-0 left-0 flex items-center pl-4">
+      <svg
+        class="w-6 h-8 text-blue-400"
+        fill="none"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        stroke-width="2"
+        viewBox="0 0 24 24"
+        stroke="currentColor"
+      >
+        <path d="M15.5 15.5L20 20" />
+        <path d="M10 6C7.23858 6 5 8.23858 5 11C5 13.7614 7.23858 16 10 16C12.7614 16 15 13.7614 15 11C15 8.23858 12.7614 6 10 6Z" />
+      </svg>
+    </div>
+    <%= submit("") %>
+  </form>
 
-<%= if assigns[:user] do %>
-  <div class="flex justify-end pt-3 pr-2 ">
-    <%= live_patch "New Exercise", to: Routes.exercise_index_path(@socket, :new), class: "bg-blue-500 hover:bg-blue-700 text-white font-poppins py-2  px-4 rounded" %>
-  </div>
-<% end %>
+  <%= if assigns[:user] do %>
+    <div class="flex justify-end pt-3 pr-2 ">
+      <.link
+        patch={Routes.exercise_index_path(@socket, :new)}
+        class="bg-blue-500 hover:bg-blue-700 text-white font-poppins py-2  px-4 rounded"
+      >
+        New Exercise
+      </.link>
+    </div>
+  <% end %>
 
-<div  class="grid grid-cols-3 gap-6 mt-8">
-  <%= for exercise <- @exercises do %>
-    <div id={"exercise-#{exercise.id}"}, class="overflow-hidden bg-white rounded-md shadow-lg">   
-      <div class="flex justify-center h-56 bg-white">
-            <img class="px-12 py-0 mr-0 overflow-hidden rounded w-100 h-60" src={exercise.gif_url}>
-          <span class="pt-4 mr-2 text-base text-gray-500"><%= link "#{exercise.level}", to: "#", phx_click: "search", phx_value_search: exercise.level %></span>
-        </div>
-      <div class="px-4 py-3">
-        <h2 class="mb-2 text-lg font-poppins"><%= exercise.name %></h2>
-        <div class="flex flex-wrap mb-2">
-          <span class="px-2 py-1 mb-2 mr-2 text-sm font-semibold text-white bg-blue-500 rounded-full hover:bg-blue-600 font-poppins"><%= link "#{exercise.body_part}", to: "#", phx_click: "search", phx_value_search: exercise.body_part %></span>
-          <span class="px-2 py-1 mb-2 mr-2 text-sm font-semibold text-white bg-blue-500 rounded-full hover:bg-blue-600 font-poppins"><%= link "#{exercise.equipment}", to: "#", phx_click: "search", phx_value_search: exercise.equipment %></span>
-          <span class="px-2 py-1 mb-2 mr-2 text-sm font-semibold text-white bg-blue-500 rounded-full hover:bg-blue-600 font-poppins"><%= link "#{exercise.type}", to: "#", phx_click: "search", phx_value_search: exercise.type %></span>
+  <div class="grid grid-cols-3 gap-6 mt-8">
+    <%= for exercise <- @exercises do %>
+      <div id={"exercise-#{exercise.id}"} , class="overflow-hidden bg-white rounded-md shadow-lg">
+        <div class="flex justify-center h-56 bg-white">
+          <img class="px-12 py-0 mr-0 overflow-hidden rounded w-100 h-60" src={exercise.gif_url} />
+          <span class="pt-4 mr-2 text-base text-gray-500">
+            <%= link("#{exercise.level}",
+              to: "#",
+              phx_click: "search",
+              phx_value_search: exercise.level
+            ) %>
+          </span>
         </div>
-        <div class="flex justify-end">
-          <span class="mr-4"><%= live_redirect "Show", to: Routes.exercise_show_path(@socket, :show, exercise), class: "text-blue-500 font-poppins hover:underline" %></span>
-          <%= if assigns[:is_admin] do %>
-            <span class="mr-4"><%= live_patch "Edit", to: Routes.exercise_index_path(@socket, :edit, exercise), class: "text-blue-500 font-poppins hover:underline" %></span>
-            <span class="mr-4"><%= link "Delete", to: "#", phx_click: "delete", phx_value_id: exercise.id, data: [confirm: "Are you sure?"], class: "text-blue-500 font-poppins hover:underline" %></span>
-          <% end %>
+        <div class="px-4 py-3">
+          <h2 class="mb-2 text-lg font-poppins"><%= exercise.name %></h2>
+          <div class="flex flex-wrap mb-2">
+            <span class="px-2 py-1 mb-2 mr-2 text-sm font-semibold text-white bg-blue-500 rounded-full hover:bg-blue-600 font-poppins">
+              <%= link("#{exercise.body_part}",
+                to: "#",
+                phx_click: "search",
+                phx_value_search: exercise.body_part
+              ) %>
+            </span>
+            <span class="px-2 py-1 mb-2 mr-2 text-sm font-semibold text-white bg-blue-500 rounded-full hover:bg-blue-600 font-poppins">
+              <%= link("#{exercise.equipment}",
+                to: "#",
+                phx_click: "search",
+                phx_value_search: exercise.equipment
+              ) %>
+            </span>
+            <span class="px-2 py-1 mb-2 mr-2 text-sm font-semibold text-white bg-blue-500 rounded-full hover:bg-blue-600 font-poppins">
+              <%= link("#{exercise.type}",
+                to: "#",
+                phx_click: "search",
+                phx_value_search: exercise.type
+              ) %>
+            </span>
+          </div>
+          <div class="flex justify-end">
+            <span class="mr-4">
+              <.link
+                navigate={Routes.exercise_show_path(@socket, :show, exercise)}
+                class="text-blue-500 font-poppins hover:underline"
+              >
+                Show
+              </.link>
+            </span>
+
+            <%= if assigns[:is_admin] do %>
+              <span class="mr-4">
+                <.link
+                  patch={Routes.exercise_index_path(@socket, :edit, exercise)}
+                  class="text-blue-500 font-poppins hover:underline"
+                >
+                  Edit
+                </.link>
+              </span>
+              <span class="mr-4">
+                <%= link("Delete",
+                  to: "#",
+                  phx_click: "delete",
+                  phx_value_id: exercise.id,
+                  data: [confirm: "Are you sure?"],
+                  class: "text-blue-500 font-poppins hover:underline"
+                ) %>
+              </span>
+            <% end %>
+          </div>
         </div>
       </div>
-    </div>
-  <% end %>
-</div>
-
+    <% end %>
+  </div>
 </div>
-
-
diff --git a/lib/fitness_web/live/exercise_live/show.html.heex b/lib/fitness_web/live/exercise_live/show.html.heex
index 6f8bfcc..c2306fd 100644
--- a/lib/fitness_web/live/exercise_live/show.html.heex
+++ b/lib/fitness_web/live/exercise_live/show.html.heex
@@ -1,4 +1,3 @@
-
 <%= if @live_action in [:edit] do %>
   <.modal return_to={Routes.exercise_show_path(@socket, :show, @exercise)}>
     <.live_component
@@ -13,30 +12,49 @@
 <% end %>
 <div class="flex flex-col items-center justify-center h-screen bg-green-100">
   <div class="w-full max-w-4xl overflow-hidden bg-white rounded-md shadow-md">
-    <div class="overflow-hidden bg-white">   
+    <div class="overflow-hidden bg-white">
       <div class="flex justify-between pt-3 pl-3 pr-3">
         <span class="pt-0 mr-2 text-2xl text-gray-500"><%= @exercise.level %></span>
         <%= if assigns[:is_admin] do %>
-        <span>
-        <%= live_patch "Edit", to: Routes.exercise_show_path(@socket, :edit, @exercise), class: "text-blue-500 font-poppins hover:underline" %>
-        </span>
+          <span>
+            <.link
+              patch={Routes.exercise_show_path(@socket, :edit, @exercise)}
+              class="text-blue-500 font-poppins hover:underline"
+            >
+              Edit
+            </.link>
+          </span>
         <% end %>
-        <span class="pt-0 mr-2 text-gray-500 text-l"><%= live_redirect "Back to List", to: Routes.exercise_index_path(@socket, :index), class: "text-blue-500 font-poppins hover:underline" %></span>
+        <span class="pt-0 mr-2 text-gray-500 text-l">
+          <.link
+            navigate={Routes.exercise_index_path(@socket, :index)}
+            class="text-blue-500 font-poppins hover:underline"
+          >
+            Back to List
+          </.link>
+        </span>
       </div>
       <div class="flex justify-center bg-white h-100">
-            <img class="px-12 py-0 mr-0 overflow-hidden rounded max-h-80 h-80" src={@exercise.gif_url}>
-        </div>
-        </div>
+        <img
+          class="px-12 py-0 mr-0 overflow-hidden rounded max-h-80 h-80"
+          src={@exercise.gif_url}
+        />
+      </div>
+    </div>
     <div class="p-6">
       <h2 class="mb-2 text-3xl font-bold font-poppins"><%= @exercise.name %></h2>
       <div class="flex flex-wrap mb-4">
-        <span class="px-2 py-1 mb-2 mr-2 text-sm font-semibold text-white bg-blue-500 rounded-full font-poppins"><%= @exercise.body_part %></span>
-        <span class="px-2 py-1 mb-2 mr-2 text-sm font-semibold text-white bg-blue-500 rounded-full font-poppins"><%= @exercise.equipment %></span>
-        <span class="px-2 py-1 mb-2 mr-2 text-sm font-semibold text-white bg-blue-500 rounded-full font-poppins"><%= @exercise.type %></span>
+        <span class="px-2 py-1 mb-2 mr-2 text-sm font-semibold text-white bg-blue-500 rounded-full font-poppins">
+          <%= @exercise.body_part %>
+        </span>
+        <span class="px-2 py-1 mb-2 mr-2 text-sm font-semibold text-white bg-blue-500 rounded-full font-poppins">
+          <%= @exercise.equipment %>
+        </span>
+        <span class="px-2 py-1 mb-2 mr-2 text-sm font-semibold text-white bg-blue-500 rounded-full font-poppins">
+          <%= @exercise.type %>
+        </span>
       </div>
       <p class="mb-6 text-gray-600 font-poppins"><%= @exercise.description %></p>
-      
     </div>
   </div>
 </div>
-
diff --git a/lib/fitness_web/live/live_helpers.ex b/lib/fitness_web/live/live_helpers.ex
index 746f8d8..a4a1d4a 100644
--- a/lib/fitness_web/live/live_helpers.ex
+++ b/lib/fitness_web/live/live_helpers.ex
@@ -1,6 +1,5 @@
 defmodule FitnessWeb.LiveHelpers do
-  import Phoenix.LiveView
-  import Phoenix.LiveView.Helpers
+  import Phoenix.Component
 
   alias Phoenix.LiveView.JS
 
@@ -36,12 +35,9 @@ defmodule FitnessWeb.LiveHelpers do
         phx-key="escape"
       >
         <%= if @return_to do %>
-          <%= live_patch "X",
-            to: @return_to,
-            id: "close",
-            class: "phx-modal-close",
-            phx_click: hide_modal()
-          %>
+          <.link id="close" patch={@return_to} class="phx-modal-close" phx_click={hide_modal()}>
+            X
+          </.link>
         <% else %>
           <a id="close" href="#" class="phx-modal-close" phx-click={hide_modal()}>x</a>
         <% end %>
diff --git a/lib/fitness_web/live/profile_live/Activity_history.ex b/lib/fitness_web/live/profile_live/Activity_history.ex
index d1247c8..a665d46 100644
--- a/lib/fitness_web/live/profile_live/Activity_history.ex
+++ b/lib/fitness_web/live/profile_live/Activity_history.ex
@@ -11,50 +11,68 @@ defmodule FitnessWeb.WorkoutTemplateLive.ActivityHistory do
   @impl true
   def render(assigns) do
     ~H"""
-
     <div class="p-6 mb-8 bg-blue-100 shadow-lg">
       <h1 class="flex items-center justify-center pt-0 mb-4 text-4xl font-poppins">History</h1>
 
-            <%= if length(@workout_templates) >= 1 do %>
-          <% user_template_owner = Enum.filter(@workout_templates, fn each -> each.user_id == assigns[:current_user].id end) %>
-
+      <%= if length(@workout_templates) >= 1 do %>
+        <% user_template_owner =
+          Enum.filter(@workout_templates, fn each -> each.user_id == assigns[:current_user].id end) %>
 
-          <% workout_template_are_finished = Enum.filter(user_template_owner, fn each -> each.is_finished == true end) %>
-          <div class="flex justify-end mb-4">
+        <% workout_template_are_finished =
+          Enum.filter(user_template_owner, fn each -> each.is_finished == true end) %>
+        <div class="flex justify-end mb-4">
           <p class="relative px-6 py-4 text-white rounded-lg font-poppins hover:text-xl group">
-          <span class="absolute inset-0 w-full h-full transition duration-300 transform -translate-x-1 -translate-y-1 bg-purple-800 ease opacity-80 group-hover:translate-x-0 group-hover:translate-y-0"></span>
-          <span class="absolute inset-0 w-full h-full transition duration-300 transform translate-x-1 translate-y-1 bg-pink-800 ease opacity-80 group-hover:translate-x-0 group-hover:translate-y-0 mix-blend-screen"></span>
-          <span class="relative"><%= length(workout_template_are_finished) %> Workouts</span>
+            <span class="absolute inset-0 w-full h-full transition duration-300 transform -translate-x-1 -translate-y-1 bg-purple-800 ease opacity-80 group-hover:translate-x-0 group-hover:translate-y-0">
+            </span>
+            <span class="absolute inset-0 w-full h-full transition duration-300 transform translate-x-1 translate-y-1 bg-pink-800 ease opacity-80 group-hover:translate-x-0 group-hover:translate-y-0 mix-blend-screen">
+            </span>
+            <span class="relative"><%= length(workout_template_are_finished) %> Workouts</span>
           </p>
-          </div>
-          <div class="grid grid-cols-2 gap-4">
+        </div>
+        <div class="grid grid-cols-2 gap-4">
           <%= for workout_template <- Enum.reverse(workout_template_are_finished) do %>
-            <div id={"workout_template-#{workout_template.id}"}, class="relative bg-white rounded-lg shadow-lg">
-
+            <div
+              id={"workout_template-#{workout_template.id}"}
+              ,
+              class="relative bg-white rounded-lg shadow-lg"
+            >
               <div class="flex justify-between px-6 py-4 border-gray-400 rounded">
-
-              <p class="text-base text-orange-500"><%= Calendar.strftime(workout_template.updated_at, "%B %-d, %Y") %></p>
-                <a href={"/workout_templates/#{workout_template.id}"} class="mb-2 text-xl text-gray-700 font-poppins"><%= String.upcase(workout_template.name) %> </a>
+                <p class="text-base text-orange-500">
+                  <%= Calendar.strftime(workout_template.updated_at, "%B %-d, %Y") %>
+                </p>
+                <a
+                  href={"/workout_templates/#{workout_template.id}"}
+                  class="mb-2 text-xl text-gray-700 font-poppins"
+                >
+                  <%= String.upcase(workout_template.name) %>
+                </a>
                 <p class="relative inline-flex items-center justify-start px-6 py-3 overflow-hidden text-xl font-medium transition-all bg-white rounded font-poppins hover:bg-white group">
-                <span class="w-48 h-48 rounded rotate-[-40deg] bg-purple-600 absolute bottom-0 left-0 -translate-x-full ease-out duration-500 transition-all translate-y-full mb-9 ml-9 group-hover:ml-0 group-hover:mb-32 group-hover:translate-x-0"></span>
-                <span class="relative w-full text-left text-black transition-colors duration-300 ease-in-out group-hover:text-white">Score: <%= workout_template.workout_template_score %></span>
+                  <span class="w-48 h-48 rounded rotate-[-40deg] bg-purple-600 absolute bottom-0 left-0 -translate-x-full ease-out duration-500 transition-all translate-y-full mb-9 ml-9 group-hover:ml-0 group-hover:mb-32 group-hover:translate-x-0">
+                  </span>
+                  <span class="relative w-full text-left text-black transition-colors duration-300 ease-in-out group-hover:text-white">
+                    Score: <%= workout_template.workout_template_score %>
+                  </span>
                 </p>
               </div>
-              <% list_of_same_exercise = Enum.group_by(workout_template.workout_items, fn each -> each.exercise_id end) |> Map.values() %>
+              <% list_of_same_exercise =
+                Enum.group_by(workout_template.workout_items, fn each -> each.exercise_id end)
+                |> Map.values() %>
               <%= for each_list <- list_of_same_exercise do %>
-              <% [workout_item_map | _] = each_list %>
-              <% each_list = Enum.filter(each_list, fn each -> each.check_box == true end) %>
-              <div class="pb-1">
-                <span class="pt-4 pl-6 mr-2 text-base text-gray-500"><%= length(each_list) %> ✕ <%= Fitness.Exercises.get_exercise!(workout_item_map.exercise_id).name %> (<%= Fitness.Exercises.get_exercise!(workout_item_map.exercise_id).body_part %>)</span>
-               </div>
-              <% end %>
-              </div>
+                <% [workout_item_map | _] = each_list %>
+                <% each_list = Enum.filter(each_list, fn each -> each.check_box == true end) %>
+                <div class="pb-1">
+                  <span class="pt-4 pl-6 mr-2 text-base text-gray-500">
+                    <%= length(each_list) %> ✕ <%= Fitness.Exercises.get_exercise!(
+                      workout_item_map.exercise_id
+                    ).name %> (<%= Fitness.Exercises.get_exercise!(workout_item_map.exercise_id).body_part %>)
+                  </span>
+                </div>
               <% end %>
             </div>
-            <% end %>
-
-      </div>
-
+          <% end %>
+        </div>
+      <% end %>
+    </div>
     """
   end
 
diff --git a/lib/fitness_web/live/profile_live/score_board_live.ex b/lib/fitness_web/live/profile_live/score_board_live.ex
index 09d8516..4a36bec 100644
--- a/lib/fitness_web/live/profile_live/score_board_live.ex
+++ b/lib/fitness_web/live/profile_live/score_board_live.ex
@@ -16,67 +16,112 @@ defmodule FitnessWeb.ScoreBoardLive do
       |> assign(:user_id, 0)
       |> assign(:workout_templates, WorkoutTemplates.list_workout_templates())
 
-
     {:ok, socket}
   end
 
   @impl true
   def render(assigns) do
     ~H"""
-
     <div class="p-6 mb-8 bg-blue-100 rounded-lg shadow-lg scoreboard">
       <h1 class="mb-4 text-3xl text-center font-poppins">Scoreboard</h1>
 
       <div class="grid grid-cols-1 gap-4 md:grid-cols-3">
         <% users_have_some_player_score = Enum.reject(@users, fn each -> each.player_score == 0 end) %>
-        <% user_by_order_score = Enum.sort_by(users_have_some_player_score, &-(&1.player_score)) %>
+        <% user_by_order_score = Enum.sort_by(users_have_some_player_score, &(-&1.player_score)) %>
         <% rank = Enum.with_index(user_by_order_score) %>
         <%= for {user, rank} <- rank do %>
           <div class="relative bg-white rounded-lg shadow-lg ">
-          <%= if rank == 0 do %>
-          <p class="pt-2 pb-2 pl-4 text-yellow-500 hover:text-yellow-600 text-bold">#Rank <%= rank + 1 %><svg class="w-10 h-14 pr-0.5 mr-0 fill-current" fill="#000000" height="200px" width="200px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 324.701 324.701" xml:space="preserve"><g stroke-width="0"></g><g  stroke-linecap="round" stroke-linejoin="round"></g><g> <path d="M242.538,154.438c12.071-1.032,22.667-6.11,31.544-15.153c30.51-31.08,29.583-100.347,29.529-103.28 c-0.1-5.447-4.543-9.81-9.992-9.814l-50.269-0.033V5c0-2.762-2.239-5-5-5h-152c-2.761,0-5,2.238-5,5v21.156L31.082,26.19 c-5.448,0.004-9.891,4.367-9.992,9.814c-0.055,2.934-0.981,72.2,29.529,103.28c8.877,9.043,19.474,14.121,31.544,15.153 c4.617,32.323,28.831,58.395,60.188,65.782v62.933h-25.333c-1.635,0-3.166,0.799-4.101,2.14l-22,31.549 c-1.066,1.528-1.193,3.522-0.331,5.174c0.861,1.651,2.57,2.686,4.433,2.686c0,0,134.678-0.001,134.686,0c2.761,0,5-2.238,5-5 c0-1.21-0.507-2.195-1.145-3.184l-21.774-31.226c-0.935-1.341-2.466-2.14-4.101-2.14h-25.333V220.22 C213.707,212.832,237.921,186.761,242.538,154.438z M283.457,46.183c-0.965,22.133-6.193,61.311-23.647,79.091 c-4.822,4.911-10.247,7.849-16.459,8.91V46.156L283.457,46.183z M41.253,46.183l40.097-0.026v88.027 c-6.207-1.061-11.626-3.991-16.444-8.894C47.486,107.563,42.236,68.339,41.253,46.183z M120.917,83.455l28.63-4.16l12.804-25.943 l12.804,25.943l28.63,4.16l-20.717,20.194l4.891,28.515l-25.607-13.463l-25.607,13.463l4.891-28.515L120.917,83.455z"></path> </g></svg></p>
-          <% else %>
-          <%= if rank == 1 do %>
-          <p class="pt-2 pb-2 pl-4 text-base text-zinc-400 hover:text-zinc-600">#Rank <%= rank + 1 %><svg class="w-10 h-14 pr-0.5 mr-0 fill-current" fill="#000000" height="200px" width="200px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 324.701 324.701" xml:space="preserve"><g stroke-width="0"></g><g  stroke-linecap="round" stroke-linejoin="round"></g><g> <path d="M242.538,154.438c12.071-1.032,22.667-6.11,31.544-15.153c30.51-31.08,29.583-100.347,29.529-103.28 c-0.1-5.447-4.543-9.81-9.992-9.814l-50.269-0.033V5c0-2.762-2.239-5-5-5h-152c-2.761,0-5,2.238-5,5v21.156L31.082,26.19 c-5.448,0.004-9.891,4.367-9.992,9.814c-0.055,2.934-0.981,72.2,29.529,103.28c8.877,9.043,19.474,14.121,31.544,15.153 c4.617,32.323,28.831,58.395,60.188,65.782v62.933h-25.333c-1.635,0-3.166,0.799-4.101,2.14l-22,31.549 c-1.066,1.528-1.193,3.522-0.331,5.174c0.861,1.651,2.57,2.686,4.433,2.686c0,0,134.678-0.001,134.686,0c2.761,0,5-2.238,5-5 c0-1.21-0.507-2.195-1.145-3.184l-21.774-31.226c-0.935-1.341-2.466-2.14-4.101-2.14h-25.333V220.22 C213.707,212.832,237.921,186.761,242.538,154.438z M283.457,46.183c-0.965,22.133-6.193,61.311-23.647,79.091 c-4.822,4.911-10.247,7.849-16.459,8.91V46.156L283.457,46.183z M41.253,46.183l40.097-0.026v88.027 c-6.207-1.061-11.626-3.991-16.444-8.894C47.486,107.563,42.236,68.339,41.253,46.183z M120.917,83.455l28.63-4.16l12.804-25.943 l12.804,25.943l28.63,4.16l-20.717,20.194l4.891,28.515l-25.607-13.463l-25.607,13.463l4.891-28.515L120.917,83.455z"></path> </g></svg></p>
-          <% else %>
-          <%= if rank == 2 do %>
-          <p class="pt-2 pb-2 pl-4 text-base text-amber-700 hover:text-amber-800">#Rank <%= rank + 1 %><svg class="w-10 h-14 pr-0.5 mr-0 fill-current" fill="#000000" height="200px" width="200px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 324.701 324.701" xml:space="preserve"><g stroke-width="0"></g><g  stroke-linecap="round" stroke-linejoin="round"></g><g> <path d="M242.538,154.438c12.071-1.032,22.667-6.11,31.544-15.153c30.51-31.08,29.583-100.347,29.529-103.28 c-0.1-5.447-4.543-9.81-9.992-9.814l-50.269-0.033V5c0-2.762-2.239-5-5-5h-152c-2.761,0-5,2.238-5,5v21.156L31.082,26.19 c-5.448,0.004-9.891,4.367-9.992,9.814c-0.055,2.934-0.981,72.2,29.529,103.28c8.877,9.043,19.474,14.121,31.544,15.153 c4.617,32.323,28.831,58.395,60.188,65.782v62.933h-25.333c-1.635,0-3.166,0.799-4.101,2.14l-22,31.549 c-1.066,1.528-1.193,3.522-0.331,5.174c0.861,1.651,2.57,2.686,4.433,2.686c0,0,134.678-0.001,134.686,0c2.761,0,5-2.238,5-5 c0-1.21-0.507-2.195-1.145-3.184l-21.774-31.226c-0.935-1.341-2.466-2.14-4.101-2.14h-25.333V220.22 C213.707,212.832,237.921,186.761,242.538,154.438z M283.457,46.183c-0.965,22.133-6.193,61.311-23.647,79.091 c-4.822,4.911-10.247,7.849-16.459,8.91V46.156L283.457,46.183z M41.253,46.183l40.097-0.026v88.027 c-6.207-1.061-11.626-3.991-16.444-8.894C47.486,107.563,42.236,68.339,41.253,46.183z M120.917,83.455l28.63-4.16l12.804-25.943 l12.804,25.943l28.63,4.16l-20.717,20.194l4.891,28.515l-25.607-13.463l-25.607,13.463l4.891-28.515L120.917,83.455z"></path> </g></svg></p>
-          <% else %>
-          <p class="pt-2 pb-2 pl-4 text-base text-gray-500">#Rank <%= rank + 1 %></p>
-          <% end %>
-          <% end %>
-          <% end %>
+            <%= if rank == 0 do %>
+              <p class="pt-2 pb-2 pl-4 text-yellow-500 hover:text-yellow-600 text-bold">
+                #Rank <%= rank + 1 %><svg
+                  class="w-10 h-14 pr-0.5 mr-0 fill-current"
+                  fill="#000000"
+                  height="200px"
+                  width="200px"
+                  version="1.1"
+                  xmlns="http://www.w3.org/2000/svg"
+                  xmlns:xlink="http://www.w3.org/1999/xlink"
+                  viewBox="0 0 324.701 324.701"
+                  xml:space="preserve"
+                ><g stroke-width="0"></g><g stroke-linecap="round" stroke-linejoin="round"></g><g> <path d="M242.538,154.438c12.071-1.032,22.667-6.11,31.544-15.153c30.51-31.08,29.583-100.347,29.529-103.28 c-0.1-5.447-4.543-9.81-9.992-9.814l-50.269-0.033V5c0-2.762-2.239-5-5-5h-152c-2.761,0-5,2.238-5,5v21.156L31.082,26.19 c-5.448,0.004-9.891,4.367-9.992,9.814c-0.055,2.934-0.981,72.2,29.529,103.28c8.877,9.043,19.474,14.121,31.544,15.153 c4.617,32.323,28.831,58.395,60.188,65.782v62.933h-25.333c-1.635,0-3.166,0.799-4.101,2.14l-22,31.549 c-1.066,1.528-1.193,3.522-0.331,5.174c0.861,1.651,2.57,2.686,4.433,2.686c0,0,134.678-0.001,134.686,0c2.761,0,5-2.238,5-5 c0-1.21-0.507-2.195-1.145-3.184l-21.774-31.226c-0.935-1.341-2.466-2.14-4.101-2.14h-25.333V220.22 C213.707,212.832,237.921,186.761,242.538,154.438z M283.457,46.183c-0.965,22.133-6.193,61.311-23.647,79.091 c-4.822,4.911-10.247,7.849-16.459,8.91V46.156L283.457,46.183z M41.253,46.183l40.097-0.026v88.027 c-6.207-1.061-11.626-3.991-16.444-8.894C47.486,107.563,42.236,68.339,41.253,46.183z M120.917,83.455l28.63-4.16l12.804-25.943 l12.804,25.943l28.63,4.16l-20.717,20.194l4.891,28.515l-25.607-13.463l-25.607,13.463l4.891-28.515L120.917,83.455z"></path> </g></svg>
+              </p>
+            <% else %>
+              <%= if rank == 1 do %>
+                <p class="pt-2 pb-2 pl-4 text-base text-zinc-400 hover:text-zinc-600">
+                  #Rank <%= rank + 1 %><svg
+                    class="w-10 h-14 pr-0.5 mr-0 fill-current"
+                    fill="#000000"
+                    height="200px"
+                    width="200px"
+                    version="1.1"
+                    xmlns="http://www.w3.org/2000/svg"
+                    xmlns:xlink="http://www.w3.org/1999/xlink"
+                    viewBox="0 0 324.701 324.701"
+                    xml:space="preserve"
+                  ><g stroke-width="0"></g><g stroke-linecap="round" stroke-linejoin="round"></g><g> <path d="M242.538,154.438c12.071-1.032,22.667-6.11,31.544-15.153c30.51-31.08,29.583-100.347,29.529-103.28 c-0.1-5.447-4.543-9.81-9.992-9.814l-50.269-0.033V5c0-2.762-2.239-5-5-5h-152c-2.761,0-5,2.238-5,5v21.156L31.082,26.19 c-5.448,0.004-9.891,4.367-9.992,9.814c-0.055,2.934-0.981,72.2,29.529,103.28c8.877,9.043,19.474,14.121,31.544,15.153 c4.617,32.323,28.831,58.395,60.188,65.782v62.933h-25.333c-1.635,0-3.166,0.799-4.101,2.14l-22,31.549 c-1.066,1.528-1.193,3.522-0.331,5.174c0.861,1.651,2.57,2.686,4.433,2.686c0,0,134.678-0.001,134.686,0c2.761,0,5-2.238,5-5 c0-1.21-0.507-2.195-1.145-3.184l-21.774-31.226c-0.935-1.341-2.466-2.14-4.101-2.14h-25.333V220.22 C213.707,212.832,237.921,186.761,242.538,154.438z M283.457,46.183c-0.965,22.133-6.193,61.311-23.647,79.091 c-4.822,4.911-10.247,7.849-16.459,8.91V46.156L283.457,46.183z M41.253,46.183l40.097-0.026v88.027 c-6.207-1.061-11.626-3.991-16.444-8.894C47.486,107.563,42.236,68.339,41.253,46.183z M120.917,83.455l28.63-4.16l12.804-25.943 l12.804,25.943l28.63,4.16l-20.717,20.194l4.891,28.515l-25.607-13.463l-25.607,13.463l4.891-28.515L120.917,83.455z"></path> </g></svg>
+                </p>
+              <% else %>
+                <%= if rank == 2 do %>
+                  <p class="pt-2 pb-2 pl-4 text-base text-amber-700 hover:text-amber-800">
+                    #Rank <%= rank + 1 %><svg
+                      class="w-10 h-14 pr-0.5 mr-0 fill-current"
+                      fill="#000000"
+                      height="200px"
+                      width="200px"
+                      version="1.1"
+                      xmlns="http://www.w3.org/2000/svg"
+                      xmlns:xlink="http://www.w3.org/1999/xlink"
+                      viewBox="0 0 324.701 324.701"
+                      xml:space="preserve"
+                    ><g stroke-width="0"></g><g stroke-linecap="round" stroke-linejoin="round"></g><g> <path d="M242.538,154.438c12.071-1.032,22.667-6.11,31.544-15.153c30.51-31.08,29.583-100.347,29.529-103.28 c-0.1-5.447-4.543-9.81-9.992-9.814l-50.269-0.033V5c0-2.762-2.239-5-5-5h-152c-2.761,0-5,2.238-5,5v21.156L31.082,26.19 c-5.448,0.004-9.891,4.367-9.992,9.814c-0.055,2.934-0.981,72.2,29.529,103.28c8.877,9.043,19.474,14.121,31.544,15.153 c4.617,32.323,28.831,58.395,60.188,65.782v62.933h-25.333c-1.635,0-3.166,0.799-4.101,2.14l-22,31.549 c-1.066,1.528-1.193,3.522-0.331,5.174c0.861,1.651,2.57,2.686,4.433,2.686c0,0,134.678-0.001,134.686,0c2.761,0,5-2.238,5-5 c0-1.21-0.507-2.195-1.145-3.184l-21.774-31.226c-0.935-1.341-2.466-2.14-4.101-2.14h-25.333V220.22 C213.707,212.832,237.921,186.761,242.538,154.438z M283.457,46.183c-0.965,22.133-6.193,61.311-23.647,79.091 c-4.822,4.911-10.247,7.849-16.459,8.91V46.156L283.457,46.183z M41.253,46.183l40.097-0.026v88.027 c-6.207-1.061-11.626-3.991-16.444-8.894C47.486,107.563,42.236,68.339,41.253,46.183z M120.917,83.455l28.63-4.16l12.804-25.943 l12.804,25.943l28.63,4.16l-20.717,20.194l4.891,28.515l-25.607-13.463l-25.607,13.463l4.891-28.515L120.917,83.455z"></path> </g></svg>
+                  </p>
+                <% else %>
+                  <p class="pt-2 pb-2 pl-4 text-base text-gray-500">#Rank <%= rank + 1 %></p>
+                <% end %>
+              <% end %>
+            <% end %>
             <div class="flex items-center justify-between px-6 py-4 border-gray-400 user-info">
               <a href="#" class="mb-2 text-2xl text-gray-600 font-poppins hover:text-lime-500">
                 <%= String.upcase(user.name) %>
-               <div class="absolute top-0 right-0 px-4 py-2 pt-2 text-xs font-bold text-white bg-gray-600 rounded-tr-lg rounded-bl-lg hover:text-xl">@<%= user.username %></div>
+                <div class="absolute top-0 right-0 px-4 py-2 pt-2 text-xs font-bold text-white bg-gray-600 rounded-tr-lg rounded-bl-lg hover:text-xl">
+                  @<%= user.username %>
+                </div>
               </a>
             </div>
             <div class="flex justify-between ">
-            <p class="pt-2 pb-2 pl-4 text-base text-orange-500"><%= Calendar.strftime(user.updated_at, "%B %-d, %Y") %></p>
-            <% user_workout_template = Enum.filter(@workout_templates, fn each -> each.user_id == user.id and each.is_finished == true end) %>
-              <span class="pb-2 pr-2 text-gray-500 "><%= length(user_workout_template) %> ✕ workout complete</span>
+              <p class="pt-2 pb-2 pl-4 text-base text-orange-500">
+                <%= Calendar.strftime(user.updated_at, "%B %-d, %Y") %>
+              </p>
+              <% user_workout_template =
+                Enum.filter(@workout_templates, fn each ->
+                  each.user_id == user.id and each.is_finished == true
+                end) %>
+              <span class="pb-2 pr-2 text-gray-500 ">
+                <%= length(user_workout_template) %> ✕ workout complete
+              </span>
             </div>
             <div class="flex justify-between px-4 py-2 text-white bg-gray-700 rounded-b-lg user-score">
-            <%= if user.id == @user_id do %>
-              <p class="text-base text-red-400 score-label font-poppins">Total Score:</p>
-              <p class="text-3xl font-bold score"><%= @player_score %></p>
+              <%= if user.id == @user_id do %>
+                <p class="text-base text-red-400 score-label font-poppins">Total Score:</p>
+                <p class="text-3xl font-bold score"><%= @player_score %></p>
               <% else %>
-              <p class="text-base text-red-400 score-label font-poppins">Total Score:</p>
-              <p class="text-3xl font-bold score"><%= user.player_score %></p>
+                <p class="text-base text-red-400 score-label font-poppins">Total Score:</p>
+                <p class="text-3xl font-bold score"><%= user.player_score %></p>
               <% end %>
             </div>
           </div>
         <% end %>
       </div>
     </div>
-
     """
   end
 
   @impl true
-  def handle_info({:update_users, {updated_users, update_workout_template, updated_player_score, updated_user_id}}, socket) do
-
+  def handle_info(
+        {:update_users,
+         {updated_users, update_workout_template, updated_player_score, updated_user_id}},
+        socket
+      ) do
     socket =
       socket
       |> assign(player_score: updated_player_score)
@@ -84,7 +129,6 @@ defmodule FitnessWeb.ScoreBoardLive do
       |> assign(users: updated_users)
       |> assign(user_id: updated_user_id)
 
-
     {:noreply, socket}
   end
 end
diff --git a/lib/fitness_web/live/profile_live/update_user_profile_form.ex b/lib/fitness_web/live/profile_live/update_user_profile_form.ex
index 5248215..6b14da0 100644
--- a/lib/fitness_web/live/profile_live/update_user_profile_form.ex
+++ b/lib/fitness_web/live/profile_live/update_user_profile_form.ex
@@ -18,40 +18,53 @@ defmodule FitnessWeb.ProfileLive.UpdateUserProfileForm do
     <div class="p-8 bg-white rounded-lg">
       <h2 class="flex items-center justify-center pt-0 mb-4 text-3xl font-poppins">Edit Profile</h2>
 
-         <.form
-          let={f}
-          for={:profile}
-          phx-target={@myself}
-          id="update_profile"
-          phx-change="update"
-          phx-submit="update_new_changes">
-
-          <%= for entry <- @uploads.user_image.entries do %>
+      <.form
+        :let={f}
+        for={:profile}
+        phx-target={@myself}
+        id="update_profile"
+        phx-change="update"
+        phx-submit="update_new_changes"
+      >
+        <%= for entry <- @uploads.user_image.entries do %>
           <div class="flex justify-center pt-6 mt-6">
-          <%= live_img_preview entry, class: "w-48 h-48 pb-4 rounded" %>
-          </div>
-          <% end %>
-          <div class="mb-4">
-            <%= label f, :name, class: "block text-gray-700 font-bold mb-2" %>
-            <%= text_input f, :name, class: "w-full font-poppins border rounded py-2 px-3 leading-tight focus:outline-none focus:shadow-outline", placeholder: "Edit name" %>
+            <.live_img_preview entry={entry} class="w-48 h-48 pb-4 rounded" />
           </div>
-          <div phx-drop-target={@uploads.user_image.ref} class="flex justify-center p-6 bg-gray-200 border-4 border-gray-600 border-dashed rounded-lg shadow">
+        <% end %>
+        <div class="mb-4">
+          <%= label(f, :name, class: "block text-gray-700 font-bold mb-2") %>
+          <%= text_input(f, :name,
+            class:
+              "w-full font-poppins border rounded py-2 px-3 leading-tight focus:outline-none focus:shadow-outline",
+            placeholder: "Edit name"
+          ) %>
+        </div>
+        <div
+          phx-drop-target={@uploads.user_image.ref}
+          class="flex justify-center p-6 bg-gray-200 border-4 border-gray-600 border-dashed rounded-lg shadow"
+        >
           <label class="flex justify-center px-4 py-4 m-2 text-2xl cursor-pointer font-poppins">
-                Click or drag and drop to upload image
-                <%= live_file_input @uploads.user_image, style: "display: none;" %>
+            Click or drag and drop to upload image
+            <.live_file_input upload={@upload.user_image} style="display: none;" />
           </label>
-          </div>
-
-          <div class="flex justify-between pt-4">
-          <button class="button font-poppins" phx-click="remove" phx-target={@myself} >
-            <svg class="svgIcon" viewBox="0 0 448 512"><path d="M135.2 17.7L128 32H32C14.3 32 0 46.3 0 64S14.3 96 32 96H416c17.7 0 32-14.3 32-32s-14.3-32-32-32H320l-7.2-14.3C307.4 6.8 296.3 0 284.2 0H163.8c-12.1 0-23.2 6.8-28.6 17.7zM416 128H32L53.2 467c1.6 25.3 22.6 45 47.9 45H346.9c25.3 0 46.3-19.7 47.9-45L416 128z"></path></svg>
+        </div>
+
+        <div class="flex justify-between pt-4">
+          <button class="button font-poppins" phx-click="remove" phx-target={@myself}>
+            <svg class="svgIcon" viewBox="0 0 448 512">
+              <path d="M135.2 17.7L128 32H32C14.3 32 0 46.3 0 64S14.3 96 32 96H416c17.7 0 32-14.3 32-32s-14.3-32-32-32H320l-7.2-14.3C307.4 6.8 296.3 0 284.2 0H163.8c-12.1 0-23.2 6.8-28.6 17.7zM416 128H32L53.2 467c1.6 25.3 22.6 45 47.9 45H346.9c25.3 0 46.3-19.7 47.9-45L416 128z">
+              </path>
+            </svg>
           </button>
 
-            <%= submit "Save", class: "bg-blue-500 hover:bg-blue-700 font-poppins text-white py-2 px-4 rounded focus:outline-none focus:shadow-outline", phx_disable_with: "Saving..." %>
-           </div>
-        </.form>
-       </div>
-
+          <%= submit("Save",
+            class:
+              "bg-blue-500 hover:bg-blue-700 font-poppins text-white py-2 px-4 rounded focus:outline-none focus:shadow-outline",
+            phx_disable_with: "Saving..."
+          ) %>
+        </div>
+      </.form>
+    </div>
     """
   end
 
@@ -62,7 +75,10 @@ defmodule FitnessWeb.ProfileLive.UpdateUserProfileForm do
 
   @impl true
   def handle_event("remove", _params, socket) do
-    Accounts.update_user_image(socket.assigns.current_user, %{"image" => "/images/user-profile.svg"})
+    Accounts.update_user_image(socket.assigns.current_user, %{
+      "image" => "/images/user-profile.svg"
+    })
+
     {:noreply, socket}
   end
 
@@ -77,15 +93,14 @@ defmodule FitnessWeb.ProfileLive.UpdateUserProfileForm do
       end)
       |> List.to_string()
 
-
-     if uploaded_file != ""  do
-       Accounts.update_user_image(socket.assigns.current_user, %{"image" => uploaded_file})
-     end
+    if uploaded_file != "" do
+      Accounts.update_user_image(socket.assigns.current_user, %{"image" => uploaded_file})
+    end
 
     Accounts.update_user_name(socket.assigns.current_user, %{"name" => updated_name})
 
     {:noreply,
      socket
-     |> push_redirect(to: "/profile")}
+     |> push_navigate(to: "/profile")}
   end
 end
diff --git a/lib/fitness_web/live/profile_live/user_profile_live.ex b/lib/fitness_web/live/profile_live/user_profile_live.ex
index 708b3ab..50994a8 100644
--- a/lib/fitness_web/live/profile_live/user_profile_live.ex
+++ b/lib/fitness_web/live/profile_live/user_profile_live.ex
@@ -9,7 +9,10 @@ defmodule FitnessWeb.UserProfileLive do
       socket
       |> assign(:page_title, "User Profile")
       |> assign(:kebab_menu, :off)
-      |> assign(:chart_data, ChartData.all_complete_workout_chart_data(socket.assigns[:current_user].id))
+      |> assign(
+        :chart_data,
+        ChartData.all_complete_workout_chart_data(socket.assigns[:current_user].id)
+      )
 
     {:ok, socket}
   end
@@ -17,60 +20,122 @@ defmodule FitnessWeb.UserProfileLive do
   @impl true
   def render(assigns) do
     ~H"""
-
     <div class="p-6 mb-8 bg-blue-100 rounded-lg shadow-lg scoreboard">
       <div>
-        <a href="/users/settings" class="flex justify-end"><svg class="w-8 h-8" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><g stroke-width="0"></g><g stroke-linecap="round" stroke-linejoin="round"></g><g> <path d="M20.1 9.2214C18.29 9.2214 17.55 7.9414 18.45 6.3714C18.97 5.4614 18.66 4.3014 17.75 3.7814L16.02 2.7914C15.23 2.3214 14.21 2.6014 13.74 3.3914L13.63 3.5814C12.73 5.1514 11.25 5.1514 10.34 3.5814L10.23 3.3914C9.78 2.6014 8.76 2.3214 7.97 2.7914L6.24 3.7814C5.33 4.3014 5.02 5.4714 5.54 6.3814C6.45 7.9414 5.71 9.2214 3.9 9.2214C2.86 9.2214 2 10.0714 2 11.1214V12.8814C2 13.9214 2.85 14.7814 3.9 14.7814C5.71 14.7814 6.45 16.0614 5.54 17.6314C5.02 18.5414 5.33 19.7014 6.24 20.2214L7.97 21.2114C8.76 21.6814 9.78 21.4014 10.25 20.6114L10.36 20.4214C11.26 18.8514 12.74 18.8514 13.65 20.4214L13.76 20.6114C14.23 21.4014 15.25 21.6814 16.04 21.2114L17.77 20.2214C18.68 19.7014 18.99 18.5314 18.47 17.6314C17.56 16.0614 18.3 14.7814 20.11 14.7814C21.15 14.7814 22.01 13.9314 22.01 12.8814V11.1214C22 10.0814 21.15 9.2214 20.1 9.2214ZM12 15.2514C10.21 15.2514 8.75 13.7914 8.75 12.0014C8.75 10.2114 10.21 8.7514 12 8.7514C13.79 8.7514 15.25 10.2114 15.25 12.0014C15.25 13.7914 13.79 15.2514 12 15.2514Z" fill="#292D32"></path> </g></svg></a>
+        <a href="/users/settings" class="flex justify-end">
+          <svg class="w-8 h-8" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <g stroke-width="0"></g>
+            <g stroke-linecap="round" stroke-linejoin="round"></g>
+            <g>
+              <path
+                d="M20.1 9.2214C18.29 9.2214 17.55 7.9414 18.45 6.3714C18.97 5.4614 18.66 4.3014 17.75 3.7814L16.02 2.7914C15.23 2.3214 14.21 2.6014 13.74 3.3914L13.63 3.5814C12.73 5.1514 11.25 5.1514 10.34 3.5814L10.23 3.3914C9.78 2.6014 8.76 2.3214 7.97 2.7914L6.24 3.7814C5.33 4.3014 5.02 5.4714 5.54 6.3814C6.45 7.9414 5.71 9.2214 3.9 9.2214C2.86 9.2214 2 10.0714 2 11.1214V12.8814C2 13.9214 2.85 14.7814 3.9 14.7814C5.71 14.7814 6.45 16.0614 5.54 17.6314C5.02 18.5414 5.33 19.7014 6.24 20.2214L7.97 21.2114C8.76 21.6814 9.78 21.4014 10.25 20.6114L10.36 20.4214C11.26 18.8514 12.74 18.8514 13.65 20.4214L13.76 20.6114C14.23 21.4014 15.25 21.6814 16.04 21.2114L17.77 20.2214C18.68 19.7014 18.99 18.5314 18.47 17.6314C17.56 16.0614 18.3 14.7814 20.11 14.7814C21.15 14.7814 22.01 13.9314 22.01 12.8814V11.1214C22 10.0814 21.15 9.2214 20.1 9.2214ZM12 15.2514C10.21 15.2514 8.75 13.7914 8.75 12.0014C8.75 10.2114 10.21 8.7514 12 8.7514C13.79 8.7514 15.25 10.2114 15.25 12.0014C15.25 13.7914 13.79 15.2514 12 15.2514Z"
+                fill="#292D32"
+              >
+              </path>
+            </g>
+          </svg>
+        </a>
         <h1 class="mb-4 text-3xl text-center font-poppins">Profile</h1>
       </div>
       <div class="flex justify-center pt-6 mt-6">
-      <img src={assigns[:current_user].image} alt="user profile pic" class="w-32 border-2 border-gray-800 rounded-full h-w-32">
+        <img
+          src={assigns[:current_user].image}
+          alt="user profile pic"
+          class="w-32 border-2 border-gray-800 rounded-full h-w-32"
+        />
       </div>
       <%= if @kebab_menu == :off do %>
-      <span class="flex justify-center pt-4 text-2xl ml-13 font-poppins">
-      <%= assigns[:current_user].name %> <button phx-click="open"><svg class="w-4 h-4 mt-2 mb-2" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="#000000" class="bi bi-three-dots-vertical"><g stroke-width="0"></g><g stroke-linecap="round" stroke-linejoin="round"></g><g> <path d="M9.5 13a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm0-5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm0-5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0z"></path> </g></svg></button>
-      </span>
+        <span class="flex justify-center pt-4 text-2xl ml-13 font-poppins">
+          <%= assigns[:current_user].name %>
+          <button phx-click="open">
+            <svg
+              class="w-4 h-4 mt-2 mb-2"
+              viewBox="0 0 16 16"
+              xmlns="http://www.w3.org/2000/svg"
+              fill="#000000"
+              class="bi bi-three-dots-vertical"
+            >
+              <g stroke-width="0"></g>
+              <g stroke-linecap="round" stroke-linejoin="round"></g>
+              <g>
+                <path d="M9.5 13a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm0-5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm0-5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0z">
+                </path>
+              </g>
+            </svg>
+          </button>
+        </span>
       <% else %>
-      <span class="flex justify-center pt-4 text-2xl ml-13 font-poppins">
-      <%= assigns[:current_user].name %> <button phx-click="close"><svg class="w-4 h-4 mt-2 mb-2" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="#000000" class="bi bi-three-dots-vertical"><g stroke-width="0"></g><g stroke-linecap="round" stroke-linejoin="round"></g><g> <path d="M9.5 13a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm0-5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm0-5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0z"></path> </g></svg></button>
-      </span>
-      <.modal>
-        <.live_component id={assigns[:current_user].id} module={FitnessWeb.ProfileLive.UpdateUserProfileForm} current_user={assigns[:current_user]} />
-      </.modal>
+        <span class="flex justify-center pt-4 text-2xl ml-13 font-poppins">
+          <%= assigns[:current_user].name %>
+          <button phx-click="close">
+            <svg
+              class="w-4 h-4 mt-2 mb-2"
+              viewBox="0 0 16 16"
+              xmlns="http://www.w3.org/2000/svg"
+              fill="#000000"
+              class="bi bi-three-dots-vertical"
+            >
+              <g stroke-width="0"></g>
+              <g stroke-linecap="round" stroke-linejoin="round"></g>
+              <g>
+                <path d="M9.5 13a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm0-5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm0-5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0z">
+                </path>
+              </g>
+            </svg>
+          </button>
+        </span>
+        <.modal>
+          <.live_component
+            id={assigns[:current_user].id}
+            module={FitnessWeb.ProfileLive.UpdateUserProfileForm}
+            current_user={assigns[:current_user]}
+          />
+        </.modal>
       <% end %>
 
       <span class="flex justify-center pt-2 text-base text-orange-600 font-poppins">
-      @<%= assigns[:current_user].username %>
+        @<%= assigns[:current_user].username %>
       </span>
-       <a href="/score_board">
-       <div class="flex justify-center pt-4 buttonscore">
-        <div class="box">T</div>
-        <div class="box">O</div>
-        <div class="box">T</div>
-        <div class="box">A</div>
-        <div class="box">L</div>
-       </div>
-       <div class="flex justify-center text-5xl pt-4 font-poppins font-semibold text-yellow-500 font-outline-2 drop-shadow-[0_1.2px_1.2px_rgba(0,0,0,0.8)]">
-       <%= assigns[:current_user].player_score %>
-       </div>
-       </a>
+      <a href="/score_board">
+        <div class="flex justify-center pt-4 buttonscore">
+          <div class="box">T</div>
+          <div class="box">O</div>
+          <div class="box">T</div>
+          <div class="box">A</div>
+          <div class="box">L</div>
+        </div>
+        <div class="flex justify-center text-5xl pt-4 font-poppins font-semibold text-yellow-500 font-outline-2 drop-shadow-[0_1.2px_1.2px_rgba(0,0,0,0.8)]">
+          <%= assigns[:current_user].player_score %>
+        </div>
+      </a>
+    </div>
 
+    <div class="relative flex justify-center bg-white rounded-lg shadow-lg">
+      <span class="text-2xl font-semibold text-gray-600 font-poppins pr-80"> Training Volume </span>
+      <span class="text-2xl font-semibold text-gray-600 font-poppins pl-80"> Current Weight </span>
+    </div>
 
-      </div>
-
-      <div class="relative flex justify-center bg-white rounded-lg shadow-lg">
-        <span class="text-2xl font-semibold text-gray-600 font-poppins pr-80"> Training Volume </span>
-        <span class="text-2xl font-semibold text-gray-600 font-poppins pl-80"> Current Weight </span>
-      </div>
-
-      <div id="chart" phx-update="ignore" class="flex justify-items-center">
-        <% bar_data = Jason.encode!([["Total Sets", @chart_data.total_sets],["Total Reps", @chart_data.total_reps],["Total Weight", @chart_data.total_weight] ]) %>
-        <%= raw Chartkick.bar_chart bar_data, stacked: true, colors: ["#FF5733"] %>
-
-        <% datetime_data = Jason.encode!(%{"2023-03-10 00:00:00 -0800": 45, "2023-06-10 00:00:00 -0800": 56, "2023-04-10 00:00:00 -0800": 54, "2023-09-10 00:00:00 -0200": 64, "2023-01-10 00:00:00 -0800": 84, "2023-07-10 00:00:00 -0800": 74, "2023-02-10 00:00:00 -0800": 64}) %>
-        <%= raw Chartkick.area_chart datetime_data, colors: ["#58D68D"] %>
-      </div>
+    <div id="chart" phx-update="ignore" class="flex justify-items-center">
+      <% bar_data =
+        Jason.encode!([
+          ["Total Sets", @chart_data.total_sets],
+          ["Total Reps", @chart_data.total_reps],
+          ["Total Weight", @chart_data.total_weight]
+        ]) %>
+      <%= raw(Chartkick.bar_chart(bar_data, stacked: true, colors: ["#FF5733"])) %>
 
+      <% datetime_data =
+        Jason.encode!(%{
+          "2023-03-10 00:00:00 -0800": 45,
+          "2023-06-10 00:00:00 -0800": 56,
+          "2023-04-10 00:00:00 -0800": 54,
+          "2023-09-10 00:00:00 -0200": 64,
+          "2023-01-10 00:00:00 -0800": 84,
+          "2023-07-10 00:00:00 -0800": 74,
+          "2023-02-10 00:00:00 -0800": 64
+        }) %>
+      <%= raw(Chartkick.area_chart(datetime_data, colors: ["#58D68D"])) %>
+    </div>
     """
   end
 
diff --git a/lib/fitness_web/live/user_auth_live.ex b/lib/fitness_web/live/user_auth_live.ex
index 9844bc9..a40a65a 100644
--- a/lib/fitness_web/live/user_auth_live.ex
+++ b/lib/fitness_web/live/user_auth_live.ex
@@ -1,14 +1,12 @@
 defmodule FitnessWeb.UserAuthLive do
-  import Phoenix.LiveView
+  import Phoenix.Component
   alias Fitness.Accounts
 
   def on_mount(:user, _params, %{"user_token" => user_token} = _session, socket) do
-
     socket =
       socket
       |> assign(:current_user, Accounts.get_user_by_session_token(user_token))
-    
-      {:cont, socket}
 
+    {:cont, socket}
   end
 end
diff --git a/lib/fitness_web/live/workout_template_live/check_boxes_live_component.ex b/lib/fitness_web/live/workout_template_live/check_boxes_live_component.ex
index 3f8fc28..88f5dbd 100644
--- a/lib/fitness_web/live/workout_template_live/check_boxes_live_component.ex
+++ b/lib/fitness_web/live/workout_template_live/check_boxes_live_component.ex
@@ -1,98 +1,120 @@
 defmodule FitnessWeb.WorkoutTemplateLive.CheckBoxesLiveComponent do
   use FitnessWeb, :live_component
 
-  alias Fitness.WorkoutTemplates
-  alias Fitness.WorkoutTemplates.WorkoutItem
-  alias Fitness.Exercises
-
   @impl true
   def update(assigns, socket) do
-
     {:ok,
-    socket
-    |> assign(:workout_template, assigns.workout_template)
-    |> assign(:changeset, assigns.changeset)
-    |> assign(:update_param, %{})
-    |> assign(:time, ~T[00:00:00])
-    |> assign(:timer_status, assigns.timer_status)
-    |> assign(:workout_start, assigns.workout_start)}
+     socket
+     |> assign(:workout_template, assigns.workout_template)
+     |> assign(:changeset, assigns.changeset)
+     |> assign(:update_param, %{})
+     |> assign(:time, ~T[00:00:00])
+     |> assign(:timer_status, assigns.timer_status)
+     |> assign(:workout_start, assigns.workout_start)}
   end
 
+  @impl true
   def render(assigns) do
     ~H"""
     <div class="p-8 bg-white">
+      <%= if @workout_template.workout_items != [] do %>
+        <div class="p-6 mb-8 bg-purple-300 rounded-lg shadow-lg">
+          <div class="p-8 mb-10 rounded-lg">
+            <% list_of_same_exercise =
+              Enum.group_by(@workout_template.workout_items, fn each -> each.exercise_id end)
+              |> Map.values() %>
 
-    <%= if @workout_template.workout_items != [] do %>
-    <div class="p-6 mb-8 bg-purple-300 rounded-lg shadow-lg">
+            <%= for each_list <- list_of_same_exercise do %>
+              <% [workout_item_map | _] = each_list %>
+              <div class="p-4 mb-4 transition duration-200 transform bg-gray-100 rounded-lg shadow-md hover:scale-105">
+                <div class="flex items-center justify-between mb-4">
+                  <a href={"/exercises/#{workout_item_map.exercise_id}"}>
+                    <h2 class="text-lg text-gray-800 font-poppins">
+                      <%= Fitness.Exercises.get_exercise!(workout_item_map.exercise_id).name %> (<%= Fitness.Exercises.get_exercise!(
+                        workout_item_map.exercise_id
+                      ).body_part %>)
+                    </h2>
+                  </a>
+                  <span class="px-2 py-1 text-sm font-semibold text-white bg-yellow-400 rounded-full hover:bg-yellow-600 font-poppins">
+                    <%= length(each_list) %> sets
+                  </span>
+                </div>
 
+                <table class="w-full">
+                  <thead class="border-b border-pink-400">
+                    <tr class="text-gray-600 font-poppins">
+                      <th class="py-2 text-left">Sets</th>
+                      <th class="py-2 text-left">Reps</th>
+                      <th class="py-2 text-left">Weight</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <%= for workout_item <- each_list do %>
+                      <.form :let={f} for={@changeset} id={"created-workout-item-#{workout_item.id}"}>
+                        <tr class=" font-poppins">
+                          <td class="py-2 text-gray-800">
+                            <%= workout_item.sets %>
+                          </td>
+                          <td class="py-2 text-gray-800">
+                            <%= workout_item.reps %>
+                          </td>
+                          <td class="py-2 pr-0 text-gray-800">
+                            <%= workout_item.weight %>
+                          </td>
 
-    <div class="p-8 mb-10 rounded-lg">
-    <% list_of_same_exercise = Enum.group_by(@workout_template.workout_items, fn each -> each.exercise_id end) |> Map.values() %>
+                          <td class="py-2 pr-0 text-gray-800">
+                            <%= workout_item.weight_unit %>
+                          </td>
 
-    <%= for each_list <- list_of_same_exercise do %>
-    <% [workout_item_map | _] = each_list %>
-      <div class="p-4 mb-4 transition duration-200 transform bg-gray-100 rounded-lg shadow-md hover:scale-105">
-          <div class="flex items-center justify-between mb-4">
-            <a href={"/exercises/#{workout_item_map.exercise_id}"}>
-                <h2 class="text-lg text-gray-800 font-poppins"><%= Fitness.Exercises.get_exercise!(workout_item_map.exercise_id).name %> (<%= Fitness.Exercises.get_exercise!(workout_item_map.exercise_id).body_part %>)</h2>
-            </a>
-            <span class="px-2 py-1 text-sm font-semibold text-white bg-yellow-400 rounded-full hover:bg-yellow-600 font-poppins"><%= length(each_list) %> sets</span>
+                          <td class="py-2 text-gray-800">
+                            <%= if @workout_start != :not_begin do %>
+                              <label class="checkbox-btn">
+                                <label for="checkbox"></label>
+                                <%= checkbox(f, :check_box,
+                                  value: workout_item.check_box,
+                                  class:
+                                    "form-checkbox h-5 w-5 rounded-full text-purple-500 transition duration-150 ease-in-out",
+                                  phx_click: "workout_complete",
+                                  phx_value_id: workout_item.id
+                                ) %>
+                                <span class="rounded-lg checkmark"></span>
+                              </label>
+                            <% else %>
+                              <span>
+                                <svg
+                                  class="w-4 h-4 fill-current text-grey-400 hover:text-grey-600"
+                                  version="1.0"
+                                  xmlns="http://www.w3.org/2000/svg"
+                                  xmlns:xlink="http://www.w3.org/1999/xlink"
+                                  viewBox="0 0 64 64"
+                                  enable-background="new 0 0 64 64"
+                                  xml:space="preserve"
+                                  fill="#000000"
+                                >
+                                  <g stroke-width="0"></g>
+                                  <g stroke-linecap="round" stroke-linejoin="round"></g>
+                                  <g>
+                                    <path
+                                      fill="#231F20"
+                                      d="M52,24h-4v-8c0-8.836-7.164-16-16-16S16,7.164,16,16v8h-4c-2.211,0-4,1.789-4,4v32c0,2.211,1.789,4,4,4h40 c2.211,0,4-1.789,4-4V28C56,25.789,54.211,24,52,24z M32,48c-2.211,0-4-1.789-4-4s1.789-4,4-4s4,1.789,4,4S34.211,48,32,48z M40,24 H24v-8c0-4.418,3.582-8,8-8s8,3.582,8,8V24z"
+                                    >
+                                    </path>
+                                  </g>
+                                </svg>
+                              </span>
+                            <% end %>
+                          </td>
+                        </tr>
+                      </.form>
+                    <% end %>
+                  </tbody>
+                </table>
+              </div>
+            <% end %>
           </div>
-
-          <table class="w-full">
-          <thead class="border-b border-pink-400">
-            <tr class="text-gray-600 font-poppins">
-                <th class="py-2 text-left">Sets</th>
-                <th class="py-2 text-left">Reps</th>
-                <th class="py-2 text-left">Weight</th>
-            </tr>
-          </thead>
-          <tbody>
-          <%= for workout_item <- each_list do%>
-          <.form
-          let={f}
-          for={@changeset}
-          id={"created-workout-item-#{workout_item.id}"}
-          >
-            <tr class=" font-poppins">
-            <td class="py-2 text-gray-800">
-                <%= workout_item.sets %>
-                </td>
-                <td class="py-2 text-gray-800">
-                <%= workout_item.reps %>
-                </td>
-                <td class="py-2 pr-0 text-gray-800">
-                <%= workout_item.weight %>
-                </td>
-
-                <td class="py-2 pr-0 text-gray-800">
-                <%= workout_item.weight_unit %>
-                </td>
-
-                <td class="py-2 text-gray-800">
-                <%= if @workout_start != :not_begin do %>
-                <label class="checkbox-btn">
-                    <label for="checkbox"></label>
-                    <%= checkbox f, :check_box, value: workout_item.check_box,  class: "form-checkbox h-5 w-5 rounded-full text-purple-500 transition duration-150 ease-in-out", phx_click: "workout_complete", phx_value_id: workout_item.id %>
-                    <span class="rounded-lg checkmark"></span>
-                </label>
-                  <% else %>
-                  <span><svg class="w-4 h-4 fill-current text-grey-400 hover:text-grey-600" version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve" fill="#000000"><g stroke-width="0"></g><g  stroke-linecap="round" stroke-linejoin="round"></g><g> <path fill="#231F20" d="M52,24h-4v-8c0-8.836-7.164-16-16-16S16,7.164,16,16v8h-4c-2.211,0-4,1.789-4,4v32c0,2.211,1.789,4,4,4h40 c2.211,0,4-1.789,4-4V28C56,25.789,54.211,24,52,24z M32,48c-2.211,0-4-1.789-4-4s1.789-4,4-4s4,1.789,4,4S34.211,48,32,48z M40,24 H24v-8c0-4.418,3.582-8,8-8s8,3.582,8,8V24z"></path> </g></svg></span>
-                  <% end %>
-                </td>
-              </tr>
-            </.form>
-              <% end %>
-            </tbody>
-          </table>
         </div>
       <% end %>
-      </div>
-      </div>
-      <% end %>
     </div>
-
     """
   end
-
 end
diff --git a/lib/fitness_web/live/workout_template_live/form_component.ex b/lib/fitness_web/live/workout_template_live/form_component.ex
index e6e9680..ab5afe8 100644
--- a/lib/fitness_web/live/workout_template_live/form_component.ex
+++ b/lib/fitness_web/live/workout_template_live/form_component.ex
@@ -2,7 +2,6 @@ defmodule FitnessWeb.WorkoutTemplateLive.FormComponent do
   use FitnessWeb, :live_component
 
   alias Fitness.WorkoutTemplates
-  alias FitnessWeb.WorkoutTemplateLive.WorkoutItemForm
 
   @impl true
   def update(%{workout_template: workout_template} = assigns, socket) do
@@ -15,7 +14,7 @@ defmodule FitnessWeb.WorkoutTemplateLive.FormComponent do
   end
 
   @impl true
-  def handle_event("validate", %{"workout_template" => workout_template_params} , socket) do
+  def handle_event("validate", %{"workout_template" => workout_template_params}, socket) do
     changeset =
       socket.assigns.workout_template
       |> WorkoutTemplates.change_workout_template(workout_template_params)
@@ -25,34 +24,37 @@ defmodule FitnessWeb.WorkoutTemplateLive.FormComponent do
   end
 
   def handle_event("save", %{"workout_template" => workout_template_params}, socket) do
-
     save_workout_template(socket, socket.assigns.action, workout_template_params)
   end
 
-
   defp save_workout_template(socket, :edit, workout_template_params) do
-    case WorkoutTemplates.update_workout_template(socket.assigns.workout_template, workout_template_params) do
+    case WorkoutTemplates.update_workout_template(
+           socket.assigns.workout_template,
+           workout_template_params
+         ) do
       {:ok, workout_template} ->
         {:noreply,
          socket
          |> put_flash(:info, "Workout template updated successfully")
-         |> push_redirect(to: "/workout_templates/#{workout_template.id}")}
+         |> push_navigate(to: "/workout_templates/#{workout_template.id}")}
 
-         {:error, %Ecto.Changeset{} = changeset} ->
+      {:error, %Ecto.Changeset{} = changeset} ->
         {:noreply, assign(socket, :changeset, changeset)}
-      end
     end
+  end
 
   defp save_workout_template(socket, :new, workout_template_params) do
-    case WorkoutTemplates.create_workout_template(Map.put(workout_template_params,"user_id", socket.assigns.user_id)) do
+    case WorkoutTemplates.create_workout_template(
+           Map.put(workout_template_params, "user_id", socket.assigns.user_id)
+         ) do
       {:ok, workout_template} ->
         {:noreply,
-        socket
-        |> put_flash(:info, "Workout template created successfully")
-        |> push_redirect(to: "/workout_templates/#{workout_template.id}")}
+         socket
+         |> put_flash(:info, "Workout template created successfully")
+         |> push_navigate(to: "/workout_templates/#{workout_template.id}")}
 
       {:error, %Ecto.Changeset{} = changeset} ->
-     {:noreply, assign(socket, changeset: changeset)}
+        {:noreply, assign(socket, changeset: changeset)}
     end
   end
 end
diff --git a/lib/fitness_web/live/workout_template_live/form_component.html.heex b/lib/fitness_web/live/workout_template_live/form_component.html.heex
index 8747378..ce1d25a 100644
--- a/lib/fitness_web/live/workout_template_live/form_component.html.heex
+++ b/lib/fitness_web/live/workout_template_live/form_component.html.heex
@@ -1,22 +1,29 @@
 <div class="p-6 bg-white rounded-lg">
-    <h2 class="flex items-center justify-center pt-0 mb-4 text-3xl font-poppins"><%= @title %></h2>
-  
-    <.form
-      let={f}
-      for={@changeset}
-      id="workout_template-form"
-      phx-target={@myself}
-      phx-change="validate"
-      phx-submit="save">
-  
-      <div class="flex justify-end">
-        <%= submit "Save", class: "bg-blue-500 hover:bg-blue-700 font-poppins text-white py-2 px-4 rounded focus:outline-none focus:shadow-outline", phx_disable_with: "Saving..." %>
-      </div>
-      <div class="mb-4">
-        <%= label f, :name, class: "block text-gray-700 font-bold mb-2" %>
-        <%= text_input f, :name, class: "w-full font-poppins border rounded py-2 px-3 leading-tight focus:outline-none focus:shadow-outline", placeholder: "Enter workout name" %>
-        <%= error_tag f, :name %>
-      </div>
-    </.form> 
-  </div>
-  
\ No newline at end of file
+  <h2 class="flex items-center justify-center pt-0 mb-4 text-3xl font-poppins"><%= @title %></h2>
+
+  <.form
+    :let={f}
+    for={@changeset}
+    id="workout_template-form"
+    phx-target={@myself}
+    phx-change="validate"
+    phx-submit="save"
+  >
+    <div class="flex justify-end">
+      <%= submit("Save",
+        class:
+          "bg-blue-500 hover:bg-blue-700 font-poppins text-white py-2 px-4 rounded focus:outline-none focus:shadow-outline",
+        phx_disable_with: "Saving..."
+      ) %>
+    </div>
+    <div class="mb-4">
+      <%= label(f, :name, class: "block text-gray-700 font-bold mb-2") %>
+      <%= text_input(f, :name,
+        class:
+          "w-full font-poppins border rounded py-2 px-3 leading-tight focus:outline-none focus:shadow-outline",
+        placeholder: "Enter workout name"
+      ) %>
+      <%= error_tag(f, :name) %>
+    </div>
+  </.form>
+</div>
diff --git a/lib/fitness_web/live/workout_template_live/index.ex b/lib/fitness_web/live/workout_template_live/index.ex
index c402c50..266a50e 100644
--- a/lib/fitness_web/live/workout_template_live/index.ex
+++ b/lib/fitness_web/live/workout_template_live/index.ex
@@ -3,7 +3,6 @@ defmodule FitnessWeb.WorkoutTemplateLive.Index do
 
   alias Fitness.WorkoutTemplates
   alias Fitness.WorkoutTemplates.WorkoutTemplate
-  alias Fitness.Accounts
 
   @impl true
   def mount(_params, _session, socket) do
diff --git a/lib/fitness_web/live/workout_template_live/index.html.heex b/lib/fitness_web/live/workout_template_live/index.html.heex
index 49861e0..268b2f8 100644
--- a/lib/fitness_web/live/workout_template_live/index.html.heex
+++ b/lib/fitness_web/live/workout_template_live/index.html.heex
@@ -1,58 +1,90 @@
 <div class="p-6 mb-8 bg-blue-100 rounded-lg shadow-lg">
-  <h1 class="flex items-center justify-center pt-0 mb-4 text-3xl font-poppins">Listing Workout templates</h1>
- 
-<%= if @live_action in [:new, :edit] do %>
-  <.modal return_to={Routes.workout_template_index_path(@socket, :index)}>
-    <.live_component
-      module={FitnessWeb.WorkoutTemplateLive.FormComponent}
-      id={@workout_template.id || :new}
-      user_id={@current_user.id}
-      title={@page_title}
-      action={@live_action}
-      workout_template={@workout_template}
-      return_to={Routes.workout_template_index_path(@socket, :index)}
-    />
-  </.modal>
-<% end %>
+  <h1 class="flex items-center justify-center pt-0 mb-4 text-3xl font-poppins">
+    Listing Workout templates
+  </h1>
+
+  <%= if @live_action in [:new, :edit] do %>
+    <.modal return_to={Routes.workout_template_index_path(@socket, :index)}>
+      <.live_component
+        module={FitnessWeb.WorkoutTemplateLive.FormComponent}
+        id={@workout_template.id || :new}
+        user_id={@current_user.id}
+        title={@page_title}
+        action={@live_action}
+        workout_template={@workout_template}
+        return_to={Routes.workout_template_index_path(@socket, :index)}
+      />
+    </.modal>
+  <% end %>
 
- 
   <div class="flex justify-end mb-4">
-    <%= live_patch "New Workout", to: Routes.workout_template_index_path(@socket, :new), class: "bg-blue-500 font-poppins hover:bg-blue-600 text-white rounded-lg px-3 py-2" %>
-  </div>  
-      
-      <%= if length(@workout_templates) >= 1 do %>
-      <% user_template_owner = Enum.filter(@workout_templates, fn each -> each.user_id == assigns[:current_user].id end) %>
-      
-      <div class="grid grid-cols-1 gap-4">
-      <% workout_templates_list_is_finished_false = Enum.reject(user_template_owner, fn each -> each.is_finished == true end) %>
+    <.link
+      patch={Routes.workout_template_index_path(@socket, :new)}
+      class="bg-blue-500 font-poppins hover:bg-blue-600 text-white rounded-lg px-3 py-2"
+    >
+      New Workout
+    </.link>
+  </div>
+
+  <%= if length(@workout_templates) >= 1 do %>
+    <% user_template_owner =
+      Enum.filter(@workout_templates, fn each -> each.user_id == assigns[:current_user].id end) %>
+
+    <div class="grid grid-cols-1 gap-4">
+      <% workout_templates_list_is_finished_false =
+        Enum.reject(user_template_owner, fn each -> each.is_finished == true end) %>
       <%= for workout_template <- Enum.reverse(workout_templates_list_is_finished_false) do %>
-        <div id={"workout_template-#{workout_template.id}"}, class="relative bg-white rounded-lg shadow-lg">
-      
+        <div
+          id={"workout_template-#{workout_template.id}"}
+          ,
+          class="relative bg-white rounded-lg shadow-lg"
+        >
           <div class="px-6 py-4">
-            <a href={"/workout_templates/#{workout_template.id}"} class="mb-2 text-xl font-poppins"><%= String.upcase(workout_template.name) %></a>
+            <a
+              href={"/workout_templates/#{workout_template.id}"}
+              class="mb-2 text-xl font-poppins"
+            >
+              <%= String.upcase(workout_template.name) %>
+            </a>
           </div>
-            <span class="pt-4 pl-6 mr-2 text-base text-gray-500">No pain, no gain</span>
+          <span class="pt-4 pl-6 mr-2 text-base text-gray-500">No pain, no gain</span>
           <div class="absolute top-0 right-0 m-4">
             <%= if assigns[:current_user] do %>
-            <button class="button">
-              <%= link to: "#", phx_click: "delete", phx_value_id: workout_template.id do %>
-                <svg class="svgIcon" viewBox="0 0 448 512"><path d="M135.2 17.7L128 32H32C14.3 32 0 46.3 0 64S14.3 96 32 96H416c17.7 0 32-14.3 32-32s-14.3-32-32-32H320l-7.2-14.3C307.4 6.8 296.3 0 284.2 0H163.8c-12.1 0-23.2 6.8-28.6 17.7zM416 128H32L53.2 467c1.6 25.3 22.6 45 47.9 45H346.9c25.3 0 46.3-19.7 47.9-45L416 128z"></path></svg>
-                <p class="hidden">
-                  Delete
-                </p>
-              <% end %>
-            </button>
-                <% end %>
-              </div>
-              <div class="flex justify-between px-6 py-6">
-                
-                <span><%= live_redirect "Show", to: Routes.workout_template_show_path(@socket, :show, workout_template), class: "bg-blue-500 hover:bg-blue-600 text-white rounded-lg font-poppins px-4 py-2 mr-2 " %></span>
-                <%= if assigns[:current_user] do %>
-                <span><%= live_patch "Edit", to: Routes.workout_template_index_path(@socket, :edit, workout_template), class: "text-orange-400 font-poppins text-xl hover:underline" %></span>
+              <button class="button">
+                <%= link to: "#", phx_click: "delete", phx_value_id: workout_template.id do %>
+                  <svg class="svgIcon" viewBox="0 0 448 512">
+                    <path d="M135.2 17.7L128 32H32C14.3 32 0 46.3 0 64S14.3 96 32 96H416c17.7 0 32-14.3 32-32s-14.3-32-32-32H320l-7.2-14.3C307.4 6.8 296.3 0 284.2 0H163.8c-12.1 0-23.2 6.8-28.6 17.7zM416 128H32L53.2 467c1.6 25.3 22.6 45 47.9 45H346.9c25.3 0 46.3-19.7 47.9-45L416 128z">
+                    </path>
+                  </svg>
+                  <p class="hidden">
+                    Delete
+                  </p>
                 <% end %>
-              </div>
-            </div>
+              </button>
             <% end %>
-          </div> 
-          <% end %>
-    </div>
\ No newline at end of file
+          </div>
+          <div class="flex justify-between px-6 py-6">
+            <span>
+              <.link
+                navigate={Routes.workout_template_show_path(@socket, :show, workout_template)}
+                class="bg-blue-500 hover:bg-blue-600 text-white rounded-lg font-poppins px-4 py-2 mr-2 "
+              >
+                Show
+              </.link>
+            </span>
+            <%= if assigns[:current_user] do %>
+              <span>
+                <.link
+                  patch={Routes.workout_template_index_path(@socket, :edit, workout_template)}
+                  class="text-orange-400 font-poppins text-xl hover:underline"
+                >
+                  Edit
+                </.link>
+              </span>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+</div>
diff --git a/lib/fitness_web/live/workout_template_live/show.ex b/lib/fitness_web/live/workout_template_live/show.ex
index 25bd1e3..43db1dc 100644
--- a/lib/fitness_web/live/workout_template_live/show.ex
+++ b/lib/fitness_web/live/workout_template_live/show.ex
@@ -2,7 +2,7 @@ defmodule FitnessWeb.WorkoutTemplateLive.Show do
   use FitnessWeb, :live_view
 
   alias Fitness.WorkoutTemplates
-  alias Fitness.Accounts
+
   alias Fitness.WorkoutTemplates.WorkoutItem
   alias Fitness.Exercises
   alias Fitness.WorkoutTemplates.ComplexQuery
diff --git a/lib/fitness_web/live/workout_template_live/show.html.heex b/lib/fitness_web/live/workout_template_live/show.html.heex
index 563e3a0..baa8ba8 100644
--- a/lib/fitness_web/live/workout_template_live/show.html.heex
+++ b/lib/fitness_web/live/workout_template_live/show.html.heex
@@ -1,119 +1,200 @@
 <div class="p-6 mb-8 bg-blue-100 rounded-lg shadow-lg">
+  <h1 class="flex items-center justify-center pt-3 mb-4 text-4xl font-light font-poppins ">
+    <%= String.upcase(@workout_template.name) %>
+  </h1>
 
-   <h1 class="flex items-center justify-center pt-3 mb-4 text-4xl font-light font-poppins "><%= String.upcase(@workout_template.name) %></h1>
-   
-   <div class="flex items-center justify-between px-6 pr-8">
-      <%= if length(@workout_template.workout_items) >= 6 do %>
-      <a href={"#{@workout_template.id}/show/workout_zone"} class="relative inline-flex items-center justify-center p-6 px-8 py-3 overflow-hidden font-medium text-indigo-600 transition duration-300 ease-out border-2 border-purple-500 rounded-full shadow-md group">
-         <span class="absolute inset-0 flex items-center justify-center w-full h-full text-white duration-300 -translate-x-full bg-purple-500 group-hover:translate-x-0 ease">
-         <svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14 5l7 7m0 0l-7 7m7-7H3"></path></svg>
-         </span>
-         <span class="absolute flex items-center justify-center w-full h-full text-gray-600 transition-all duration-300 transform font-poppins group-hover:translate-x-full ease">Start Workout</span>
-         <span class="relative invisible">Start Workout</span>
-         </a>
-      <% else %>
-      <button></button>    
+  <div class="flex items-center justify-between px-6 pr-8">
+    <%= if length(@workout_template.workout_items) >= 6 do %>
+      <a
+        href={"#{@workout_template.id}/show/workout_zone"}
+        class="relative inline-flex items-center justify-center p-6 px-8 py-3 overflow-hidden font-medium text-indigo-600 transition duration-300 ease-out border-2 border-purple-500 rounded-full shadow-md group"
+      >
+        <span class="absolute inset-0 flex items-center justify-center w-full h-full text-white duration-300 -translate-x-full bg-purple-500 group-hover:translate-x-0 ease">
+          <svg
+            class="w-6 h-6"
+            fill="none"
+            stroke="currentColor"
+            viewBox="0 0 24 24"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="2"
+              d="M14 5l7 7m0 0l-7 7m7-7H3"
+            >
+            </path>
+          </svg>
+        </span>
+        <span class="absolute flex items-center justify-center w-full h-full text-gray-600 transition-all duration-300 transform font-poppins group-hover:translate-x-full ease">
+          Start Workout
+        </span>
+        <span class="relative invisible">Start Workout</span>
+      </a>
+    <% else %>
+      <button></button>
+    <% end %>
+    <span>
+      <button class="px-4 py-2 text-white bg-gray-500 rounded-lg font-poppins hover:bg-gray-600">
+        <.link
+          navigate={Routes.workout_template_index_path(@socket, :index)}
+          class="px-4 py-2 text-white bg-gray-500 rounded-lg font-poppins hover:bg-gray-600"
+        >
+          Back
+        </.link>
+      </button>
+    </span>
+  </div>
+  <%= if @workout_template.workout_items == [] do %>
+    <div class="flex items-center justify-center px-6 pr-8">
+      <%= if assigns[:current_user] do %>
+        <span>
+          <button class="px-4 py-2 mr-2 text-white bg-blue-500 rounded-lg font-poppins hover:bg-blue-600">
+            <.link patch={Routes.workout_template_show_path(@socket, :edit, @workout_template)}>
+              ADD EXERCISE
+            </.link>
+          </button>
+        </span>
       <% end %>
-      <span><button class="px-4 py-2 text-white bg-gray-500 rounded-lg font-poppins hover:bg-gray-600"><%= live_redirect "Back", to: Routes.workout_template_index_path(@socket, :index) %></button></span>
-   </div>
-   <%= if @workout_template.workout_items == [] do %>
-   <div class="flex items-center justify-center px-6 pr-8">
-   <%= if assigns[:current_user] do %>
-   <span><button class="px-4 py-2 mr-2 text-white bg-blue-500 rounded-lg font-poppins hover:bg-blue-600"><%= live_patch "ADD EXERCISE", to: Routes.workout_template_show_path(@socket, :edit, @workout_template) %></button></span>
-   <% end %>
-</div>
-<% end %>
+    </div>
+  <% end %>
 
-   <%= if @live_action in [:edit] do %>
-   <.modal return_to={Routes.workout_template_show_path(@socket, :show, @workout_template)}>
+  <%= if @live_action in [:edit] do %>
+    <.modal return_to={Routes.workout_template_show_path(@socket, :show, @workout_template)}>
       <.live_component
-      module={FitnessWeb.WorkoutTemplateLive.WorkoutItemForm}
-      id={@workout_template.id}
-      title={@page_title}
-      action={@live_action}
-      workout_template={@workout_template}
-      return_to={Routes.workout_template_show_path(@socket, :show, @workout_template)}
+        module={FitnessWeb.WorkoutTemplateLive.WorkoutItemForm}
+        id={@workout_template.id}
+        title={@page_title}
+        action={@live_action}
+        workout_template={@workout_template}
+        return_to={Routes.workout_template_show_path(@socket, :show, @workout_template)}
       />
-   </.modal>
-   <% end %>
-   
-   <%= if @workout_template.workout_items != [] do %>
+    </.modal>
+  <% end %>
+
+  <%= if @workout_template.workout_items != [] do %>
+    <div class="p-8 mb-10 rounded-lg">
+      <% list_of_same_exercise =
+        Enum.group_by(@workout_template.workout_items, fn each -> each.exercise_id end)
+        |> Map.values() %>
 
-      
+      <%= for each_list <- list_of_same_exercise do %>
+        <% [workout_item_map | _] = each_list %>
+        <div class="p-4 mb-4 transition duration-300 transform bg-gray-100 rounded-lg shadow-md hover:scale-105">
+          <div class="flex items-center justify-between mb-4">
+            <a href={"/exercises/#{workout_item_map.exercise_id}"}>
+              <h2 class="text-lg text-gray-800 font-poppins">
+                <%= Fitness.Exercises.get_exercise!(workout_item_map.exercise_id).name %> (<%= Fitness.Exercises.get_exercise!(
+                  workout_item_map.exercise_id
+                ).body_part %>)
+              </h2>
+            </a>
+            <span class="px-2 py-1 text-sm font-semibold text-white bg-yellow-400 rounded-full hover:bg-yellow-600 font-poppins">
+              <%= length(each_list) %> sets
+            </span>
+          </div>
+          <table class="w-full">
+            <thead class="border-b border-gray-300">
+              <tr class="text-gray-600 font-poppins">
+                <th class="py-2 text-left">Sets</th>
+                <th class="py-2 text-left">Reps</th>
+                <th class="py-2 text-left">Weight</th>
+              </tr>
+            </thead>
+            <% last_workout_item = Enum.at(each_list, -1) %>
+            <%= for workout_item <- each_list do %>
+              <.form
+                :let={f}
+                for={@changeset}
+                id={"created-workout-item-#{workout_item.id}"}
+                phx-change="workout-update"
+              >
+                <tbody>
+                  <tr class="border-gray-300 font-poppins">
+                    <td class="py-2 text-gray-800">
+                      <%= hidden_input(f, :sets, disabled: false, value: workout_item.sets) %>
+                      <%= hidden_input(f, :workout_template_id,
+                        disabled: false,
+                        value: workout_item.workout_template_id
+                      ) %>
+                      <%= workout_item.sets %>
+                    </td>
+                    <td class="py-2 text-gray-800">
+                      <%= hidden_input(f, :exercise_id,
+                        disabled: false,
+                        value: workout_item.exercise_id
+                      ) %>
+                      <%= number_input(f, :reps,
+                        disabled: false,
+                        value: workout_item.reps,
+                        class: "form-input font-poppins rounded-md shadow-sm mt-1 block w-full"
+                      ) %>
+                      <%= error_tag(f, :reps) %>
+                    </td>
+                    <td class="py-2 text-gray-800">
+                      <%= hidden_input(f, :id, value: workout_item.id) %>
+                      <%= number_input(f, :weight,
+                        step: "any",
+                        value: workout_item.weight,
+                        class: "form-input font-poppins rounded-md shadow-sm mt-1 block w-full"
+                      ) %>
+                      <%= error_tag(f, :weight) %>
+                    </td>
+                    <td class="py-2 text-gray-800">
+                      <%= hidden_input(f, :weight_unit,
+                        disabled: false,
+                        value: workout_item.weight_unit
+                      ) %>
+                      <%= workout_item.weight_unit %>
+                    </td>
+                    <td>
+                      <button>
+                        <%= link to: "#", phx_click: "delete", phx_value_id: workout_item.id do %>
+                          <svg
+                            class="w-6 h-6 text-red-500 fill-current hover:text-red-700"
+                            xmlns="http://www.w3.org/2000/svg"
+                            viewBox="0 0 24 24"
+                          >
+                            <path d="M12 10.586l3.293-3.293a1 1 0 0 1 1.414 1.414L13.414 12l3.293 3.293a1 1 0 1 1-1.414 1.414L12 13.414l-3.293 3.293a1 1 0 1 1-1.414-1.414L10.586 12 7.293 8.707a1 1 0 0 1 1.414-1.414L12 10.586z" />
+                          </svg>
+                        <% end %>
+                      </button>
+                    </td>
+                  </tr>
+                </tbody>
+              </.form>
+            <% end %>
+          </table>
+          <div class="flex justify-center pt-4">
+            <button class="flex justify-center px-4 py-2 text-white bg-blue-500 rounded hover:bg-blue-700 font-poppins">
+              <%= link("ADD SET",
+                to: "#",
+                phx_click: "add-set",
+                phx_value_exercise_id: last_workout_item.exercise_id,
+                phx_value_reps: last_workout_item.reps,
+                phx_value_sets: last_workout_item.sets,
+                phx_value_weight: last_workout_item.weight,
+                phx_value_weight_unit: last_workout_item.weight_unit,
+                phx_value_workout_template_id: last_workout_item.workout_template_id
+              ) %>
+            </button>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
 
-<div class="p-8 mb-10 rounded-lg">
-   <% list_of_same_exercise = Enum.group_by(@workout_template.workout_items, fn each -> each.exercise_id end) |> Map.values() %>
-   
-   <%= for each_list <- list_of_same_exercise do %>
-   <% [workout_item_map | _] = each_list %>
-   <div class="p-4 mb-4 transition duration-300 transform bg-gray-100 rounded-lg shadow-md hover:scale-105">
-      <div class="flex items-center justify-between mb-4">
-         <a href={"/exercises/#{workout_item_map.exercise_id}"}>
-            <h2 class="text-lg text-gray-800 font-poppins"><%= Fitness.Exercises.get_exercise!(workout_item_map.exercise_id).name %> (<%= Fitness.Exercises.get_exercise!(workout_item_map.exercise_id).body_part %>)</h2>
-         </a>
-         <span class="px-2 py-1 text-sm font-semibold text-white bg-yellow-400 rounded-full hover:bg-yellow-600 font-poppins"><%= length(each_list) %> sets</span>
-      </div>
-      <table class="w-full">
-         <thead class="border-b border-gray-300">
-            <tr class="text-gray-600 font-poppins">
-               <th class="py-2 text-left">Sets</th>
-               <th class="py-2 text-left">Reps</th>
-               <th class="py-2 text-left">Weight</th>
-            </tr>
-         </thead>
-         <% last_workout_item = Enum.at(each_list, -1) %>
-         <%= for workout_item <- each_list do%>
-         <.form
-         let={f}
-         for={@changeset}
-         id={"created-workout-item-#{workout_item.id}"}
-         phx-change="workout-update">
-         <tbody>
-            <tr class="border-gray-300 font-poppins">
-               <td class="py-2 text-gray-800">
-                  <%= hidden_input f, :sets, disabled: false, value: workout_item.sets %>
-                  <%= hidden_input f, :workout_template_id, disabled: false, value: workout_item.workout_template_id %>
-                  <%= workout_item.sets %>
-               </td>
-               <td class="py-2 text-gray-800">
-                  <%= hidden_input f, :exercise_id, disabled: false, value: workout_item.exercise_id %>
-                  <%= number_input f, :reps, disabled: false, value: workout_item.reps, class: "form-input font-poppins rounded-md shadow-sm mt-1 block w-full" %>
-                  <%= error_tag f, :reps %>
-               </td>
-               <td class="py-2 text-gray-800">
-                  <%= hidden_input f, :id, value: workout_item.id %>
-                  <%= number_input f, :weight,  step: "any", value: workout_item.weight, class: "form-input font-poppins rounded-md shadow-sm mt-1 block w-full" %>
-                  <%= error_tag f, :weight %>
-               </td>
-               <td class="py-2 text-gray-800">
-                  <%= hidden_input f, :weight_unit, disabled: false, value: workout_item.weight_unit %>
-                  <%= workout_item.weight_unit %>
-               </td>
-               <td>
-                  <button>
-                     <%= link to: "#", phx_click: "delete", phx_value_id: workout_item.id do %>
-                     <svg class="w-6 h-6 text-red-500 fill-current hover:text-red-700" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 10.586l3.293-3.293a1 1 0 0 1 1.414 1.414L13.414 12l3.293 3.293a1 1 0 1 1-1.414 1.414L12 13.414l-3.293 3.293a1 1 0 1 1-1.414-1.414L10.586 12 7.293 8.707a1 1 0 0 1 1.414-1.414L12 10.586z"/></svg>
-                     <% end %>
-                  </button>
-               </td>
-            </tr>
-         </tbody>
-      </.form>
+  <%= if @workout_template.workout_items != [] do %>
+    <div class="flex items-center justify-center px-6 pr-8">
+      <%= if assigns[:current_user] do %>
+        <span>
+          <button class="px-6 py-4 mr-2 text-white bg-blue-500 rounded-lg font-poppins hover:bg-blue-600">
+            <.link patch={Routes.workout_template_show_path(@socket, :edit, @workout_template)}>
+              ADD EXERCISE
+            </.link>
+          </button>
+        </span>
       <% end %>
-   </table>
-      <div class="flex justify-center pt-4">
-         <button class="flex justify-center px-4 py-2 text-white bg-blue-500 rounded hover:bg-blue-700 font-poppins"><%= link "ADD SET", to: "#", phx_click: "add-set", phx_value_exercise_id: last_workout_item.exercise_id, phx_value_reps: last_workout_item.reps, phx_value_sets: last_workout_item.sets, phx_value_weight: last_workout_item.weight, phx_value_weight_unit: last_workout_item.weight_unit, phx_value_workout_template_id: last_workout_item.workout_template_id  %></button>
-      </div>
-   </div>
-   <% end %>
-   </div>
-   <% end %>
-   
-<%= if @workout_template.workout_items != [] do %>
-<div class="flex items-center justify-center px-6 pr-8">
-   <%= if assigns[:current_user] do %>
-   <span><button class="px-6 py-4 mr-2 text-white bg-blue-500 rounded-lg font-poppins hover:bg-blue-600"><%= live_patch "ADD EXERCISE", to: Routes.workout_template_show_path(@socket, :edit, @workout_template) %></button></span>
-   <% end %>
+    </div>
+  <% end %>
 </div>
-<% end %>
-</div>
\ No newline at end of file
diff --git a/lib/fitness_web/live/workout_template_live/workout_item_form.ex b/lib/fitness_web/live/workout_template_live/workout_item_form.ex
index b48d9b4..36cb19c 100644
--- a/lib/fitness_web/live/workout_template_live/workout_item_form.ex
+++ b/lib/fitness_web/live/workout_template_live/workout_item_form.ex
@@ -27,53 +27,86 @@ defmodule FitnessWeb.WorkoutTemplateLive.WorkoutItemForm do
   @impl true
   def render(assigns) do
     ~H"""
-
-
     <div class="p-8 bg-white rounded-lg">
-    <h2 class="flex items-center justify-center pt-0 mb-4 text-3xl font-poppins">Add New Exercises</h2>
+      <h2 class="flex items-center justify-center pt-0 mb-4 text-3xl font-poppins">
+        Add New Exercises
+      </h2>
 
       <.form
-        let={f}
+        :let={f}
         for={@changeset}
         id="new-workout-item"
         phx-target={@myself}
         phx-change="updated_workout-item"
-        phx-submit="add_new_exercise">
-
-
+        phx-submit="add_new_exercise"
+      >
         <div class="grid grid-cols-1 gap-2">
           <div>
-            <label for="exercise_id" class="block mb-2 text-sm font-medium text-gray-700 font-poppins">Choose an exercise:</label>
-            <%= select f, :exercise_id, Enum.map(@exercises, fn exercise -> {exercise.name, exercise.id} end), value: @exercise_id, prompt: "Select an exercise", class: "form-select font-poppins block w-full rounded-md shadow-sm py-2 px-3 text-gray-700 bg-white focus:outline-none focus:ring focus:ring-blue-200 focus:border-blue-500 sm:text-sm" %>
-            <%= error_tag f, :exercise_id %>
+            <label for="exercise_id" class="block mb-2 text-sm font-medium text-gray-700 font-poppins">
+              Choose an exercise:
+            </label>
+            <%= select(
+              f,
+              :exercise_id,
+              Enum.map(@exercises, fn exercise -> {exercise.name, exercise.id} end),
+              value: @exercise_id,
+              prompt: "Select an exercise",
+              class:
+                "form-select font-poppins block w-full rounded-md shadow-sm py-2 px-3 text-gray-700 bg-white focus:outline-none focus:ring focus:ring-blue-200 focus:border-blue-500 sm:text-sm"
+            ) %>
+            <%= error_tag(f, :exercise_id) %>
           </div>
 
           <div class="grid grid-cols-3 gap-2">
-          <div>
-            <label for="sets" class="block mb-2 text-sm font-medium text-gray-700 font-poppins">Number of sets:</label>
-            <%= number_input f, :sets, value: @sets_number, disabled: true, class: "form-input font-poppins rounded-md shadow-sm mt-1 block w-full" %>
-            <%= error_tag f, :sets %>
-          </div>
-
-          <div>
-            <label for="reps" class="block mb-2 text-sm font-medium text-gray-700 font-poppins">Number of reps:</label>
-            <%= number_input f, :reps, value: @current_reps, disabled: false, class: "form-input font-poppins rounded-md shadow-sm mt-1 block w-full" %>
-            <%= error_tag f, :reps %>
-          </div>
+            <div>
+              <label for="sets" class="block mb-2 text-sm font-medium text-gray-700 font-poppins">
+                Number of sets:
+              </label>
+              <%= number_input(f, :sets,
+                value: @sets_number,
+                disabled: true,
+                class: "form-input font-poppins rounded-md shadow-sm mt-1 block w-full"
+              ) %>
+              <%= error_tag(f, :sets) %>
+            </div>
 
-          <div>
-            <label for="weight" class="block mb-2 text-sm font-medium text-gray-700 font-poppins">Weight:</label>
-            <div class="flex">
-              <%= number_input f, :weight, value: @current_weight,  step: "any", class: "form-input font-poppins rounded-md shadow-sm mt-1 block w-full" %>
-              <%= error_tag f, :weight %>
-              <%= select f, :weight_unit, ["kg", "lbs"], class: "form-select ml-2 rounded-md shadow-sm py-0 px-6 font-poppins text-gray-700 bg-white focus:outline-none focus:ring focus:ring-blue-200 focus:border-blue-500 sm:text-sm" %>
+            <div>
+              <label for="reps" class="block mb-2 text-sm font-medium text-gray-700 font-poppins">
+                Number of reps:
+              </label>
+              <%= number_input(f, :reps,
+                value: @current_reps,
+                disabled: false,
+                class: "form-input font-poppins rounded-md shadow-sm mt-1 block w-full"
+              ) %>
+              <%= error_tag(f, :reps) %>
             </div>
+
+            <div>
+              <label for="weight" class="block mb-2 text-sm font-medium text-gray-700 font-poppins">
+                Weight:
+              </label>
+              <div class="flex">
+                <%= number_input(f, :weight,
+                  value: @current_weight,
+                  step: "any",
+                  class: "form-input font-poppins rounded-md shadow-sm mt-1 block w-full"
+                ) %>
+                <%= error_tag(f, :weight) %>
+                <%= select(f, :weight_unit, ["kg", "lbs"],
+                  class:
+                    "form-select ml-2 rounded-md shadow-sm py-0 px-6 font-poppins text-gray-700 bg-white focus:outline-none focus:ring focus:ring-blue-200 focus:border-blue-500 sm:text-sm"
+                ) %>
+              </div>
             </div>
           </div>
         </div>
 
         <div class="flex justify-center mt-6">
-          <%= submit "ADD EXERCISE", phx_disable_with: "Adding...", class: "bg-green-400 hover:bg-green-600 text-white font-poppins py-2 px-4 rounded" %>
+          <%= submit("ADD EXERCISE",
+            phx_disable_with: "Adding...",
+            class: "bg-green-400 hover:bg-green-600 text-white font-poppins py-2 px-4 rounded"
+          ) %>
         </div>
       </.form>
     </div>
@@ -87,7 +120,7 @@ defmodule FitnessWeb.WorkoutTemplateLive.WorkoutItemForm do
 
     [current | _tail] =
       WorkoutItemLogic.updated_workout_items_list(current_exercise_id, workout_items_list)
-      
+
     {:noreply,
      assign(socket,
        sets_number: current.sets_number,
@@ -108,7 +141,7 @@ defmodule FitnessWeb.WorkoutTemplateLive.WorkoutItemForm do
       {:ok, workout_item} ->
         socket =
           socket
-          |> push_redirect(to: "/workout_templates/#{workout_item.workout_template_id}")
+          |> push_navigate(to: "/workout_templates/#{workout_item.workout_template_id}")
 
         {:noreply, socket}
 
diff --git a/lib/fitness_web/live/workout_template_live/workout_zone.ex b/lib/fitness_web/live/workout_template_live/workout_zone.ex
index 6cc8803..a9549a9 100644
--- a/lib/fitness_web/live/workout_template_live/workout_zone.ex
+++ b/lib/fitness_web/live/workout_template_live/workout_zone.ex
@@ -3,14 +3,14 @@ defmodule FitnessWeb.WorkoutTemplateLive.WorkoutZone do
 
   alias Fitness.WorkoutTemplates
   alias Fitness.WorkoutTemplates.WorkoutItem
-  alias Fitness.Exercises
+
   alias FitnessWeb.WorkoutTemplateLive.CheckBoxesLiveComponent
-  alias Fitness.Accounts
+
   alias Fitness.WorkoutTemplates.Services.WorkoutItemLogic
   alias Fitness.Accounts.Services.PlayerScores
 
   @impl true
-  def mount(params, session, socket) do
+  def mount(params, _session, socket) do
     changeset = WorkoutTemplates.change_workout_item(%WorkoutItem{})
     workout_template = WorkoutTemplates.get_workout_template!(params["id"])
 
@@ -27,84 +27,116 @@ defmodule FitnessWeb.WorkoutTemplateLive.WorkoutZone do
      |> assign(:check_complete_checkbox_list, check_complete_checkbox_list)}
   end
 
+  @impl true
   def render(assigns) do
     ~H"""
-
-        <h1 class="flex items-center justify-center pt-3 mb-4 text-4xl font-light font-poppins "><%= String.upcase(@workout_template.name) %></h1>
-
-          <%= if @workout_template.workout_items != [] do %>
-          <div class="flex items-center justify-center pt-3 mb-4">
-            <div class="p-3 bg-gray-200 rounded-lg">
-                <h1 class="text-6xl font-bold text-gray-800"><%= @time |> Time.truncate(:second) |> Time.to_string() %></h1>
-            </div>
-          </div>
-          <% end %>
-
-          <div class="flex justify-between px-6 pr-8">
-          <%= if @workout_template.workout_items != [] do %>
-                <%= if @timer_status != :running do %>
-                  <a href="#_" phx-click="start_workout" , class="relative px-5 py-3 overflow-hidden text-lg text-gray-600 bg-gray-100 border border-gray-100 rounded-lg shadow-inner font-poppins group">
-                  <span class="absolute top-0 left-0 w-0 h-0 transition-all duration-200 border-t-2 border-purple-600 group-hover:w-full ease"></span>
-                  <span class="absolute bottom-0 right-0 w-0 h-0 transition-all duration-200 border-b-2 border-purple-600 group-hover:w-full ease"></span>
-                  <span class="absolute top-0 left-0 w-full h-0 transition-all duration-300 delay-200 bg-purple-600 group-hover:h-full ease"></span>
-                  <span class="absolute bottom-0 left-0 w-full h-0 transition-all duration-300 delay-200 bg-purple-600 group-hover:h-full ease"></span>
-                  <span class="absolute inset-0 w-full h-full duration-300 delay-300 bg-purple-500 opacity-0 group-hover:opacity-100"></span>
-                  <span class="relative transition-colors duration-300 delay-200 group-hover:text-white ease">Start Workout</span>
-                  </a>
-                <% else %>
-                <div class="relative group">
-                  <p class="px-6 py-4 text-4xl text-white bg-white rounded-lg font-poppins hover:bg-yellow-200">💪</p>
-                  <span class="tooltip-text font-poppins hidden group-hover:block bg-yellow-600 text-white p-1 rounded-lg absolute text-xs text-center bottom-full -translate-y-3.5 ">
-                    You will receive 20 points per set and if you complete all sets, you will get 50 points bonus. So, try your best.
-                  </span>
-                  </div>
-                <% end %>
-            <% else %>
-            <button></button>
-          <% end %>
-
-          <%= if @timer_status != :running do %>
-            <div class="relative group">
-             <span>
+    <h1 class="flex items-center justify-center pt-3 mb-4 text-4xl font-light font-poppins ">
+      <%= String.upcase(@workout_template.name) %>
+    </h1>
+
+    <%= if @workout_template.workout_items != [] do %>
+      <div class="flex items-center justify-center pt-3 mb-4">
+        <div class="p-3 bg-gray-200 rounded-lg">
+          <h1 class="text-6xl font-bold text-gray-800">
+            <%= @time |> Time.truncate(:second) |> Time.to_string() %>
+          </h1>
+        </div>
+      </div>
+    <% end %>
+
+    <div class="flex justify-between px-6 pr-8">
+      <%= if @workout_template.workout_items != [] do %>
+        <%= if @timer_status != :running do %>
+          <a
+            href="#_"
+            phx-click="start_workout"
+            ,
+            class="relative px-5 py-3 overflow-hidden text-lg text-gray-600 bg-gray-100 border border-gray-100 rounded-lg shadow-inner font-poppins group"
+          >
+            <span class="absolute top-0 left-0 w-0 h-0 transition-all duration-200 border-t-2 border-purple-600 group-hover:w-full ease">
             </span>
-            <span class="px-4 py-2 text-white bg-gray-500 rounded-lg font-poppins hover:bg-gray-600"> <%= live_redirect "Edit", to: Routes.workout_template_show_path(@socket, :show, @workout_template) %></span>
-            </div>
-            <% else %>
-            <div class="relative group">
-            <span class="absolute hidden p-1 text-xs text-center text-white -translate-x-16 -translate-y-1 bg-red-400 rounded-lg tooltip-text font-poppins group-hover:block bottom-full ">
-              The timer is lost by you
+            <span class="absolute bottom-0 right-0 w-0 h-0 transition-all duration-200 border-b-2 border-purple-600 group-hover:w-full ease">
+            </span>
+            <span class="absolute top-0 left-0 w-full h-0 transition-all duration-300 delay-200 bg-purple-600 group-hover:h-full ease">
+            </span>
+            <span class="absolute bottom-0 left-0 w-full h-0 transition-all duration-300 delay-200 bg-purple-600 group-hover:h-full ease">
+            </span>
+            <span class="absolute inset-0 w-full h-full duration-300 delay-300 bg-purple-500 opacity-0 group-hover:opacity-100">
+            </span>
+            <span class="relative transition-colors duration-300 delay-200 group-hover:text-white ease">
+              Start Workout
+            </span>
+          </a>
+        <% else %>
+          <div class="relative group">
+            <p class="px-6 py-4 text-4xl text-white bg-white rounded-lg font-poppins hover:bg-yellow-200">
+              💪
+            </p>
+            <span class="tooltip-text font-poppins hidden group-hover:block bg-yellow-600 text-white p-1 rounded-lg absolute text-xs text-center bottom-full -translate-y-3.5 ">
+              You will receive 20 points per set and if you complete all sets, you will get 50 points bonus. So, try your best.
             </span>
-            <button class="px-4 py-2 text-white bg-gray-500 rounded-lg font-poppins hover:bg-gray-600">
-              <%= live_redirect "Back", to: Routes.workout_template_show_path(@socket, :show, @workout_template) %>
-            </button>
-            </div>
-          <% end %>
-          </div>
-
-          <div>
-            <.live_component module={CheckBoxesLiveComponent} id={"check-boxes"} timer_status={@timer_status} workout_start={@workout_start} changeset={@changeset} workout_template={@workout_template} />
-          </div>
-
-          <%= if @timer_status == :running do %>
-          <div class="relative flex items-center justify-center px-6 py-8 pr-8 group">
-             <% %>
-            <%= if @check_complete_checkbox_list != [] do %>
-              <span class="absolute hidden p-4 text-sm text-left text-white bg-gray-800 rounded-lg tooltip-text font-poppins group-hover:block bottom-full -translate-y-0">
-                Have you finished? Please check all the sets as they may be incomplete due to the loss of your bonus points
-              </span>
-              <button class="px-6 py-4 mr-4 text-white bg-purple-500 rounded-lg font-poppins hover:bg-purple-600">
-                <%= link "Finish Workout", to: "#", phx_click: "finish", phx_value_id: @workout_template.id %>
-              </button>
-            <% end %>
           </div>
-          <% end %>
+        <% end %>
+      <% else %>
+        <button></button>
+      <% end %>
+
+      <%= if @timer_status != :running do %>
+        <div class="relative group">
+          <span></span>
+          <span class="px-4 py-2 text-white bg-gray-500 rounded-lg font-poppins hover:bg-gray-600">
+            <.link navigate={Routes.workout_template_show_path(@socket, :show, @workout_template)}>
+              Edit
+            </.link>
+          </span>
+        </div>
+      <% else %>
+        <div class="relative group">
+          <span class="absolute hidden p-1 text-xs text-center text-white -translate-x-16 -translate-y-1 bg-red-400 rounded-lg tooltip-text font-poppins group-hover:block bottom-full ">
+            The timer is lost by you
+          </span>
+          <button class="px-4 py-2 text-white bg-gray-500 rounded-lg font-poppins hover:bg-gray-600">
+            <.link navigate={Routes.workout_template_show_path(@socket, :show, @workout_template)}>
+              Back
+            </.link>
+          </button>
+        </div>
+      <% end %>
+    </div>
+
+    <div>
+      <.live_component
+        module={CheckBoxesLiveComponent}
+        id="check-boxes"
+        timer_status={@timer_status}
+        workout_start={@workout_start}
+        changeset={@changeset}
+        workout_template={@workout_template}
+      />
+    </div>
+
+    <%= if @timer_status == :running do %>
+      <div class="relative flex items-center justify-center px-6 py-8 pr-8 group">
+        <%  %>
+        <%= if @check_complete_checkbox_list != [] do %>
+          <span class="absolute hidden p-4 text-sm text-left text-white bg-gray-800 rounded-lg tooltip-text font-poppins group-hover:block bottom-full -translate-y-0">
+            Have you finished? Please check all the sets as they may be incomplete due to the loss of your bonus points
+          </span>
+          <button class="px-6 py-4 mr-4 text-white bg-purple-500 rounded-lg font-poppins hover:bg-purple-600">
+            <%= link("Finish Workout",
+              to: "#",
+              phx_click: "finish",
+              phx_value_id: @workout_template.id
+            ) %>
+          </button>
+        <% end %>
+      </div>
+    <% end %>
     """
   end
 
   @impl true
   def handle_params(%{"id" => id}, _, socket) do
-    changeset = WorkoutTemplates.change_workout_item(%WorkoutItem{})
-
     {:noreply,
      socket
      |> assign(:workout_template, WorkoutTemplates.get_workout_template!(id))}
@@ -113,7 +145,11 @@ defmodule FitnessWeb.WorkoutTemplateLive.WorkoutZone do
   # update my checkboxes
 
   @impl true
-  def handle_event("workout_complete", %{"id" => id, "value" => check_box_value} = params, socket) do
+  def handle_event(
+        "workout_complete",
+        %{"id" => id, "value" => check_box_value} = _params,
+        socket
+      ) do
     id = String.to_integer(id)
     check_box_value = String.to_atom(check_box_value)
 
@@ -123,7 +159,7 @@ defmodule FitnessWeb.WorkoutTemplateLive.WorkoutZone do
   end
 
   @impl true
-  def handle_event("workout_complete", %{"id" => id} = params, socket) do
+  def handle_event("workout_complete", %{"id" => id} = _params, socket) do
     id = String.to_integer(id)
     check_box_value = false
 
@@ -142,29 +178,31 @@ defmodule FitnessWeb.WorkoutTemplateLive.WorkoutZone do
     current_user = socket.assigns.current_user
 
     WorkoutItemLogic.duplicate_workout_template(workout_template)
-    PlayerScores.update_new_player_score_and_broadcast_score_board(current_user, workout_templates)
+
+    PlayerScores.update_new_player_score_and_broadcast_score_board(
+      current_user,
+      workout_templates
+    )
 
     redirect_value = WorkoutItemLogic.update_workout_template_score(workout_template)
 
     socket =
       case redirect_value do
         true ->
-
           socket
           |> put_flash(
             :bonus,
             "Well done #{String.upcase(current_user.name)} for finishing your workout! 🥳 You earned ✨50✨ bonus 🎉 points for completing all of your sets. Keep up the great work! 👍"
           )
-          |> push_redirect(to: "/activity_history")
+          |> push_navigate(to: "/activity_history")
 
         false ->
-
           socket
           |> put_flash(
             :loss,
             "Congratulations #{String.upcase(current_user.name)} for completing your workout! However, 😞 you lost 50 bonus points because you missed some sets. Try your best next time 👍"
           )
-          |> push_redirect(to: "/activity_history")
+          |> push_navigate(to: "/activity_history")
       end
 
     {:noreply, assign(socket, :timer_status, :stopped)}
diff --git a/lib/fitness_web/router.ex b/lib/fitness_web/router.ex
index ee1a2a8..1cd9fe6 100644
--- a/lib/fitness_web/router.ex
+++ b/lib/fitness_web/router.ex
@@ -23,7 +23,6 @@ defmodule FitnessWeb.Router do
     pipe_through [:browser, :require_authenticated_user]
 
     live_session :user, on_mount: {UserAuthLive, :user} do
-
       live "/exercises/new", ExerciseLive.Index, :new
       live "/exercises/:id/edit", ExerciseLive.Index, :edit
       live "/exercises/:id/show/edit", ExerciseLive.Show, :edit
@@ -36,9 +35,12 @@ defmodule FitnessWeb.Router do
       live "/workout_templates/new", WorkoutTemplateLive.Index, :new
       live "/workout_templates/:id", WorkoutTemplateLive.Show, :show
       live "/workout_templates/:id/edit", WorkoutTemplateLive.Index, :edit
-      live "/workout_templates/:id/show/workout_zone", WorkoutTemplateLive.WorkoutZone, :workout_zone
-      live "/workout_templates/:id/show/edit", WorkoutTemplateLive.Show, :edit
 
+      live "/workout_templates/:id/show/workout_zone",
+           WorkoutTemplateLive.WorkoutZone,
+           :workout_zone
+
+      live "/workout_templates/:id/show/edit", WorkoutTemplateLive.Show, :edit
     end
   end
 
@@ -53,8 +55,6 @@ defmodule FitnessWeb.Router do
     live "/exercises/:id", ExerciseLive.Show, :show
   end
 
-
-
   # Other scopes may use custom stacks.
   # scope "/api", FitnessWeb do
   #   pipe_through :api
diff --git a/lib/fitness_web/templates/layout/_user_menu.html.heex b/lib/fitness_web/templates/layout/_user_menu.html.heex
index e8b0e06..ce68b33 100644
--- a/lib/fitness_web/templates/layout/_user_menu.html.heex
+++ b/lib/fitness_web/templates/layout/_user_menu.html.heex
@@ -1,10 +1,14 @@
 <ul>
-<%= if @current_user do %>
-  <li class="hidden"><%= @current_user.email %></li>
-  <li class="hidden"><%= link "Settings", to: Routes.user_settings_path(@conn, :edit) %></li>
-  <li class="hidden"><%= link "Log out", to: Routes.user_session_path(@conn, :delete), method: :delete %></li>
-<% else %>
-  <li class="hidden"><%= link "Register", to: Routes.user_registration_path(@conn, :new) %></li>
-  <li class="hidden"><%= link "Log in", to: Routes.user_session_path(@conn, :new) %></li>
-<% end %>
+  <%= if @current_user do %>
+    <li class="hidden"><%= @current_user.email %></li>
+    <li class="hidden"><%= link("Settings", to: Routes.user_settings_path(@conn, :edit)) %></li>
+    <li class="hidden">
+      <%= link("Log out", to: Routes.user_session_path(@conn, :delete), method: :delete) %>
+    </li>
+  <% else %>
+    <li class="hidden">
+      <%= link("Register", to: Routes.user_registration_path(@conn, :new)) %>
+    </li>
+    <li class="hidden"><%= link("Log in", to: Routes.user_session_path(@conn, :new)) %></li>
+  <% end %>
 </ul>
diff --git a/lib/fitness_web/templates/layout/app.html.heex b/lib/fitness_web/templates/layout/app.html.heex
index 600c3ed..4b84c00 100644
--- a/lib/fitness_web/templates/layout/app.html.heex
+++ b/lib/fitness_web/templates/layout/app.html.heex
@@ -1,5 +1,9 @@
-<main class="container">
-  <p class="alert alert-info text-center font-poppins text-xl rounded-2xl" role="alert"><%= get_flash(@conn, :info) %></p>
-  <p class="alert alert-danger text-center font-poppins text-xl rounded-2xl" role="alert"><%= get_flash(@conn, :error) %></p>
+<main class="">
+  <p class="alert alert-info text-center font-poppins text-xl rounded-2xl" role="alert">
+    <%= Phoenix.Flash.get(@conn.assigns.flash, :info) %>
+  </p>
+  <p class="alert alert-danger text-center font-poppins text-xl rounded-2xl" role="alert">
+    <%= Phoenix.Flash.get(@conn.assigns.flash, :error) %>
+  </p>
   <%= @inner_content %>
 </main>
diff --git a/lib/fitness_web/templates/layout/live.html.heex b/lib/fitness_web/templates/layout/live.html.heex
index 883ff17..a574cdd 100644
--- a/lib/fitness_web/templates/layout/live.html.heex
+++ b/lib/fitness_web/templates/layout/live.html.heex
@@ -1,19 +1,35 @@
-<main class="container">
-  <p class="alert alert-info text-center font-poppins text-2xl rounded-full" role="alert"
+<main class="">
+  <p
+    class="alert alert-info text-center font-poppins text-2xl rounded-full"
+    role="alert"
     phx-click="lv:clear-flash"
-    phx-value-key="info"><%= live_flash(@flash, :info) %></p>
+    phx-value-key="info"
+  ><%= Phoenix.Flash.get(@flash, :info) %></p>
 
-  <p class="alert alert-danger text-center font-poppins text-2xl rounded-full" role="alert"
+  <p
+    class="alert alert-danger text-center font-poppins text-2xl rounded-full"
+    role="alert"
     phx-click="lv:clear-flash"
-    phx-value-key="error"><%= live_flash(@flash, :error) %></p>
+    phx-value-key="error"
+  ><%= Phoenix.Flash.get(@flash, :error) %></p>
 
-  <p class="bg-yellow-200 text-yellow-500 border-yellow-700 text-center font-poppins text-4xl" role="alert"
+  <p
+    class="bg-yellow-200 text-yellow-500 border-yellow-700 text-center font-poppins text-4xl"
+    role="alert"
     phx-click="lv:clear-flash"
-    phx-value-key="info"><%= live_flash(@flash, :bonus) %></p>
+    phx-value-key="info"
+  >
+    <%= Phoenix.Flash.get(@flash, :bonus) %>
+  </p>
 
-  <p class="bg-gray-400 text-white text-center font-poppins text-2xl" role="alert"
+  <p
+    class="bg-gray-400 text-white text-center font-poppins text-2xl"
+    role="alert"
     phx-click="lv:clear-flash"
-    phx-value-key="error"><%= live_flash(@flash, :loss) %></p>
+    phx-value-key="error"
+  >
+    <%= Phoenix.Flash.get(@flash, :loss) %>
+  </p>
 
   <%= @inner_content %>
-</main>
\ No newline at end of file
+</main>
diff --git a/lib/fitness_web/templates/layout/root.html.heex b/lib/fitness_web/templates/layout/root.html.heex
index 3499f9b..ed8ebfc 100644
--- a/lib/fitness_web/templates/layout/root.html.heex
+++ b/lib/fitness_web/templates/layout/root.html.heex
@@ -1,43 +1,177 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="utf-8"/>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <meta name="csrf-token" content={csrf_token_value()}>
-    <%= live_title_tag assigns[:page_title] || "Fitness", suffix: " · Phoenix Framework" %>
-    <link phx-track-static rel="stylesheet" href={Routes.static_path(@conn, "/assets/app.css")}/>
-    <script defer phx-track-static type="text/javascript" src={Routes.static_path(@conn, "/assets/app.js")}></script>
-    <script src="//www.google.com/jsapi"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/chartkick/1.3.0/chartkick.min.js"></script>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="csrf-token" content={csrf_token_value()} />
+    <.live_title>
+      <%= assigns[:page_title] || "Fitness" %>
+    </.live_title>
+    <link phx-track-static rel="stylesheet" href={Routes.static_path(@conn, "/assets/app.css")} />
+    <script
+      defer
+      phx-track-static
+      type="text/javascript"
+      src={Routes.static_path(@conn, "/assets/app.js")}
+    >
+    </script>
+    <script src="//www.google.com/jsapi">
+    </script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/chartkick/1.3.0/chartkick.min.js">
+    </script>
   </head>
   <body>
     <header>
       <section>
-          <nav class="bg-gray-800 flex justify-between items-center px-2 py-2">
-            <%= if assigns[:current_user] do %>
-            <a href={Routes.user_profile_path(@conn, :profile)}> <svg class="w-20 h-14 pr-0.5 mr-0 fill-current hover:text-yellow-100 text-white" fill="#000000" height="200px" width="200px" version="1.1"  xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 60 60" xml:space="preserve"><g  stroke-width="0"></g><g  stroke-linecap="round" stroke-linejoin="round"></g><g > <g> <g> <path d="M30,0C20.203,0,11.489,4.722,6.01,12.008c-0.011,0.013-0.026,0.021-0.036,0.035c-0.121,0.161-0.228,0.332-0.345,0.495 c-0.209,0.291-0.416,0.583-0.614,0.881c-0.15,0.226-0.295,0.455-0.439,0.684c-0.187,0.298-0.368,0.601-0.545,0.906 c-0.117,0.202-0.237,0.402-0.349,0.606c-0.267,0.487-0.521,0.982-0.762,1.484c-0.079,0.165-0.15,0.332-0.225,0.498 c-0.179,0.392-0.35,0.787-0.512,1.188c-0.074,0.183-0.147,0.366-0.217,0.55c-0.18,0.471-0.349,0.948-0.505,1.431 c-0.029,0.088-0.062,0.175-0.089,0.263c-0.178,0.568-0.337,1.145-0.482,1.726c-0.04,0.161-0.075,0.323-0.112,0.484 c-0.102,0.442-0.195,0.888-0.277,1.337c-0.032,0.177-0.066,0.352-0.095,0.53c-0.095,0.574-0.177,1.152-0.238,1.736 c-0.002,0.018-0.006,0.036-0.007,0.054L0.159,26.91c-0.005,0.052-0.008,0.105-0.013,0.158L0.066,28h0.008 c-0.019,0.293-0.035,0.587-0.046,0.882C0.011,29.266,0,29.639,0,30c0,0.667,0.03,1.327,0.073,1.983 c0.001,0.009,0,0.017,0.001,0.026l0.04,0.515c0.001,0.012,0.002,0.024,0.003,0.035c0.024,0.282,0.05,0.564,0.082,0.844 c0.035,0.316,0.074,0.637,0.122,0.971l0.017,0.127c0.001,0.006,0.002,0.012,0.003,0.018c0.094,0.618,0.211,1.229,0.343,1.834 c0.005,0.024,0.008,0.048,0.013,0.072l0.105,0.454c0.014,0.062,0.032,0.125,0.046,0.186c0.051,0.212,0.102,0.424,0.158,0.634 c0.078,0.298,0.164,0.605,0.261,0.934l0.043,0.151c0.008,0.027,0.019,0.054,0.028,0.081c0.17,0.549,0.359,1.09,0.559,1.625 c0.017,0.046,0.03,0.093,0.048,0.139l0.135,0.345c0.068,0.172,0.142,0.347,0.214,0.521c0.032,0.078,0.063,0.156,0.096,0.233 c0.126,0.297,0.26,0.603,0.412,0.932l0.063,0.137C2.89,42.85,2.92,42.9,2.945,42.952c0.228,0.474,0.468,0.94,0.719,1.399 c0.036,0.067,0.068,0.137,0.105,0.204l0.115,0.198c0.303,0.536,0.622,1.062,0.994,1.635l0.067,0.104 c0.048,0.072,0.101,0.138,0.149,0.21c0.288,0.428,0.586,0.848,0.895,1.26c0.053,0.071,0.1,0.147,0.154,0.217 c0.393,0.515,0.822,1.038,1.289,1.571l0.069,0.08c0.07,0.079,0.149,0.153,0.22,0.232c0.351,0.39,0.71,0.772,1.081,1.143 c0.172,0.172,0.355,0.339,0.533,0.508c0.264,0.252,0.532,0.5,0.805,0.742c0.118,0.105,0.226,0.215,0.346,0.319 c0.09,0.077,0.187,0.146,0.278,0.222c0.369,0.309,0.745,0.609,1.128,0.9c0.195,0.148,0.393,0.291,0.592,0.434 c0.355,0.256,0.715,0.506,1.081,0.747c0.096,0.063,0.188,0.135,0.285,0.197l0.056,0.036c0.086,0.055,0.179,0.103,0.266,0.157 c0.468,0.292,0.942,0.574,1.427,0.84c0.064,0.035,0.128,0.071,0.193,0.106c0.519,0.28,1.05,0.541,1.587,0.792 c0.071,0.033,0.139,0.073,0.211,0.105L19,57.954v-0.052C22.409,59.25,26.117,60,30,60c16.542,0,30-13.458,30-30S46.542,0,30,0z M18.646,47.236l-1.293-1.094C16.618,45.164,16,43.816,16,42c0-0.553-0.448-1-1-1s-1,0.447-1,1c0,3.379,1.676,5.5,3,6.7v6.088 c-0.04-0.021-0.081-0.041-0.12-0.062c-0.59-0.314-1.166-0.652-1.729-1.005c-0.176-0.111-0.352-0.223-0.525-0.337 c-0.356-0.235-0.709-0.48-1.058-0.734c-0.15-0.109-0.301-0.218-0.449-0.33c-0.377-0.286-0.75-0.586-1.12-0.897 c-0.188-0.158-0.372-0.319-0.556-0.481c-0.246-0.219-0.488-0.443-0.727-0.671c-0.17-0.162-0.343-0.32-0.509-0.486 c-0.347-0.348-0.684-0.706-1.012-1.071c-0.568-0.631-1.11-1.287-1.62-1.968c-0.276-0.369-0.55-0.756-0.819-1.156 c-0.162-0.24-0.315-0.487-0.47-0.732c-0.154-0.245-0.304-0.493-0.451-0.743c-0.139-0.237-0.279-0.473-0.411-0.714 c-0.237-0.433-0.463-0.871-0.677-1.318c-0.111-0.231-0.213-0.466-0.317-0.701c-0.133-0.3-0.263-0.6-0.385-0.903 c-0.094-0.231-0.187-0.461-0.275-0.695c-0.186-0.497-0.361-1-0.519-1.509c-0.111-0.359-0.213-0.723-0.31-1.089 c-0.055-0.21-0.11-0.438-0.165-0.668c-0.049-0.203-0.097-0.407-0.142-0.612c-0.041-0.187-0.078-0.377-0.116-0.568 c-0.049-0.252-0.094-0.504-0.136-0.758c-0.023-0.138-0.048-0.27-0.069-0.414c-0.009-0.063-0.015-0.128-0.024-0.191 c-0.076-0.533-0.135-1.072-0.18-1.614c-0.014-0.166-0.027-0.332-0.038-0.499C2.028,31.246,2,30.626,2,30 c0-0.338,0.014-0.673,0.026-1.008c0.026-0.58,0.071-1.195,0.143-1.888l0.039-0.452c0.023-0.188,0.045-0.376,0.072-0.562 c0.034-0.241,0.071-0.482,0.111-0.723c0.038-0.229,0.079-0.457,0.122-0.683c0.046-0.24,0.097-0.479,0.149-0.717 c0.049-0.223,0.1-0.445,0.154-0.665c0.059-0.239,0.123-0.477,0.188-0.715c0.06-0.217,0.12-0.434,0.185-0.649 c0.071-0.235,0.147-0.468,0.224-0.701c0.071-0.216,0.142-0.431,0.218-0.644c0.079-0.222,0.165-0.442,0.25-0.663 c0.086-0.221,0.171-0.444,0.262-0.662c0.083-0.2,0.173-0.398,0.261-0.597c0.104-0.234,0.207-0.469,0.317-0.7 c0.079-0.165,0.164-0.327,0.245-0.49c0.131-0.261,0.26-0.522,0.399-0.778c0.052-0.095,0.108-0.188,0.161-0.283 C5.68,16.142,5.837,15.866,6,15.595v3.694c0,1.493,1.215,2.708,2.707,2.708c0.636,0.001,1.206,0.002,1.258,0.002 c3.48,0.124,6.472,1.777,9.147,5.057c0.195,0.239,0.427,0.434,0.682,0.587c-0.448,0.605-0.841,1.259-1.134,1.981 c-0.208,0.513,0.04,1.096,0.551,1.303c0.514,0.209,1.095-0.039,1.302-0.551c0.482-1.19,1.27-2.177,2.238-2.921 c0.22-0.169,0.456-0.328,0.705-0.475c0.151-0.089,0.299-0.184,0.457-0.261c0.03-0.016,0.061-0.031,0.091-0.047 c0.589-0.278,1.221-0.474,1.878-0.579c0.058-0.007,0.114-0.017,0.172-0.022C26.366,26.029,26.68,26,27,26 c0.315,0,0.625,0.029,0.931,0.07c0.077,0.01,0.153,0.02,0.229,0.033c0.288,0.048,0.571,0.111,0.847,0.193 c0.079,0.024,0.156,0.055,0.235,0.082c0.199,0.067,0.393,0.144,0.583,0.228c0.107,0.047,0.215,0.093,0.319,0.146 c0.221,0.111,0.436,0.234,0.644,0.369c0.123,0.08,0.242,0.169,0.361,0.257c0.109,0.081,0.216,0.165,0.32,0.252 c0.118,0.098,0.236,0.195,0.348,0.302c0.707,0.674,1.285,1.496,1.669,2.445C33.644,30.765,34.018,31,34.414,31 c0.125,0,0.252-0.023,0.375-0.073c0.512-0.207,0.759-0.79,0.551-1.303c-0.294-0.724-0.688-1.381-1.137-1.987 c0.5-0.378,0.859-0.92,0.98-1.576c0.272-1.486,0.786-2.614,1.525-3.354L37,22.414v-5.707l-1.251,0.325 c-0.165,0.042-4.045,1.055-6.177,2.063c-1.429,0.678-2.082,0.012-3.577-2.072c-0.539-0.751-1.097-1.528-1.789-2.225 c-1.24-1.247-1.571-3.069-0.753-4.148c0.896-1.183,2.726-2.541,8.229-0.702l0.195,0.065l0.205-0.018 c0.061-0.003,5.958-0.46,9.059,2.394C42.392,13.54,43,15.048,43,17c0,5.217,1,8.207,1.84,9.796 c1.425,2.699,2.153,5.356,2.162,7.897c0.012,3.379-0.889,5.927-2.678,7.57l-0.179,0.164l-0.083,0.228 C44.045,42.699,42.383,47,35,47h-0.19l-0.177,0.07C34.522,47.114,23.54,51.378,18.646,47.236z M30,58 c-3.903,0-7.621-0.805-11-2.254V50c0.082,0,0.158-0.035,0.238-0.055c5.759,2.687,14.532-0.41,15.95-0.945 c7.672-0.068,10.143-4.327,10.648-5.412c2.114-2.039,3.179-5.031,3.166-8.901c-0.01-2.866-0.815-5.835-2.393-8.823 C45.875,24.473,45,21.808,45,17c0-2.507-0.842-4.554-2.504-6.082c-3.412-3.14-9.172-2.995-10.368-2.929 c-4.946-1.614-8.306-1.139-10.27,1.454c-1.429,1.887-1.029,4.795,0.929,6.766c0.58,0.583,1.09,1.293,1.583,1.98 c1.333,1.856,2.991,4.167,6.057,2.715C31.683,20.31,33.7,19.688,35,19.313v2.295c-0.873,1.011-1.472,2.385-1.785,4.092 c-0.043,0.234-0.199,0.383-0.379,0.457c-0.159-0.136-0.328-0.258-0.495-0.383c-0.194-0.144-0.391-0.28-0.596-0.407 c-0.226-0.143-0.457-0.275-0.693-0.397c-0.097-0.049-0.193-0.098-0.291-0.143c-0.75-0.351-1.546-0.593-2.373-0.72 c-0.022-0.003-0.044-0.006-0.066-0.009c-0.412-0.06-0.831-0.094-1.256-0.094C27.043,24.005,27.022,24,27,24 c-0.009,0-0.017,0.002-0.026,0.002c-0.343,0.004-0.689,0.024-1.038,0.069c-0.051,0.004-0.101,0.015-0.151,0.02 c-0.074,0.01-0.149,0.017-0.223,0.029c-0.844,0.104-1.652,0.354-2.399,0.738c-0.054,0.026-0.106,0.055-0.16,0.082 c-0.062,0.034-0.128,0.061-0.189,0.096c-0.203,0.107-0.397,0.228-0.591,0.35c-0.194,0.121-0.379,0.252-0.563,0.388 c-0.109,0.08-0.222,0.155-0.327,0.24c-0.246,0.061-0.511-0.024-0.672-0.223c-3.06-3.751-6.536-5.646-10.622-5.79 c-0.025-0.001-0.64-0.003-1.331-0.004C8.317,19.997,8,19.68,8,19.289v-6.57c0-0.002-0.001-0.004-0.001-0.007 C13.13,6.196,21.082,2,30,2c15.439,0,28,12.561,28,28S45.439,58,30,58z"></path> </g> </g> </g></svg></a>
+        <nav class="bg-gray-800 flex justify-between items-center px-2 py-2">
+          <%= if assigns[:current_user] do %>
+            <a href={Routes.user_profile_path(@conn, :profile)}>
+              <svg
+                class="w-20 h-14 pr-0.5 mr-0 fill-current hover:text-yellow-100 text-white"
+                fill="#000000"
+                height="200px"
+                width="200px"
+                version="1.1"
+                xmlns="http://www.w3.org/2000/svg"
+                xmlns:xlink="http://www.w3.org/1999/xlink"
+                viewBox="0 0 60 60"
+                xml:space="preserve"
+              >
+                <g stroke-width="0"></g>
+                <g stroke-linecap="round" stroke-linejoin="round"></g>
+                <g>
+                  <g>
+                    <g>
+                      <path d="M30,0C20.203,0,11.489,4.722,6.01,12.008c-0.011,0.013-0.026,0.021-0.036,0.035c-0.121,0.161-0.228,0.332-0.345,0.495 c-0.209,0.291-0.416,0.583-0.614,0.881c-0.15,0.226-0.295,0.455-0.439,0.684c-0.187,0.298-0.368,0.601-0.545,0.906 c-0.117,0.202-0.237,0.402-0.349,0.606c-0.267,0.487-0.521,0.982-0.762,1.484c-0.079,0.165-0.15,0.332-0.225,0.498 c-0.179,0.392-0.35,0.787-0.512,1.188c-0.074,0.183-0.147,0.366-0.217,0.55c-0.18,0.471-0.349,0.948-0.505,1.431 c-0.029,0.088-0.062,0.175-0.089,0.263c-0.178,0.568-0.337,1.145-0.482,1.726c-0.04,0.161-0.075,0.323-0.112,0.484 c-0.102,0.442-0.195,0.888-0.277,1.337c-0.032,0.177-0.066,0.352-0.095,0.53c-0.095,0.574-0.177,1.152-0.238,1.736 c-0.002,0.018-0.006,0.036-0.007,0.054L0.159,26.91c-0.005,0.052-0.008,0.105-0.013,0.158L0.066,28h0.008 c-0.019,0.293-0.035,0.587-0.046,0.882C0.011,29.266,0,29.639,0,30c0,0.667,0.03,1.327,0.073,1.983 c0.001,0.009,0,0.017,0.001,0.026l0.04,0.515c0.001,0.012,0.002,0.024,0.003,0.035c0.024,0.282,0.05,0.564,0.082,0.844 c0.035,0.316,0.074,0.637,0.122,0.971l0.017,0.127c0.001,0.006,0.002,0.012,0.003,0.018c0.094,0.618,0.211,1.229,0.343,1.834 c0.005,0.024,0.008,0.048,0.013,0.072l0.105,0.454c0.014,0.062,0.032,0.125,0.046,0.186c0.051,0.212,0.102,0.424,0.158,0.634 c0.078,0.298,0.164,0.605,0.261,0.934l0.043,0.151c0.008,0.027,0.019,0.054,0.028,0.081c0.17,0.549,0.359,1.09,0.559,1.625 c0.017,0.046,0.03,0.093,0.048,0.139l0.135,0.345c0.068,0.172,0.142,0.347,0.214,0.521c0.032,0.078,0.063,0.156,0.096,0.233 c0.126,0.297,0.26,0.603,0.412,0.932l0.063,0.137C2.89,42.85,2.92,42.9,2.945,42.952c0.228,0.474,0.468,0.94,0.719,1.399 c0.036,0.067,0.068,0.137,0.105,0.204l0.115,0.198c0.303,0.536,0.622,1.062,0.994,1.635l0.067,0.104 c0.048,0.072,0.101,0.138,0.149,0.21c0.288,0.428,0.586,0.848,0.895,1.26c0.053,0.071,0.1,0.147,0.154,0.217 c0.393,0.515,0.822,1.038,1.289,1.571l0.069,0.08c0.07,0.079,0.149,0.153,0.22,0.232c0.351,0.39,0.71,0.772,1.081,1.143 c0.172,0.172,0.355,0.339,0.533,0.508c0.264,0.252,0.532,0.5,0.805,0.742c0.118,0.105,0.226,0.215,0.346,0.319 c0.09,0.077,0.187,0.146,0.278,0.222c0.369,0.309,0.745,0.609,1.128,0.9c0.195,0.148,0.393,0.291,0.592,0.434 c0.355,0.256,0.715,0.506,1.081,0.747c0.096,0.063,0.188,0.135,0.285,0.197l0.056,0.036c0.086,0.055,0.179,0.103,0.266,0.157 c0.468,0.292,0.942,0.574,1.427,0.84c0.064,0.035,0.128,0.071,0.193,0.106c0.519,0.28,1.05,0.541,1.587,0.792 c0.071,0.033,0.139,0.073,0.211,0.105L19,57.954v-0.052C22.409,59.25,26.117,60,30,60c16.542,0,30-13.458,30-30S46.542,0,30,0z M18.646,47.236l-1.293-1.094C16.618,45.164,16,43.816,16,42c0-0.553-0.448-1-1-1s-1,0.447-1,1c0,3.379,1.676,5.5,3,6.7v6.088 c-0.04-0.021-0.081-0.041-0.12-0.062c-0.59-0.314-1.166-0.652-1.729-1.005c-0.176-0.111-0.352-0.223-0.525-0.337 c-0.356-0.235-0.709-0.48-1.058-0.734c-0.15-0.109-0.301-0.218-0.449-0.33c-0.377-0.286-0.75-0.586-1.12-0.897 c-0.188-0.158-0.372-0.319-0.556-0.481c-0.246-0.219-0.488-0.443-0.727-0.671c-0.17-0.162-0.343-0.32-0.509-0.486 c-0.347-0.348-0.684-0.706-1.012-1.071c-0.568-0.631-1.11-1.287-1.62-1.968c-0.276-0.369-0.55-0.756-0.819-1.156 c-0.162-0.24-0.315-0.487-0.47-0.732c-0.154-0.245-0.304-0.493-0.451-0.743c-0.139-0.237-0.279-0.473-0.411-0.714 c-0.237-0.433-0.463-0.871-0.677-1.318c-0.111-0.231-0.213-0.466-0.317-0.701c-0.133-0.3-0.263-0.6-0.385-0.903 c-0.094-0.231-0.187-0.461-0.275-0.695c-0.186-0.497-0.361-1-0.519-1.509c-0.111-0.359-0.213-0.723-0.31-1.089 c-0.055-0.21-0.11-0.438-0.165-0.668c-0.049-0.203-0.097-0.407-0.142-0.612c-0.041-0.187-0.078-0.377-0.116-0.568 c-0.049-0.252-0.094-0.504-0.136-0.758c-0.023-0.138-0.048-0.27-0.069-0.414c-0.009-0.063-0.015-0.128-0.024-0.191 c-0.076-0.533-0.135-1.072-0.18-1.614c-0.014-0.166-0.027-0.332-0.038-0.499C2.028,31.246,2,30.626,2,30 c0-0.338,0.014-0.673,0.026-1.008c0.026-0.58,0.071-1.195,0.143-1.888l0.039-0.452c0.023-0.188,0.045-0.376,0.072-0.562 c0.034-0.241,0.071-0.482,0.111-0.723c0.038-0.229,0.079-0.457,0.122-0.683c0.046-0.24,0.097-0.479,0.149-0.717 c0.049-0.223,0.1-0.445,0.154-0.665c0.059-0.239,0.123-0.477,0.188-0.715c0.06-0.217,0.12-0.434,0.185-0.649 c0.071-0.235,0.147-0.468,0.224-0.701c0.071-0.216,0.142-0.431,0.218-0.644c0.079-0.222,0.165-0.442,0.25-0.663 c0.086-0.221,0.171-0.444,0.262-0.662c0.083-0.2,0.173-0.398,0.261-0.597c0.104-0.234,0.207-0.469,0.317-0.7 c0.079-0.165,0.164-0.327,0.245-0.49c0.131-0.261,0.26-0.522,0.399-0.778c0.052-0.095,0.108-0.188,0.161-0.283 C5.68,16.142,5.837,15.866,6,15.595v3.694c0,1.493,1.215,2.708,2.707,2.708c0.636,0.001,1.206,0.002,1.258,0.002 c3.48,0.124,6.472,1.777,9.147,5.057c0.195,0.239,0.427,0.434,0.682,0.587c-0.448,0.605-0.841,1.259-1.134,1.981 c-0.208,0.513,0.04,1.096,0.551,1.303c0.514,0.209,1.095-0.039,1.302-0.551c0.482-1.19,1.27-2.177,2.238-2.921 c0.22-0.169,0.456-0.328,0.705-0.475c0.151-0.089,0.299-0.184,0.457-0.261c0.03-0.016,0.061-0.031,0.091-0.047 c0.589-0.278,1.221-0.474,1.878-0.579c0.058-0.007,0.114-0.017,0.172-0.022C26.366,26.029,26.68,26,27,26 c0.315,0,0.625,0.029,0.931,0.07c0.077,0.01,0.153,0.02,0.229,0.033c0.288,0.048,0.571,0.111,0.847,0.193 c0.079,0.024,0.156,0.055,0.235,0.082c0.199,0.067,0.393,0.144,0.583,0.228c0.107,0.047,0.215,0.093,0.319,0.146 c0.221,0.111,0.436,0.234,0.644,0.369c0.123,0.08,0.242,0.169,0.361,0.257c0.109,0.081,0.216,0.165,0.32,0.252 c0.118,0.098,0.236,0.195,0.348,0.302c0.707,0.674,1.285,1.496,1.669,2.445C33.644,30.765,34.018,31,34.414,31 c0.125,0,0.252-0.023,0.375-0.073c0.512-0.207,0.759-0.79,0.551-1.303c-0.294-0.724-0.688-1.381-1.137-1.987 c0.5-0.378,0.859-0.92,0.98-1.576c0.272-1.486,0.786-2.614,1.525-3.354L37,22.414v-5.707l-1.251,0.325 c-0.165,0.042-4.045,1.055-6.177,2.063c-1.429,0.678-2.082,0.012-3.577-2.072c-0.539-0.751-1.097-1.528-1.789-2.225 c-1.24-1.247-1.571-3.069-0.753-4.148c0.896-1.183,2.726-2.541,8.229-0.702l0.195,0.065l0.205-0.018 c0.061-0.003,5.958-0.46,9.059,2.394C42.392,13.54,43,15.048,43,17c0,5.217,1,8.207,1.84,9.796 c1.425,2.699,2.153,5.356,2.162,7.897c0.012,3.379-0.889,5.927-2.678,7.57l-0.179,0.164l-0.083,0.228 C44.045,42.699,42.383,47,35,47h-0.19l-0.177,0.07C34.522,47.114,23.54,51.378,18.646,47.236z M30,58 c-3.903,0-7.621-0.805-11-2.254V50c0.082,0,0.158-0.035,0.238-0.055c5.759,2.687,14.532-0.41,15.95-0.945 c7.672-0.068,10.143-4.327,10.648-5.412c2.114-2.039,3.179-5.031,3.166-8.901c-0.01-2.866-0.815-5.835-2.393-8.823 C45.875,24.473,45,21.808,45,17c0-2.507-0.842-4.554-2.504-6.082c-3.412-3.14-9.172-2.995-10.368-2.929 c-4.946-1.614-8.306-1.139-10.27,1.454c-1.429,1.887-1.029,4.795,0.929,6.766c0.58,0.583,1.09,1.293,1.583,1.98 c1.333,1.856,2.991,4.167,6.057,2.715C31.683,20.31,33.7,19.688,35,19.313v2.295c-0.873,1.011-1.472,2.385-1.785,4.092 c-0.043,0.234-0.199,0.383-0.379,0.457c-0.159-0.136-0.328-0.258-0.495-0.383c-0.194-0.144-0.391-0.28-0.596-0.407 c-0.226-0.143-0.457-0.275-0.693-0.397c-0.097-0.049-0.193-0.098-0.291-0.143c-0.75-0.351-1.546-0.593-2.373-0.72 c-0.022-0.003-0.044-0.006-0.066-0.009c-0.412-0.06-0.831-0.094-1.256-0.094C27.043,24.005,27.022,24,27,24 c-0.009,0-0.017,0.002-0.026,0.002c-0.343,0.004-0.689,0.024-1.038,0.069c-0.051,0.004-0.101,0.015-0.151,0.02 c-0.074,0.01-0.149,0.017-0.223,0.029c-0.844,0.104-1.652,0.354-2.399,0.738c-0.054,0.026-0.106,0.055-0.16,0.082 c-0.062,0.034-0.128,0.061-0.189,0.096c-0.203,0.107-0.397,0.228-0.591,0.35c-0.194,0.121-0.379,0.252-0.563,0.388 c-0.109,0.08-0.222,0.155-0.327,0.24c-0.246,0.061-0.511-0.024-0.672-0.223c-3.06-3.751-6.536-5.646-10.622-5.79 c-0.025-0.001-0.64-0.003-1.331-0.004C8.317,19.997,8,19.68,8,19.289v-6.57c0-0.002-0.001-0.004-0.001-0.007 C13.13,6.196,21.082,2,30,2c15.439,0,28,12.561,28,28S45.439,58,30,58z">
+                      </path>
+                    </g>
+                  </g>
+                </g>
+              </svg>
+            </a>
+          <% else %>
+            <a href="/">
+              <svg
+                class="w-20 h-14 pr-0.5 mr-0 hover:text-yellow-100 fill-current text-white"
+                fill="#000000"
+                height="200px"
+                width="200px"
+                version="1.1"
+                xmlns="http://www.w3.org/2000/svg"
+                xmlns:xlink="http://www.w3.org/1999/xlink"
+                viewBox="0 0 60 60"
+                xml:space="preserve"
+              >
+                <g stroke-width="0"></g>
+                <g stroke-linecap="round" stroke-linejoin="round"></g>
+                <g>
+                  <g>
+                    <g>
+                      <path d="M30,0C20.203,0,11.489,4.722,6.01,12.008c-0.011,0.013-0.026,0.021-0.036,0.035c-0.121,0.161-0.228,0.332-0.345,0.495 c-0.209,0.291-0.416,0.583-0.614,0.881c-0.15,0.226-0.295,0.455-0.439,0.684c-0.187,0.298-0.368,0.601-0.545,0.906 c-0.117,0.202-0.237,0.402-0.349,0.606c-0.267,0.487-0.521,0.982-0.762,1.484c-0.079,0.165-0.15,0.332-0.225,0.498 c-0.179,0.392-0.35,0.787-0.512,1.188c-0.074,0.183-0.147,0.366-0.217,0.55c-0.18,0.471-0.349,0.948-0.505,1.431 c-0.029,0.088-0.062,0.175-0.089,0.263c-0.178,0.568-0.337,1.145-0.482,1.726c-0.04,0.161-0.075,0.323-0.112,0.484 c-0.102,0.442-0.195,0.888-0.277,1.337c-0.032,0.177-0.066,0.352-0.095,0.53c-0.095,0.574-0.177,1.152-0.238,1.736 c-0.002,0.018-0.006,0.036-0.007,0.054L0.159,26.91c-0.005,0.052-0.008,0.105-0.013,0.158L0.066,28h0.008 c-0.019,0.293-0.035,0.587-0.046,0.882C0.011,29.266,0,29.639,0,30c0,0.667,0.03,1.327,0.073,1.983 c0.001,0.009,0,0.017,0.001,0.026l0.04,0.515c0.001,0.012,0.002,0.024,0.003,0.035c0.024,0.282,0.05,0.564,0.082,0.844 c0.035,0.316,0.074,0.637,0.122,0.971l0.017,0.127c0.001,0.006,0.002,0.012,0.003,0.018c0.094,0.618,0.211,1.229,0.343,1.834 c0.005,0.024,0.008,0.048,0.013,0.072l0.105,0.454c0.014,0.062,0.032,0.125,0.046,0.186c0.051,0.212,0.102,0.424,0.158,0.634 c0.078,0.298,0.164,0.605,0.261,0.934l0.043,0.151c0.008,0.027,0.019,0.054,0.028,0.081c0.17,0.549,0.359,1.09,0.559,1.625 c0.017,0.046,0.03,0.093,0.048,0.139l0.135,0.345c0.068,0.172,0.142,0.347,0.214,0.521c0.032,0.078,0.063,0.156,0.096,0.233 c0.126,0.297,0.26,0.603,0.412,0.932l0.063,0.137C2.89,42.85,2.92,42.9,2.945,42.952c0.228,0.474,0.468,0.94,0.719,1.399 c0.036,0.067,0.068,0.137,0.105,0.204l0.115,0.198c0.303,0.536,0.622,1.062,0.994,1.635l0.067,0.104 c0.048,0.072,0.101,0.138,0.149,0.21c0.288,0.428,0.586,0.848,0.895,1.26c0.053,0.071,0.1,0.147,0.154,0.217 c0.393,0.515,0.822,1.038,1.289,1.571l0.069,0.08c0.07,0.079,0.149,0.153,0.22,0.232c0.351,0.39,0.71,0.772,1.081,1.143 c0.172,0.172,0.355,0.339,0.533,0.508c0.264,0.252,0.532,0.5,0.805,0.742c0.118,0.105,0.226,0.215,0.346,0.319 c0.09,0.077,0.187,0.146,0.278,0.222c0.369,0.309,0.745,0.609,1.128,0.9c0.195,0.148,0.393,0.291,0.592,0.434 c0.355,0.256,0.715,0.506,1.081,0.747c0.096,0.063,0.188,0.135,0.285,0.197l0.056,0.036c0.086,0.055,0.179,0.103,0.266,0.157 c0.468,0.292,0.942,0.574,1.427,0.84c0.064,0.035,0.128,0.071,0.193,0.106c0.519,0.28,1.05,0.541,1.587,0.792 c0.071,0.033,0.139,0.073,0.211,0.105L19,57.954v-0.052C22.409,59.25,26.117,60,30,60c16.542,0,30-13.458,30-30S46.542,0,30,0z M18.646,47.236l-1.293-1.094C16.618,45.164,16,43.816,16,42c0-0.553-0.448-1-1-1s-1,0.447-1,1c0,3.379,1.676,5.5,3,6.7v6.088 c-0.04-0.021-0.081-0.041-0.12-0.062c-0.59-0.314-1.166-0.652-1.729-1.005c-0.176-0.111-0.352-0.223-0.525-0.337 c-0.356-0.235-0.709-0.48-1.058-0.734c-0.15-0.109-0.301-0.218-0.449-0.33c-0.377-0.286-0.75-0.586-1.12-0.897 c-0.188-0.158-0.372-0.319-0.556-0.481c-0.246-0.219-0.488-0.443-0.727-0.671c-0.17-0.162-0.343-0.32-0.509-0.486 c-0.347-0.348-0.684-0.706-1.012-1.071c-0.568-0.631-1.11-1.287-1.62-1.968c-0.276-0.369-0.55-0.756-0.819-1.156 c-0.162-0.24-0.315-0.487-0.47-0.732c-0.154-0.245-0.304-0.493-0.451-0.743c-0.139-0.237-0.279-0.473-0.411-0.714 c-0.237-0.433-0.463-0.871-0.677-1.318c-0.111-0.231-0.213-0.466-0.317-0.701c-0.133-0.3-0.263-0.6-0.385-0.903 c-0.094-0.231-0.187-0.461-0.275-0.695c-0.186-0.497-0.361-1-0.519-1.509c-0.111-0.359-0.213-0.723-0.31-1.089 c-0.055-0.21-0.11-0.438-0.165-0.668c-0.049-0.203-0.097-0.407-0.142-0.612c-0.041-0.187-0.078-0.377-0.116-0.568 c-0.049-0.252-0.094-0.504-0.136-0.758c-0.023-0.138-0.048-0.27-0.069-0.414c-0.009-0.063-0.015-0.128-0.024-0.191 c-0.076-0.533-0.135-1.072-0.18-1.614c-0.014-0.166-0.027-0.332-0.038-0.499C2.028,31.246,2,30.626,2,30 c0-0.338,0.014-0.673,0.026-1.008c0.026-0.58,0.071-1.195,0.143-1.888l0.039-0.452c0.023-0.188,0.045-0.376,0.072-0.562 c0.034-0.241,0.071-0.482,0.111-0.723c0.038-0.229,0.079-0.457,0.122-0.683c0.046-0.24,0.097-0.479,0.149-0.717 c0.049-0.223,0.1-0.445,0.154-0.665c0.059-0.239,0.123-0.477,0.188-0.715c0.06-0.217,0.12-0.434,0.185-0.649 c0.071-0.235,0.147-0.468,0.224-0.701c0.071-0.216,0.142-0.431,0.218-0.644c0.079-0.222,0.165-0.442,0.25-0.663 c0.086-0.221,0.171-0.444,0.262-0.662c0.083-0.2,0.173-0.398,0.261-0.597c0.104-0.234,0.207-0.469,0.317-0.7 c0.079-0.165,0.164-0.327,0.245-0.49c0.131-0.261,0.26-0.522,0.399-0.778c0.052-0.095,0.108-0.188,0.161-0.283 C5.68,16.142,5.837,15.866,6,15.595v3.694c0,1.493,1.215,2.708,2.707,2.708c0.636,0.001,1.206,0.002,1.258,0.002 c3.48,0.124,6.472,1.777,9.147,5.057c0.195,0.239,0.427,0.434,0.682,0.587c-0.448,0.605-0.841,1.259-1.134,1.981 c-0.208,0.513,0.04,1.096,0.551,1.303c0.514,0.209,1.095-0.039,1.302-0.551c0.482-1.19,1.27-2.177,2.238-2.921 c0.22-0.169,0.456-0.328,0.705-0.475c0.151-0.089,0.299-0.184,0.457-0.261c0.03-0.016,0.061-0.031,0.091-0.047 c0.589-0.278,1.221-0.474,1.878-0.579c0.058-0.007,0.114-0.017,0.172-0.022C26.366,26.029,26.68,26,27,26 c0.315,0,0.625,0.029,0.931,0.07c0.077,0.01,0.153,0.02,0.229,0.033c0.288,0.048,0.571,0.111,0.847,0.193 c0.079,0.024,0.156,0.055,0.235,0.082c0.199,0.067,0.393,0.144,0.583,0.228c0.107,0.047,0.215,0.093,0.319,0.146 c0.221,0.111,0.436,0.234,0.644,0.369c0.123,0.08,0.242,0.169,0.361,0.257c0.109,0.081,0.216,0.165,0.32,0.252 c0.118,0.098,0.236,0.195,0.348,0.302c0.707,0.674,1.285,1.496,1.669,2.445C33.644,30.765,34.018,31,34.414,31 c0.125,0,0.252-0.023,0.375-0.073c0.512-0.207,0.759-0.79,0.551-1.303c-0.294-0.724-0.688-1.381-1.137-1.987 c0.5-0.378,0.859-0.92,0.98-1.576c0.272-1.486,0.786-2.614,1.525-3.354L37,22.414v-5.707l-1.251,0.325 c-0.165,0.042-4.045,1.055-6.177,2.063c-1.429,0.678-2.082,0.012-3.577-2.072c-0.539-0.751-1.097-1.528-1.789-2.225 c-1.24-1.247-1.571-3.069-0.753-4.148c0.896-1.183,2.726-2.541,8.229-0.702l0.195,0.065l0.205-0.018 c0.061-0.003,5.958-0.46,9.059,2.394C42.392,13.54,43,15.048,43,17c0,5.217,1,8.207,1.84,9.796 c1.425,2.699,2.153,5.356,2.162,7.897c0.012,3.379-0.889,5.927-2.678,7.57l-0.179,0.164l-0.083,0.228 C44.045,42.699,42.383,47,35,47h-0.19l-0.177,0.07C34.522,47.114,23.54,51.378,18.646,47.236z M30,58 c-3.903,0-7.621-0.805-11-2.254V50c0.082,0,0.158-0.035,0.238-0.055c5.759,2.687,14.532-0.41,15.95-0.945 c7.672-0.068,10.143-4.327,10.648-5.412c2.114-2.039,3.179-5.031,3.166-8.901c-0.01-2.866-0.815-5.835-2.393-8.823 C45.875,24.473,45,21.808,45,17c0-2.507-0.842-4.554-2.504-6.082c-3.412-3.14-9.172-2.995-10.368-2.929 c-4.946-1.614-8.306-1.139-10.27,1.454c-1.429,1.887-1.029,4.795,0.929,6.766c0.58,0.583,1.09,1.293,1.583,1.98 c1.333,1.856,2.991,4.167,6.057,2.715C31.683,20.31,33.7,19.688,35,19.313v2.295c-0.873,1.011-1.472,2.385-1.785,4.092 c-0.043,0.234-0.199,0.383-0.379,0.457c-0.159-0.136-0.328-0.258-0.495-0.383c-0.194-0.144-0.391-0.28-0.596-0.407 c-0.226-0.143-0.457-0.275-0.693-0.397c-0.097-0.049-0.193-0.098-0.291-0.143c-0.75-0.351-1.546-0.593-2.373-0.72 c-0.022-0.003-0.044-0.006-0.066-0.009c-0.412-0.06-0.831-0.094-1.256-0.094C27.043,24.005,27.022,24,27,24 c-0.009,0-0.017,0.002-0.026,0.002c-0.343,0.004-0.689,0.024-1.038,0.069c-0.051,0.004-0.101,0.015-0.151,0.02 c-0.074,0.01-0.149,0.017-0.223,0.029c-0.844,0.104-1.652,0.354-2.399,0.738c-0.054,0.026-0.106,0.055-0.16,0.082 c-0.062,0.034-0.128,0.061-0.189,0.096c-0.203,0.107-0.397,0.228-0.591,0.35c-0.194,0.121-0.379,0.252-0.563,0.388 c-0.109,0.08-0.222,0.155-0.327,0.24c-0.246,0.061-0.511-0.024-0.672-0.223c-3.06-3.751-6.536-5.646-10.622-5.79 c-0.025-0.001-0.64-0.003-1.331-0.004C8.317,19.997,8,19.68,8,19.289v-6.57c0-0.002-0.001-0.004-0.001-0.007 C13.13,6.196,21.082,2,30,2c15.439,0,28,12.561,28,28S45.439,58,30,58z">
+                      </path>
+                    </g>
+                  </g>
+                </g>
+              </svg>
+            </a>
+          <% end %>
+
+          <div class="flex gap-6">
+            <a
+              href={Routes.user_profile_path(@conn, :profile)}
+              class="text-white hover:bg-gray-600 py-2 px-3 rounded-lg font-poppins transition-all duration-300 header"
+            >
+              PROFILE
+            </a>
+            <a
+              href={Routes.workout_template_activity_history_path(@conn, :history)}
+              class="text-white hover:bg-gray-600 py-2 px-3 rounded-lg font-poppins font-bold transition-all duration-300 header"
+            >
+              ACTIVITY HISTORY
+            </a>
+            <a
+              href={Routes.workout_template_index_path(@conn, :index)}
+              class="text-white hover:bg-gray-600 py-2 px-3 rounded-lg font-poppins transition-all duration-300 header"
+            >
+              WORKOUT TEMPLATES
+            </a>
+            <a
+              href={Routes.exercise_index_path(@conn, :index)}
+              class="text-white hover:bg-gray-600 py-2 px-3 rounded-lg font-poppins transition-all duration-300 header"
+            >
+              EXERCISES
+            </a>
+            <a
+              href={Routes.score_board_path(@conn, :score_board)}
+              class="text-white hover:bg-gray-600 py-2 px-3 rounded-lg font-poppins transition-all duration-300 header"
+            >
+              SCORE BOARD
+            </a>
+          </div>
+          <div class="flex float-left">
+            <%= if @current_user do %>
+              <p class="text-white py-2 px-3 rounded-lg font-poppins transition-all duration-300 header">
+                <%= link to: Routes.user_session_path(@conn, :delete), method: :delete do %>
+                  <svg
+                    class="w-8 h-12 pr-0.5 mr-0 fill-current text-white hover:text-red-300"
+                    fill="#000000"
+                    viewBox="0 0 32 32"
+                    version="1.1"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <g stroke-width="0"></g>
+                    <g stroke-linecap="round" stroke-linejoin="round"></g>
+                    <g>
+                      <path d="M3.651 16.989h17.326c0.553 0 1-0.448 1-1s-0.447-1-1-1h-17.264l3.617-3.617c0.391-0.39 0.391-1.024 0-1.414s-1.024-0.39-1.414 0l-5.907 6.062 5.907 6.063c0.196 0.195 0.451 0.293 0.707 0.293s0.511-0.098 0.707-0.293c0.391-0.39 0.391-1.023 0-1.414zM29.989 0h-17c-1.105 0-2 0.895-2 2v9h2.013v-7.78c0-0.668 0.542-1.21 1.21-1.21h14.523c0.669 0 1.21 0.542 1.21 1.21l0.032 25.572c0 0.668-0.541 1.21-1.21 1.21h-14.553c-0.668 0-1.21-0.542-1.21-1.21v-7.824l-2.013 0.003v9.030c0 1.105 0.895 2 2 2h16.999c1.105 0 2.001-0.895 2.001-2v-28c-0-1.105-0.896-2-2-2z">
+                      </path>
+                    </g>
+                  </svg>
+                <% end %>
+              </p>
             <% else %>
-            <a href="/"> <svg class="w-20 h-14 pr-0.5 mr-0 hover:text-yellow-100 fill-current text-white" fill="#000000" height="200px" width="200px" version="1.1"  xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 60 60" xml:space="preserve"><g  stroke-width="0"></g><g  stroke-linecap="round" stroke-linejoin="round"></g><g > <g> <g> <path d="M30,0C20.203,0,11.489,4.722,6.01,12.008c-0.011,0.013-0.026,0.021-0.036,0.035c-0.121,0.161-0.228,0.332-0.345,0.495 c-0.209,0.291-0.416,0.583-0.614,0.881c-0.15,0.226-0.295,0.455-0.439,0.684c-0.187,0.298-0.368,0.601-0.545,0.906 c-0.117,0.202-0.237,0.402-0.349,0.606c-0.267,0.487-0.521,0.982-0.762,1.484c-0.079,0.165-0.15,0.332-0.225,0.498 c-0.179,0.392-0.35,0.787-0.512,1.188c-0.074,0.183-0.147,0.366-0.217,0.55c-0.18,0.471-0.349,0.948-0.505,1.431 c-0.029,0.088-0.062,0.175-0.089,0.263c-0.178,0.568-0.337,1.145-0.482,1.726c-0.04,0.161-0.075,0.323-0.112,0.484 c-0.102,0.442-0.195,0.888-0.277,1.337c-0.032,0.177-0.066,0.352-0.095,0.53c-0.095,0.574-0.177,1.152-0.238,1.736 c-0.002,0.018-0.006,0.036-0.007,0.054L0.159,26.91c-0.005,0.052-0.008,0.105-0.013,0.158L0.066,28h0.008 c-0.019,0.293-0.035,0.587-0.046,0.882C0.011,29.266,0,29.639,0,30c0,0.667,0.03,1.327,0.073,1.983 c0.001,0.009,0,0.017,0.001,0.026l0.04,0.515c0.001,0.012,0.002,0.024,0.003,0.035c0.024,0.282,0.05,0.564,0.082,0.844 c0.035,0.316,0.074,0.637,0.122,0.971l0.017,0.127c0.001,0.006,0.002,0.012,0.003,0.018c0.094,0.618,0.211,1.229,0.343,1.834 c0.005,0.024,0.008,0.048,0.013,0.072l0.105,0.454c0.014,0.062,0.032,0.125,0.046,0.186c0.051,0.212,0.102,0.424,0.158,0.634 c0.078,0.298,0.164,0.605,0.261,0.934l0.043,0.151c0.008,0.027,0.019,0.054,0.028,0.081c0.17,0.549,0.359,1.09,0.559,1.625 c0.017,0.046,0.03,0.093,0.048,0.139l0.135,0.345c0.068,0.172,0.142,0.347,0.214,0.521c0.032,0.078,0.063,0.156,0.096,0.233 c0.126,0.297,0.26,0.603,0.412,0.932l0.063,0.137C2.89,42.85,2.92,42.9,2.945,42.952c0.228,0.474,0.468,0.94,0.719,1.399 c0.036,0.067,0.068,0.137,0.105,0.204l0.115,0.198c0.303,0.536,0.622,1.062,0.994,1.635l0.067,0.104 c0.048,0.072,0.101,0.138,0.149,0.21c0.288,0.428,0.586,0.848,0.895,1.26c0.053,0.071,0.1,0.147,0.154,0.217 c0.393,0.515,0.822,1.038,1.289,1.571l0.069,0.08c0.07,0.079,0.149,0.153,0.22,0.232c0.351,0.39,0.71,0.772,1.081,1.143 c0.172,0.172,0.355,0.339,0.533,0.508c0.264,0.252,0.532,0.5,0.805,0.742c0.118,0.105,0.226,0.215,0.346,0.319 c0.09,0.077,0.187,0.146,0.278,0.222c0.369,0.309,0.745,0.609,1.128,0.9c0.195,0.148,0.393,0.291,0.592,0.434 c0.355,0.256,0.715,0.506,1.081,0.747c0.096,0.063,0.188,0.135,0.285,0.197l0.056,0.036c0.086,0.055,0.179,0.103,0.266,0.157 c0.468,0.292,0.942,0.574,1.427,0.84c0.064,0.035,0.128,0.071,0.193,0.106c0.519,0.28,1.05,0.541,1.587,0.792 c0.071,0.033,0.139,0.073,0.211,0.105L19,57.954v-0.052C22.409,59.25,26.117,60,30,60c16.542,0,30-13.458,30-30S46.542,0,30,0z M18.646,47.236l-1.293-1.094C16.618,45.164,16,43.816,16,42c0-0.553-0.448-1-1-1s-1,0.447-1,1c0,3.379,1.676,5.5,3,6.7v6.088 c-0.04-0.021-0.081-0.041-0.12-0.062c-0.59-0.314-1.166-0.652-1.729-1.005c-0.176-0.111-0.352-0.223-0.525-0.337 c-0.356-0.235-0.709-0.48-1.058-0.734c-0.15-0.109-0.301-0.218-0.449-0.33c-0.377-0.286-0.75-0.586-1.12-0.897 c-0.188-0.158-0.372-0.319-0.556-0.481c-0.246-0.219-0.488-0.443-0.727-0.671c-0.17-0.162-0.343-0.32-0.509-0.486 c-0.347-0.348-0.684-0.706-1.012-1.071c-0.568-0.631-1.11-1.287-1.62-1.968c-0.276-0.369-0.55-0.756-0.819-1.156 c-0.162-0.24-0.315-0.487-0.47-0.732c-0.154-0.245-0.304-0.493-0.451-0.743c-0.139-0.237-0.279-0.473-0.411-0.714 c-0.237-0.433-0.463-0.871-0.677-1.318c-0.111-0.231-0.213-0.466-0.317-0.701c-0.133-0.3-0.263-0.6-0.385-0.903 c-0.094-0.231-0.187-0.461-0.275-0.695c-0.186-0.497-0.361-1-0.519-1.509c-0.111-0.359-0.213-0.723-0.31-1.089 c-0.055-0.21-0.11-0.438-0.165-0.668c-0.049-0.203-0.097-0.407-0.142-0.612c-0.041-0.187-0.078-0.377-0.116-0.568 c-0.049-0.252-0.094-0.504-0.136-0.758c-0.023-0.138-0.048-0.27-0.069-0.414c-0.009-0.063-0.015-0.128-0.024-0.191 c-0.076-0.533-0.135-1.072-0.18-1.614c-0.014-0.166-0.027-0.332-0.038-0.499C2.028,31.246,2,30.626,2,30 c0-0.338,0.014-0.673,0.026-1.008c0.026-0.58,0.071-1.195,0.143-1.888l0.039-0.452c0.023-0.188,0.045-0.376,0.072-0.562 c0.034-0.241,0.071-0.482,0.111-0.723c0.038-0.229,0.079-0.457,0.122-0.683c0.046-0.24,0.097-0.479,0.149-0.717 c0.049-0.223,0.1-0.445,0.154-0.665c0.059-0.239,0.123-0.477,0.188-0.715c0.06-0.217,0.12-0.434,0.185-0.649 c0.071-0.235,0.147-0.468,0.224-0.701c0.071-0.216,0.142-0.431,0.218-0.644c0.079-0.222,0.165-0.442,0.25-0.663 c0.086-0.221,0.171-0.444,0.262-0.662c0.083-0.2,0.173-0.398,0.261-0.597c0.104-0.234,0.207-0.469,0.317-0.7 c0.079-0.165,0.164-0.327,0.245-0.49c0.131-0.261,0.26-0.522,0.399-0.778c0.052-0.095,0.108-0.188,0.161-0.283 C5.68,16.142,5.837,15.866,6,15.595v3.694c0,1.493,1.215,2.708,2.707,2.708c0.636,0.001,1.206,0.002,1.258,0.002 c3.48,0.124,6.472,1.777,9.147,5.057c0.195,0.239,0.427,0.434,0.682,0.587c-0.448,0.605-0.841,1.259-1.134,1.981 c-0.208,0.513,0.04,1.096,0.551,1.303c0.514,0.209,1.095-0.039,1.302-0.551c0.482-1.19,1.27-2.177,2.238-2.921 c0.22-0.169,0.456-0.328,0.705-0.475c0.151-0.089,0.299-0.184,0.457-0.261c0.03-0.016,0.061-0.031,0.091-0.047 c0.589-0.278,1.221-0.474,1.878-0.579c0.058-0.007,0.114-0.017,0.172-0.022C26.366,26.029,26.68,26,27,26 c0.315,0,0.625,0.029,0.931,0.07c0.077,0.01,0.153,0.02,0.229,0.033c0.288,0.048,0.571,0.111,0.847,0.193 c0.079,0.024,0.156,0.055,0.235,0.082c0.199,0.067,0.393,0.144,0.583,0.228c0.107,0.047,0.215,0.093,0.319,0.146 c0.221,0.111,0.436,0.234,0.644,0.369c0.123,0.08,0.242,0.169,0.361,0.257c0.109,0.081,0.216,0.165,0.32,0.252 c0.118,0.098,0.236,0.195,0.348,0.302c0.707,0.674,1.285,1.496,1.669,2.445C33.644,30.765,34.018,31,34.414,31 c0.125,0,0.252-0.023,0.375-0.073c0.512-0.207,0.759-0.79,0.551-1.303c-0.294-0.724-0.688-1.381-1.137-1.987 c0.5-0.378,0.859-0.92,0.98-1.576c0.272-1.486,0.786-2.614,1.525-3.354L37,22.414v-5.707l-1.251,0.325 c-0.165,0.042-4.045,1.055-6.177,2.063c-1.429,0.678-2.082,0.012-3.577-2.072c-0.539-0.751-1.097-1.528-1.789-2.225 c-1.24-1.247-1.571-3.069-0.753-4.148c0.896-1.183,2.726-2.541,8.229-0.702l0.195,0.065l0.205-0.018 c0.061-0.003,5.958-0.46,9.059,2.394C42.392,13.54,43,15.048,43,17c0,5.217,1,8.207,1.84,9.796 c1.425,2.699,2.153,5.356,2.162,7.897c0.012,3.379-0.889,5.927-2.678,7.57l-0.179,0.164l-0.083,0.228 C44.045,42.699,42.383,47,35,47h-0.19l-0.177,0.07C34.522,47.114,23.54,51.378,18.646,47.236z M30,58 c-3.903,0-7.621-0.805-11-2.254V50c0.082,0,0.158-0.035,0.238-0.055c5.759,2.687,14.532-0.41,15.95-0.945 c7.672-0.068,10.143-4.327,10.648-5.412c2.114-2.039,3.179-5.031,3.166-8.901c-0.01-2.866-0.815-5.835-2.393-8.823 C45.875,24.473,45,21.808,45,17c0-2.507-0.842-4.554-2.504-6.082c-3.412-3.14-9.172-2.995-10.368-2.929 c-4.946-1.614-8.306-1.139-10.27,1.454c-1.429,1.887-1.029,4.795,0.929,6.766c0.58,0.583,1.09,1.293,1.583,1.98 c1.333,1.856,2.991,4.167,6.057,2.715C31.683,20.31,33.7,19.688,35,19.313v2.295c-0.873,1.011-1.472,2.385-1.785,4.092 c-0.043,0.234-0.199,0.383-0.379,0.457c-0.159-0.136-0.328-0.258-0.495-0.383c-0.194-0.144-0.391-0.28-0.596-0.407 c-0.226-0.143-0.457-0.275-0.693-0.397c-0.097-0.049-0.193-0.098-0.291-0.143c-0.75-0.351-1.546-0.593-2.373-0.72 c-0.022-0.003-0.044-0.006-0.066-0.009c-0.412-0.06-0.831-0.094-1.256-0.094C27.043,24.005,27.022,24,27,24 c-0.009,0-0.017,0.002-0.026,0.002c-0.343,0.004-0.689,0.024-1.038,0.069c-0.051,0.004-0.101,0.015-0.151,0.02 c-0.074,0.01-0.149,0.017-0.223,0.029c-0.844,0.104-1.652,0.354-2.399,0.738c-0.054,0.026-0.106,0.055-0.16,0.082 c-0.062,0.034-0.128,0.061-0.189,0.096c-0.203,0.107-0.397,0.228-0.591,0.35c-0.194,0.121-0.379,0.252-0.563,0.388 c-0.109,0.08-0.222,0.155-0.327,0.24c-0.246,0.061-0.511-0.024-0.672-0.223c-3.06-3.751-6.536-5.646-10.622-5.79 c-0.025-0.001-0.64-0.003-1.331-0.004C8.317,19.997,8,19.68,8,19.289v-6.57c0-0.002-0.001-0.004-0.001-0.007 C13.13,6.196,21.082,2,30,2c15.439,0,28,12.561,28,28S45.439,58,30,58z"></path> </g> </g> </g></svg></a>
+              <p class="text-white py-2 px-3 rounded-lg font-poppins transition-all duration-300 header">
+                <%= link to: Routes.user_session_path(@conn, :new) do %>
+                  <svg
+                    class="w-8 h-12 pr-0.5 mr-0 fill-current text-white hover:text-green-300"
+                    fill="#000000"
+                    viewBox="0 0 32 32"
+                    version="1.1"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <g stroke-width="0"></g>
+                    <g stroke-linecap="round" stroke-linejoin="round"></g>
+                    <g>
+                      <path d="M16.642 20.669c-0.391 0.39-0.391 1.023-0 1.414 0.195 0.195 0.451 0.293 0.707 0.293s0.512-0.098 0.707-0.293l5.907-6.063-5.907-6.063c-0.39-0.39-1.023-0.39-1.414 0s-0.391 1.024 0 1.414l3.617 3.617h-19.264c-0.552 0-1 0.448-1 1s0.448 1 1 1h19.326zM30.005 0h-18c-1.105 0-2.001 0.895-2.001 2v9h2.014v-7.78c0-0.668 0.542-1.21 1.21-1.21h15.522c0.669 0 1.21 0.542 1.21 1.21l0.032 25.572c0 0.668-0.541 1.21-1.21 1.21h-15.553c-0.668 0-1.21-0.542-1.21-1.21v-7.824l-2.014 0.003v9.030c0 1.105 0.896 2 2.001 2h18c1.105 0 2-0.895 2-2v-28c-0.001-1.105-0.896-2-2-2z">
+                      </path>
+                    </g>
+                  </svg>
+                <% end %>
+              </p>
+              <p class="text-white py-2 px-3 rounded-lg font-poppins transition-all duration-300 header">
+                <%= link to: Routes.user_registration_path(@conn, :new) do %>
+                  <svg
+                    class="w-8 h-12 pr-0.5 mr-0 fill-current text-white hover:text-blue-400"
+                    fill="#000000"
+                    viewBox="0 0 24 24"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <g stroke-width="0"></g>
+                    <g stroke-linecap="round" stroke-linejoin="round"></g>
+                    <g>
+                      <path
+                        fill-rule="evenodd"
+                        d="M7,16 L17,16 C19.7614237,16 22,18.2385763 22,21 C22,21.5522847 21.5522847,22 21,22 C20.4871642,22 20.0644928,21.6139598 20.0067277,21.1166211 L19.9949073,20.8237272 C19.9070404,19.3072462 18.6927538,18.0929596 17.1762728,18.0050927 L17,18 L7,18 C5.34314575,18 4,19.3431458 4,21 C4,21.5522847 3.55228475,22 3,22 C2.44771525,22 2,21.5522847 2,21 C2,18.3112453 4.12230671,16.1181819 6.78311038,16.0046195 L7,16 Z M12,2 C12.4062134,2 12.8078123,2.04051239 13.2003571,2.12029429 C13.7415768,2.23029326 14.0911502,2.75821022 13.9811512,3.29942984 C13.8711522,3.84064945 13.3432353,4.19022286 12.8020157,4.08022389 C12.5403924,4.02705085 12.2722375,4 12,4 C9.790861,4 8,5.790861 8,8 C8,10.209139 9.790861,12 12,12 C13.2748073,12 14.4481613,11.4008085 15.2000781,10.4003828 C15.5318999,9.95889366 16.1587924,9.86999074 16.6002816,10.2018126 C17.0417708,10.5336345 17.1306737,11.1605269 16.7988518,11.6020161 C15.6730783,13.0998584 13.9103951,14 12,14 C8.6862915,14 6,11.3137085 6,8 C6,4.6862915 8.6862915,2 12,2 Z M19,2 C19.5522847,2 20,2.44771525 20,3 L20,4 L21,4 C21.5522847,4 22,4.44771525 22,5 C22,5.55228475 21.5522847,6 21,6 L20,6 L20,7 C20,7.55228475 19.5522847,8 19,8 C18.4477153,8 18,7.55228475 18,7 L18,6 L17,6 C16.4477153,6 16,5.55228475 16,5 C16,4.44771525 16.4477153,4 17,4 L18,4 L18,3 C18,2.44771525 18.4477153,2 19,2 Z"
+                      >
+                      </path>
+                    </g>
+                  </svg>
+                <% end %>
+              </p>
             <% end %>
-  
-            <div class="flex gap-6">
-              <a href={Routes.user_profile_path(@conn, :profile)} class="text-white hover:bg-gray-600 py-2 px-3 rounded-lg font-poppins transition-all duration-300 header">PROFILE</a>
-              <a href={Routes.workout_template_activity_history_path(@conn, :history)} class="text-white hover:bg-gray-600 py-2 px-3 rounded-lg font-poppins font-bold transition-all duration-300 header">ACTIVITY HISTORY</a>
-              <a href={Routes.workout_template_index_path(@conn, :index)} class="text-white hover:bg-gray-600 py-2 px-3 rounded-lg font-poppins transition-all duration-300 header">WORKOUT TEMPLATES</a>
-              <a href={Routes.exercise_index_path(@conn, :index)} class="text-white hover:bg-gray-600 py-2 px-3 rounded-lg font-poppins transition-all duration-300 header">EXERCISES</a>
-              <a href={Routes.score_board_path(@conn, :score_board)} class="text-white hover:bg-gray-600 py-2 px-3 rounded-lg font-poppins transition-all duration-300 header">SCORE BOARD</a>
-            </div>
-            <div class="flex float-left">
-              <%= if @current_user do %>
-              <p class="text-white py-2 px-3 rounded-lg font-poppins transition-all duration-300 header"><%= link to: Routes.user_session_path(@conn, :delete), method: :delete do %><svg class="w-8 h-12 pr-0.5 mr-0 fill-current text-white hover:text-red-300" fill="#000000" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg"><g stroke-width="0"></g><g stroke-linecap="round" stroke-linejoin="round"></g><g> <path d="M3.651 16.989h17.326c0.553 0 1-0.448 1-1s-0.447-1-1-1h-17.264l3.617-3.617c0.391-0.39 0.391-1.024 0-1.414s-1.024-0.39-1.414 0l-5.907 6.062 5.907 6.063c0.196 0.195 0.451 0.293 0.707 0.293s0.511-0.098 0.707-0.293c0.391-0.39 0.391-1.023 0-1.414zM29.989 0h-17c-1.105 0-2 0.895-2 2v9h2.013v-7.78c0-0.668 0.542-1.21 1.21-1.21h14.523c0.669 0 1.21 0.542 1.21 1.21l0.032 25.572c0 0.668-0.541 1.21-1.21 1.21h-14.553c-0.668 0-1.21-0.542-1.21-1.21v-7.824l-2.013 0.003v9.030c0 1.105 0.895 2 2 2h16.999c1.105 0 2.001-0.895 2.001-2v-28c-0-1.105-0.896-2-2-2z"></path> </g></svg><% end %></p>
-              <% else %>
-              <p class="text-white py-2 px-3 rounded-lg font-poppins transition-all duration-300 header"><%= link to: Routes.user_session_path(@conn, :new) do %><svg class="w-8 h-12 pr-0.5 mr-0 fill-current text-white hover:text-green-300" fill="#000000" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg"><g stroke-width="0"></g><g stroke-linecap="round" stroke-linejoin="round"></g><g> <path d="M16.642 20.669c-0.391 0.39-0.391 1.023-0 1.414 0.195 0.195 0.451 0.293 0.707 0.293s0.512-0.098 0.707-0.293l5.907-6.063-5.907-6.063c-0.39-0.39-1.023-0.39-1.414 0s-0.391 1.024 0 1.414l3.617 3.617h-19.264c-0.552 0-1 0.448-1 1s0.448 1 1 1h19.326zM30.005 0h-18c-1.105 0-2.001 0.895-2.001 2v9h2.014v-7.78c0-0.668 0.542-1.21 1.21-1.21h15.522c0.669 0 1.21 0.542 1.21 1.21l0.032 25.572c0 0.668-0.541 1.21-1.21 1.21h-15.553c-0.668 0-1.21-0.542-1.21-1.21v-7.824l-2.014 0.003v9.030c0 1.105 0.896 2 2.001 2h18c1.105 0 2-0.895 2-2v-28c-0.001-1.105-0.896-2-2-2z"></path> </g></svg> <% end %></p>
-              <p class="text-white py-2 px-3 rounded-lg font-poppins transition-all duration-300 header"><%= link to: Routes.user_registration_path(@conn, :new) do %><svg class="w-8 h-12 pr-0.5 mr-0 fill-current text-white hover:text-blue-400" fill="#000000" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g stroke-width="0"></g><g stroke-linecap="round" stroke-linejoin="round"></g><g> <path fill-rule="evenodd" d="M7,16 L17,16 C19.7614237,16 22,18.2385763 22,21 C22,21.5522847 21.5522847,22 21,22 C20.4871642,22 20.0644928,21.6139598 20.0067277,21.1166211 L19.9949073,20.8237272 C19.9070404,19.3072462 18.6927538,18.0929596 17.1762728,18.0050927 L17,18 L7,18 C5.34314575,18 4,19.3431458 4,21 C4,21.5522847 3.55228475,22 3,22 C2.44771525,22 2,21.5522847 2,21 C2,18.3112453 4.12230671,16.1181819 6.78311038,16.0046195 L7,16 Z M12,2 C12.4062134,2 12.8078123,2.04051239 13.2003571,2.12029429 C13.7415768,2.23029326 14.0911502,2.75821022 13.9811512,3.29942984 C13.8711522,3.84064945 13.3432353,4.19022286 12.8020157,4.08022389 C12.5403924,4.02705085 12.2722375,4 12,4 C9.790861,4 8,5.790861 8,8 C8,10.209139 9.790861,12 12,12 C13.2748073,12 14.4481613,11.4008085 15.2000781,10.4003828 C15.5318999,9.95889366 16.1587924,9.86999074 16.6002816,10.2018126 C17.0417708,10.5336345 17.1306737,11.1605269 16.7988518,11.6020161 C15.6730783,13.0998584 13.9103951,14 12,14 C8.6862915,14 6,11.3137085 6,8 C6,4.6862915 8.6862915,2 12,2 Z M19,2 C19.5522847,2 20,2.44771525 20,3 L20,4 L21,4 C21.5522847,4 22,4.44771525 22,5 C22,5.55228475 21.5522847,6 21,6 L20,6 L20,7 C20,7.55228475 19.5522847,8 19,8 C18.4477153,8 18,7.55228475 18,7 L18,6 L17,6 C16.4477153,6 16,5.55228475 16,5 C16,4.44771525 16.4477153,4 17,4 L18,4 L18,3 C18,2.44771525 18.4477153,2 19,2 Z"></path> </g></svg><% end %></p>
-              <% end %>
-            </div>
-          </nav>
-          <%= render "_user_menu.html", assigns %>
+          </div>
+        </nav>
+        <%= render("_user_menu.html", assigns) %>
       </section>
     </header>
     <%= @inner_content %>
diff --git a/lib/fitness_web/templates/page/index.html.heex b/lib/fitness_web/templates/page/index.html.heex
index 5359b98..04d755f 100644
--- a/lib/fitness_web/templates/page/index.html.heex
+++ b/lib/fitness_web/templates/page/index.html.heex
@@ -1,53 +1,116 @@
 <title class="font-poppins">Welcome to Muscle Mind</title>
-  
-<body class="bg-cover bg-center mb-36 overflow-hidden" style="background-image: url('/images/background.jpg')">
+
+<body
+  class="bg-cover bg-center mb-36 overflow-hidden"
+  style="background-image: url('/images/background.jpg')"
+>
   <div class="flex flex-col h-screen justify-center  font-poppins items-center bg-white bg-opacity-50 py-12 px-4">
-    <h1 class="text-3xl md:text-4xl lg:text-4xl font-poppins text-center font-bold mb-8 text-gray-900">Welcome to the Muscle Mind web application</h1>
-    <p class="text-lg md:text-xl lg:text-2xl font-poppins text-center mb-12 text-gray-700">Get fit, stay healthy, and achieve your goals with our app</p>
+    <h1 class="text-3xl md:text-4xl lg:text-4xl font-poppins text-center font-bold mb-8 text-gray-900">
+      Welcome to the Muscle Mind web application
+    </h1>
+    <p class="text-lg md:text-xl lg:text-2xl font-poppins text-center mb-12 text-gray-700">
+      Get fit, stay healthy, and achieve your goals with our app
+    </p>
     <%= if assigns[:current_user] do %>
-    <button class="cta">
-      <span class="span font-poppins"><a href="/exercises">Let Start Some Workout</a></span>
-      <span class="second">
-        <svg width="50px" height="20px" viewBox="0 0 66 43" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-          <g id="arrow" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-            <path class="one" d="M40.1543933,3.89485454 L43.9763149,0.139296592 C44.1708311,-0.0518420739 44.4826329,-0.0518571125 44.6771675,0.139262789 L65.6916134,20.7848311 C66.0855801,21.1718824 66.0911863,21.8050225 65.704135,22.1989893 C65.7000188,22.2031791 65.6958657,22.2073326 65.6916762,22.2114492 L44.677098,42.8607841 C44.4825957,43.0519059 44.1708242,43.0519358 43.9762853,42.8608513 L40.1545186,39.1069479 C39.9575152,38.9134427 39.9546793,38.5968729 40.1481845,38.3998695 C40.1502893,38.3977268 40.1524132,38.395603 40.1545562,38.3934985 L56.9937789,21.8567812 C57.1908028,21.6632968 57.193672,21.3467273 57.0001876,21.1497035 C56.9980647,21.1475418 56.9959223,21.1453995 56.9937605,21.1432767 L40.1545208,4.60825197 C39.9574869,4.41477773 39.9546013,4.09820839 40.1480756,3.90117456 C40.1501626,3.89904911 40.1522686,3.89694235 40.1543933,3.89485454 Z" fill="#FFFFFF"></path>
-            <path class="two" d="M20.1543933,3.89485454 L23.9763149,0.139296592 C24.1708311,-0.0518420739 24.4826329,-0.0518571125 24.6771675,0.139262789 L45.6916134,20.7848311 C46.0855801,21.1718824 46.0911863,21.8050225 45.704135,22.1989893 C45.7000188,22.2031791 45.6958657,22.2073326 45.6916762,22.2114492 L24.677098,42.8607841 C24.4825957,43.0519059 24.1708242,43.0519358 23.9762853,42.8608513 L20.1545186,39.1069479 C19.9575152,38.9134427 19.9546793,38.5968729 20.1481845,38.3998695 C20.1502893,38.3977268 20.1524132,38.395603 20.1545562,38.3934985 L36.9937789,21.8567812 C37.1908028,21.6632968 37.193672,21.3467273 37.0001876,21.1497035 C36.9980647,21.1475418 36.9959223,21.1453995 36.9937605,21.1432767 L20.1545208,4.60825197 C19.9574869,4.41477773 19.9546013,4.09820839 20.1480756,3.90117456 C20.1501626,3.89904911 20.1522686,3.89694235 20.1543933,3.89485454 Z" fill="#FFFFFF"></path>
-            <path class="three" d="M0.154393339,3.89485454 L3.97631488,0.139296592 C4.17083111,-0.0518420739 4.48263286,-0.0518571125 4.67716753,0.139262789 L25.6916134,20.7848311 C26.0855801,21.1718824 26.0911863,21.8050225 25.704135,22.1989893 C25.7000188,22.2031791 25.6958657,22.2073326 25.6916762,22.2114492 L4.67709797,42.8607841 C4.48259567,43.0519059 4.17082418,43.0519358 3.97628526,42.8608513 L0.154518591,39.1069479 C-0.0424848215,38.9134427 -0.0453206733,38.5968729 0.148184538,38.3998695 C0.150289256,38.3977268 0.152413239,38.395603 0.154556228,38.3934985 L16.9937789,21.8567812 C17.1908028,21.6632968 17.193672,21.3467273 17.0001876,21.1497035 C16.9980647,21.1475418 16.9959223,21.1453995 16.9937605,21.1432767 L0.15452076,4.60825197 C-0.0425130651,4.41477773 -0.0453986756,4.09820839 0.148075568,3.90117456 C0.150162624,3.89904911 0.152268631,3.89694235 0.154393339,3.89485454 Z" fill="#FFFFFF"></path>
-          </g>
-        </svg>
-      </span> 
-  </button>
+      <button class="cta">
+        <span class="span font-poppins"><a href="/exercises">Let Start Some Workout</a></span>
+        <span class="second">
+          <svg
+            width="50px"
+            height="20px"
+            viewBox="0 0 66 43"
+            version="1.1"
+            xmlns="http://www.w3.org/2000/svg"
+            xmlns:xlink="http://www.w3.org/1999/xlink"
+          >
+            <g id="arrow" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+              <path
+                class="one"
+                d="M40.1543933,3.89485454 L43.9763149,0.139296592 C44.1708311,-0.0518420739 44.4826329,-0.0518571125 44.6771675,0.139262789 L65.6916134,20.7848311 C66.0855801,21.1718824 66.0911863,21.8050225 65.704135,22.1989893 C65.7000188,22.2031791 65.6958657,22.2073326 65.6916762,22.2114492 L44.677098,42.8607841 C44.4825957,43.0519059 44.1708242,43.0519358 43.9762853,42.8608513 L40.1545186,39.1069479 C39.9575152,38.9134427 39.9546793,38.5968729 40.1481845,38.3998695 C40.1502893,38.3977268 40.1524132,38.395603 40.1545562,38.3934985 L56.9937789,21.8567812 C57.1908028,21.6632968 57.193672,21.3467273 57.0001876,21.1497035 C56.9980647,21.1475418 56.9959223,21.1453995 56.9937605,21.1432767 L40.1545208,4.60825197 C39.9574869,4.41477773 39.9546013,4.09820839 40.1480756,3.90117456 C40.1501626,3.89904911 40.1522686,3.89694235 40.1543933,3.89485454 Z"
+                fill="#FFFFFF"
+              >
+              </path>
+              <path
+                class="two"
+                d="M20.1543933,3.89485454 L23.9763149,0.139296592 C24.1708311,-0.0518420739 24.4826329,-0.0518571125 24.6771675,0.139262789 L45.6916134,20.7848311 C46.0855801,21.1718824 46.0911863,21.8050225 45.704135,22.1989893 C45.7000188,22.2031791 45.6958657,22.2073326 45.6916762,22.2114492 L24.677098,42.8607841 C24.4825957,43.0519059 24.1708242,43.0519358 23.9762853,42.8608513 L20.1545186,39.1069479 C19.9575152,38.9134427 19.9546793,38.5968729 20.1481845,38.3998695 C20.1502893,38.3977268 20.1524132,38.395603 20.1545562,38.3934985 L36.9937789,21.8567812 C37.1908028,21.6632968 37.193672,21.3467273 37.0001876,21.1497035 C36.9980647,21.1475418 36.9959223,21.1453995 36.9937605,21.1432767 L20.1545208,4.60825197 C19.9574869,4.41477773 19.9546013,4.09820839 20.1480756,3.90117456 C20.1501626,3.89904911 20.1522686,3.89694235 20.1543933,3.89485454 Z"
+                fill="#FFFFFF"
+              >
+              </path>
+              <path
+                class="three"
+                d="M0.154393339,3.89485454 L3.97631488,0.139296592 C4.17083111,-0.0518420739 4.48263286,-0.0518571125 4.67716753,0.139262789 L25.6916134,20.7848311 C26.0855801,21.1718824 26.0911863,21.8050225 25.704135,22.1989893 C25.7000188,22.2031791 25.6958657,22.2073326 25.6916762,22.2114492 L4.67709797,42.8607841 C4.48259567,43.0519059 4.17082418,43.0519358 3.97628526,42.8608513 L0.154518591,39.1069479 C-0.0424848215,38.9134427 -0.0453206733,38.5968729 0.148184538,38.3998695 C0.150289256,38.3977268 0.152413239,38.395603 0.154556228,38.3934985 L16.9937789,21.8567812 C17.1908028,21.6632968 17.193672,21.3467273 17.0001876,21.1497035 C16.9980647,21.1475418 16.9959223,21.1453995 16.9937605,21.1432767 L0.15452076,4.60825197 C-0.0425130651,4.41477773 -0.0453986756,4.09820839 0.148075568,3.90117456 C0.150162624,3.89904911 0.152268631,3.89694235 0.154393339,3.89485454 Z"
+                fill="#FFFFFF"
+              >
+              </path>
+            </g>
+          </svg>
+        </span>
+      </button>
     <% else %>
-    <div class="voltage-button font-poppins">
-      
-      
-      <button><a href="/users/register">Sign Up</a></button>
-      <svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 234.6 61.3" preserveAspectRatio="none" xml:space="preserve">
-     
-        <filter id="glow">
-          <feGaussianBlur class="blur" result="coloredBlur" stdDeviation="2"></feGaussianBlur>
-          <feTurbulence type="fractalNoise" baseFrequency="0.075" numOctaves="0.3" result="turbulence"></feTurbulence>
-      <feDisplacementMap in="SourceGraphic" in2="turbulence" scale="30" xChannelSelector="R" yChannelSelector="G" result="displace"></feDisplacementMap>
-          <feMerge>
-            <feMergeNode in="coloredBlur"></feMergeNode>
-            <feMergeNode in="coloredBlur"></feMergeNode>
-            <feMergeNode in="coloredBlur"></feMergeNode>
-            <feMergeNode in="displace"></feMergeNode>
-            <feMergeNode in="SourceGraphic"></feMergeNode>
-          </feMerge>
-        </filter>
-        <path class="voltage line-1" d="m216.3 51.2c-3.7 0-3.7-1.1-7.3-1.1-3.7 0-3.7 6.8-7.3 6.8-3.7 0-3.7-4.6-7.3-4.6-3.7 0-3.7 3.6-7.3 3.6-3.7 0-3.7-0.9-7.3-0.9-3.7 0-3.7-2.7-7.3-2.7-3.7 0-3.7 7.8-7.3 7.8-3.7 0-3.7-4.9-7.3-4.9-3.7 0-3.7-7.8-7.3-7.8-3.7 0-3.7-1.1-7.3-1.1-3.7 0-3.7 3.1-7.3 3.1-3.7 0-3.7 10.9-7.3 10.9-3.7 0-3.7-12.5-7.3-12.5-3.7 0-3.7 4.6-7.3 4.6-3.7 0-3.7 4.5-7.3 4.5-3.7 0-3.7 3.6-7.3 3.6-3.7 0-3.7-10-7.3-10-3.7 0-3.7-0.4-7.3-0.4-3.7 0-3.7 2.3-7.3 2.3-3.7 0-3.7 7.1-7.3 7.1-3.7 0-3.7-11.2-7.3-11.2-3.7 0-3.7 3.5-7.3 3.5-3.7 0-3.7 3.6-7.3 3.6-3.7 0-3.7-2.9-7.3-2.9-3.7 0-3.7 8.4-7.3 8.4-3.7 0-3.7-14.6-7.3-14.6-3.7 0-3.7 5.8-7.3 5.8-2.2 0-3.8-0.4-5.5-1.5-1.8-1.1-1.8-2.9-2.9-4.8-1-1.8 1.9-2.7 1.9-4.8 0-3.4-2.1-3.4-2.1-6.8s-9.9-3.4-9.9-6.8 8-3.4 8-6.8c0-2.2 2.1-2.4 3.1-4.2 1.1-1.8 0.2-3.9 2-5 1.8-1 3.1-7.9 5.3-7.9 3.7 0 3.7 0.9 7.3 0.9 3.7 0 3.7 6.7 7.3 6.7 3.7 0 3.7-1.8 7.3-1.8 3.7 0 3.7-0.6 7.3-0.6 3.7 0 3.7-7.8 7.3-7.8h7.3c3.7 0 3.7 4.7 7.3 4.7 3.7 0 3.7-1.1 7.3-1.1 3.7 0 3.7 11.6 7.3 11.6 3.7 0 3.7-2.6 7.3-2.6 3.7 0 3.7-12.9 7.3-12.9 3.7 0 3.7 10.9 7.3 10.9 3.7 0 3.7 1.3 7.3 1.3 3.7 0 3.7-8.7 7.3-8.7 3.7 0 3.7 11.5 7.3 11.5 3.7 0 3.7-1.4 7.3-1.4 3.7 0 3.7-2.6 7.3-2.6 3.7 0 3.7-5.8 7.3-5.8 3.7 0 3.7-1.3 7.3-1.3 3.7 0 3.7 6.6 7.3 6.6s3.7-9.3 7.3-9.3c3.7 0 3.7 0.2 7.3 0.2 3.7 0 3.7 8.5 7.3 8.5 3.7 0 3.7 0.2 7.3 0.2 3.7 0 3.7-1.5 7.3-1.5 3.7 0 3.7 1.6 7.3 1.6s3.7-5.1 7.3-5.1c2.2 0 0.6 9.6 2.4 10.7s4.1-2 5.1-0.1c1 1.8 10.3 2.2 10.3 4.3 0 3.4-10.7 3.4-10.7 6.8s1.2 3.4 1.2 6.8 1.9 3.4 1.9 6.8c0 2.2 7.2 7.7 6.2 9.5-1.1 1.8-12.3-6.5-14.1-5.5-1.7 0.9-0.1 6.2-2.2 6.2z" fill="transparent" stroke="#fff"></path>
-        <path class="voltage line-2" d="m216.3 52.1c-3 0-3-0.5-6-0.5s-3 3-6 3-3-2-6-2-3 1.6-6 1.6-3-0.4-6-0.4-3-1.2-6-1.2-3 3.4-6 3.4-3-2.2-6-2.2-3-3.4-6-3.4-3-0.5-6-0.5-3 1.4-6 1.4-3 4.8-6 4.8-3-5.5-6-5.5-3 2-6 2-3 2-6 2-3 1.6-6 1.6-3-4.4-6-4.4-3-0.2-6-0.2-3 1-6 1-3 3.1-6 3.1-3-4.9-6-4.9-3 1.5-6 1.5-3 1.6-6 1.6-3-1.3-6-1.3-3 3.7-6 3.7-3-6.4-6-6.4-3 2.5-6 2.5h-6c-3 0-3-0.6-6-0.6s-3-1.4-6-1.4-3 0.9-6 0.9-3 4.3-6 4.3-3-3.5-6-3.5c-2.2 0-3.4-1.3-5.2-2.3-1.8-1.1-3.6-1.5-4.6-3.3s-4.4-3.5-4.4-5.7c0-3.4 0.4-3.4 0.4-6.8s2.9-3.4 2.9-6.8-0.8-3.4-0.8-6.8c0-2.2 0.3-4.2 1.3-5.9 1.1-1.8 0.8-6.2 2.6-7.3 1.8-1 5.5-2 7.7-2 3 0 3 2 6 2s3-0.5 6-0.5 3 5.1 6 5.1 3-1.1 6-1.1 3-5.6 6-5.6 3 4.8 6 4.8 3 0.6 6 0.6 3-3.8 6-3.8 3 5.1 6 5.1 3-0.6 6-0.6 3-1.2 6-1.2 3-2.6 6-2.6 3-0.6 6-0.6 3 2.9 6 2.9 3-4.1 6-4.1 3 0.1 6 0.1 3 3.7 6 3.7 3 0.1 6 0.1 3-0.6 6-0.6 3 0.7 6 0.7 3-2.2 6-2.2 3 4.4 6 4.4 3-1.7 6-1.7 3-4 6-4 3 4.7 6 4.7 3-0.5 6-0.5 3-0.8 6-0.8 3-3.8 6-3.8 3 6.3 6 6.3 3-4.8 6-4.8 3 1.9 6 1.9 3-1.9 6-1.9 3 1.3 6 1.3c2.2 0 5-0.5 6.7 0.5 1.8 1.1 2.4 4 3.5 5.8 1 1.8 0.3 3.7 0.3 5.9 0 3.4 3.4 3.4 3.4 6.8s-3.3 3.4-3.3 6.8 4 3.4 4 6.8c0 2.2-6 2.7-7 4.4-1.1 1.8 1.1 6.7-0.7 7.7-1.6 0.8-4.7-1.1-6.8-1.1z" fill="transparent" stroke="#fff"></path>
-      </svg>
-      <div class="dots">
-        <div class="dot dot-1"></div>
-        <div class="dot dot-2"></div>
-        <div class="dot dot-3"></div>
-        <div class="dot dot-4"></div>
-        <div class="dot dot-5"></div>
+      <div class="voltage-button font-poppins">
+        <button><a href="/users/register">Sign Up</a></button>
+        <svg
+          version="1.1"
+          xmlns="http://www.w3.org/2000/svg"
+          x="0px"
+          y="0px"
+          viewBox="0 0 234.6 61.3"
+          preserveAspectRatio="none"
+          xml:space="preserve"
+        >
+          <filter id="glow">
+            <feGaussianBlur class="blur" result="coloredBlur" stdDeviation="2"></feGaussianBlur>
+            <feTurbulence
+              type="fractalNoise"
+              baseFrequency="0.075"
+              numOctaves="0.3"
+              result="turbulence"
+            >
+            </feTurbulence>
+            <feDisplacementMap
+              in="SourceGraphic"
+              in2="turbulence"
+              scale="30"
+              xChannelSelector="R"
+              yChannelSelector="G"
+              result="displace"
+            >
+            </feDisplacementMap>
+            <feMerge>
+              <feMergeNode in="coloredBlur"></feMergeNode>
+              <feMergeNode in="coloredBlur"></feMergeNode>
+              <feMergeNode in="coloredBlur"></feMergeNode>
+              <feMergeNode in="displace"></feMergeNode>
+              <feMergeNode in="SourceGraphic"></feMergeNode>
+            </feMerge>
+          </filter>
+          <path
+            class="voltage line-1"
+            d="m216.3 51.2c-3.7 0-3.7-1.1-7.3-1.1-3.7 0-3.7 6.8-7.3 6.8-3.7 0-3.7-4.6-7.3-4.6-3.7 0-3.7 3.6-7.3 3.6-3.7 0-3.7-0.9-7.3-0.9-3.7 0-3.7-2.7-7.3-2.7-3.7 0-3.7 7.8-7.3 7.8-3.7 0-3.7-4.9-7.3-4.9-3.7 0-3.7-7.8-7.3-7.8-3.7 0-3.7-1.1-7.3-1.1-3.7 0-3.7 3.1-7.3 3.1-3.7 0-3.7 10.9-7.3 10.9-3.7 0-3.7-12.5-7.3-12.5-3.7 0-3.7 4.6-7.3 4.6-3.7 0-3.7 4.5-7.3 4.5-3.7 0-3.7 3.6-7.3 3.6-3.7 0-3.7-10-7.3-10-3.7 0-3.7-0.4-7.3-0.4-3.7 0-3.7 2.3-7.3 2.3-3.7 0-3.7 7.1-7.3 7.1-3.7 0-3.7-11.2-7.3-11.2-3.7 0-3.7 3.5-7.3 3.5-3.7 0-3.7 3.6-7.3 3.6-3.7 0-3.7-2.9-7.3-2.9-3.7 0-3.7 8.4-7.3 8.4-3.7 0-3.7-14.6-7.3-14.6-3.7 0-3.7 5.8-7.3 5.8-2.2 0-3.8-0.4-5.5-1.5-1.8-1.1-1.8-2.9-2.9-4.8-1-1.8 1.9-2.7 1.9-4.8 0-3.4-2.1-3.4-2.1-6.8s-9.9-3.4-9.9-6.8 8-3.4 8-6.8c0-2.2 2.1-2.4 3.1-4.2 1.1-1.8 0.2-3.9 2-5 1.8-1 3.1-7.9 5.3-7.9 3.7 0 3.7 0.9 7.3 0.9 3.7 0 3.7 6.7 7.3 6.7 3.7 0 3.7-1.8 7.3-1.8 3.7 0 3.7-0.6 7.3-0.6 3.7 0 3.7-7.8 7.3-7.8h7.3c3.7 0 3.7 4.7 7.3 4.7 3.7 0 3.7-1.1 7.3-1.1 3.7 0 3.7 11.6 7.3 11.6 3.7 0 3.7-2.6 7.3-2.6 3.7 0 3.7-12.9 7.3-12.9 3.7 0 3.7 10.9 7.3 10.9 3.7 0 3.7 1.3 7.3 1.3 3.7 0 3.7-8.7 7.3-8.7 3.7 0 3.7 11.5 7.3 11.5 3.7 0 3.7-1.4 7.3-1.4 3.7 0 3.7-2.6 7.3-2.6 3.7 0 3.7-5.8 7.3-5.8 3.7 0 3.7-1.3 7.3-1.3 3.7 0 3.7 6.6 7.3 6.6s3.7-9.3 7.3-9.3c3.7 0 3.7 0.2 7.3 0.2 3.7 0 3.7 8.5 7.3 8.5 3.7 0 3.7 0.2 7.3 0.2 3.7 0 3.7-1.5 7.3-1.5 3.7 0 3.7 1.6 7.3 1.6s3.7-5.1 7.3-5.1c2.2 0 0.6 9.6 2.4 10.7s4.1-2 5.1-0.1c1 1.8 10.3 2.2 10.3 4.3 0 3.4-10.7 3.4-10.7 6.8s1.2 3.4 1.2 6.8 1.9 3.4 1.9 6.8c0 2.2 7.2 7.7 6.2 9.5-1.1 1.8-12.3-6.5-14.1-5.5-1.7 0.9-0.1 6.2-2.2 6.2z"
+            fill="transparent"
+            stroke="#fff"
+          >
+          </path>
+          <path
+            class="voltage line-2"
+            d="m216.3 52.1c-3 0-3-0.5-6-0.5s-3 3-6 3-3-2-6-2-3 1.6-6 1.6-3-0.4-6-0.4-3-1.2-6-1.2-3 3.4-6 3.4-3-2.2-6-2.2-3-3.4-6-3.4-3-0.5-6-0.5-3 1.4-6 1.4-3 4.8-6 4.8-3-5.5-6-5.5-3 2-6 2-3 2-6 2-3 1.6-6 1.6-3-4.4-6-4.4-3-0.2-6-0.2-3 1-6 1-3 3.1-6 3.1-3-4.9-6-4.9-3 1.5-6 1.5-3 1.6-6 1.6-3-1.3-6-1.3-3 3.7-6 3.7-3-6.4-6-6.4-3 2.5-6 2.5h-6c-3 0-3-0.6-6-0.6s-3-1.4-6-1.4-3 0.9-6 0.9-3 4.3-6 4.3-3-3.5-6-3.5c-2.2 0-3.4-1.3-5.2-2.3-1.8-1.1-3.6-1.5-4.6-3.3s-4.4-3.5-4.4-5.7c0-3.4 0.4-3.4 0.4-6.8s2.9-3.4 2.9-6.8-0.8-3.4-0.8-6.8c0-2.2 0.3-4.2 1.3-5.9 1.1-1.8 0.8-6.2 2.6-7.3 1.8-1 5.5-2 7.7-2 3 0 3 2 6 2s3-0.5 6-0.5 3 5.1 6 5.1 3-1.1 6-1.1 3-5.6 6-5.6 3 4.8 6 4.8 3 0.6 6 0.6 3-3.8 6-3.8 3 5.1 6 5.1 3-0.6 6-0.6 3-1.2 6-1.2 3-2.6 6-2.6 3-0.6 6-0.6 3 2.9 6 2.9 3-4.1 6-4.1 3 0.1 6 0.1 3 3.7 6 3.7 3 0.1 6 0.1 3-0.6 6-0.6 3 0.7 6 0.7 3-2.2 6-2.2 3 4.4 6 4.4 3-1.7 6-1.7 3-4 6-4 3 4.7 6 4.7 3-0.5 6-0.5 3-0.8 6-0.8 3-3.8 6-3.8 3 6.3 6 6.3 3-4.8 6-4.8 3 1.9 6 1.9 3-1.9 6-1.9 3 1.3 6 1.3c2.2 0 5-0.5 6.7 0.5 1.8 1.1 2.4 4 3.5 5.8 1 1.8 0.3 3.7 0.3 5.9 0 3.4 3.4 3.4 3.4 6.8s-3.3 3.4-3.3 6.8 4 3.4 4 6.8c0 2.2-6 2.7-7 4.4-1.1 1.8 1.1 6.7-0.7 7.7-1.6 0.8-4.7-1.1-6.8-1.1z"
+            fill="transparent"
+            stroke="#fff"
+          >
+          </path>
+        </svg>
+        <div class="dots">
+          <div class="dot dot-1"></div>
+          <div class="dot dot-2"></div>
+          <div class="dot dot-3"></div>
+          <div class="dot dot-4"></div>
+          <div class="dot dot-5"></div>
+        </div>
       </div>
-    </div>
-    <p class="text-sm text-gray-600 font-poppins mt-4 text-center">Already have an account? <a href="/users/log_in" class="underline text-gray-800 hover:text-gray-700">Log in</a></p>
+      <p class="text-sm text-gray-600 font-poppins mt-4 text-center">
+        Already have an account?
+        <a href="/users/log_in" class="underline text-gray-800 hover:text-gray-700">Log in</a>
+      </p>
     <% end %>
   </div>
-</body>
\ No newline at end of file
+</body>
diff --git a/lib/fitness_web/templates/user_confirmation/edit.html.heex b/lib/fitness_web/templates/user_confirmation/edit.html.heex
index e9bf443..32199d4 100644
--- a/lib/fitness_web/templates/user_confirmation/edit.html.heex
+++ b/lib/fitness_web/templates/user_confirmation/edit.html.heex
@@ -1,12 +1,18 @@
 <h1>Confirm account</h1>
 
-<.form let={_f} for={:user} action={Routes.user_confirmation_path(@conn, :update, @token)}>
+<.form
+  :let={_f}
+  for={%{}}
+  as={:user}
+  action={Routes.user_confirmation_path(@conn, :update, @token)}
+>
   <div>
-    <%= submit "Confirm my account" %>
+    <%= submit("Confirm my account") %>
   </div>
 </.form>
 
 <p>
-  <%= link "Register", to: Routes.user_registration_path(@conn, :new) %> |
-  <%= link "Log in", to: Routes.user_session_path(@conn, :new) %>
+  <%= link("Register", to: Routes.user_registration_path(@conn, :new)) %> | <%= link("Log in",
+    to: Routes.user_session_path(@conn, :new)
+  ) %>
 </p>
diff --git a/lib/fitness_web/templates/user_confirmation/new.html.heex b/lib/fitness_web/templates/user_confirmation/new.html.heex
index 4d9bee3..5cfec84 100644
--- a/lib/fitness_web/templates/user_confirmation/new.html.heex
+++ b/lib/fitness_web/templates/user_confirmation/new.html.heex
@@ -1,15 +1,16 @@
 <h1>Resend confirmation instructions</h1>
 
-<.form let={f} for={:user} action={Routes.user_confirmation_path(@conn, :create)}>
-  <%= label f, :email %>
-  <%= email_input f, :email, required: true %>
+<.form :let={f} for={%{}} as={:user} action={Routes.user_confirmation_path(@conn, :create)}>
+  <%= label(f, :email) %>
+  <%= email_input(f, :email, required: true) %>
 
   <div>
-    <%= submit "Resend confirmation instructions" %>
+    <%= submit("Resend confirmation instructions") %>
   </div>
 </.form>
 
 <p>
-  <%= link "Register", to: Routes.user_registration_path(@conn, :new) %> |
-  <%= link "Log in", to: Routes.user_session_path(@conn, :new) %>
+  <%= link("Register", to: Routes.user_registration_path(@conn, :new)) %> | <%= link("Log in",
+    to: Routes.user_session_path(@conn, :new)
+  ) %>
 </p>
diff --git a/lib/fitness_web/templates/user_registration/new.html.heex b/lib/fitness_web/templates/user_registration/new.html.heex
index af4fb3c..4e03bd4 100644
--- a/lib/fitness_web/templates/user_registration/new.html.heex
+++ b/lib/fitness_web/templates/user_registration/new.html.heex
@@ -1,50 +1,73 @@
 <div class="flex justify-center items-center h-screen bg-gray-100">
-<div class="w-full max-w-md p-6 bg-white rounded-lg shadow-lg">
-<h1 class="font-bold text-2xl mb-6 font-poppins">Register</h1>
+  <div class="w-full max-w-md p-6 bg-white rounded-lg shadow-lg">
+    <h1 class="font-bold text-2xl mb-6 font-poppins">Register</h1>
 
+    <.form
+      :let={f}
+      for={@changeset}
+      action={Routes.user_registration_path(@conn, :create)}
+      class="max-w-md mx-auto"
+    >
+      <%= if @changeset.action do %>
+        <div class="bg-red-100 border font-poppins border-red-400 text-red-700 px-4 py-3 rounded mb-8">
+          <p>Oops, something went wrong! Please check the errors below.</p>
+        </div>
+      <% end %>
 
-<.form let={f} for={@changeset} action={Routes.user_registration_path(@conn, :create)} class="max-w-md mx-auto">
-  <%= if @changeset.action do %>
-    <div class="bg-red-100 border font-poppins border-red-400 text-red-700 px-4 py-3 rounded mb-8">
-      <p>Oops, something went wrong! Please check the errors below.</p>
-    </div>
-  <% end %>
+      <div class="mb-4">
+        <%= label(f, :email, class: "block font-poppins font-medium text-sm text-gray-700") %>
+        <%= email_input(f, :email,
+          required: true,
+          class:
+            "mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring focus:ring-indigo-200 focus:ring-opacity-50"
+        ) %>
+        <%= error_tag(f, :email) %>
+      </div>
 
+      <div class="mb-4">
+        <%= label(f, :full_name, class: "block font-poppins font-medium text-sm text-gray-700") %>
+        <%= text_input(f, :name,
+          required: true,
+          class:
+            "mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring focus:ring-indigo-200 focus:ring-opacity-50"
+        ) %>
+        <%= error_tag(f, :name) %>
+      </div>
 
-  <div class="mb-4">
-    <%= label f, :email, class: "block font-poppins font-medium text-sm text-gray-700" %>
-    <%= email_input f, :email, required: true, class: "mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring focus:ring-indigo-200 focus:ring-opacity-50" %>
-    <%= error_tag f, :email %>
-  </div>
+      <div class="mb-4">
+        <%= label(f, :username, class: "block font-poppins font-medium text-sm text-gray-700") %>
+        <%= text_input(f, :username,
+          required: true,
+          class:
+            "mt-1 font-poppins block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring focus:ring-indigo-200 focus:ring-opacity-50"
+        ) %>
+        <%= error_tag(f, :username) %>
+      </div>
 
-  <div class="mb-4">
-    <%= label f, :full_name, class: "block font-poppins font-medium text-sm text-gray-700" %>
-    <%= text_input f, :name, required: true, class: "mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring focus:ring-indigo-200 focus:ring-opacity-50" %>
-    <%= error_tag f, :name %>
-  </div>
-
-  <div class="mb-4">
-    <%= label f, :username, class: "block font-poppins font-medium text-sm text-gray-700" %>
-    <%= text_input f, :username, required: true, class: "mt-1 font-poppins block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring focus:ring-indigo-200 focus:ring-opacity-50" %>
-    <%= error_tag f, :username %>
-  </div>
+      <div class="mb-4">
+        <%= label(f, :password, class: "block font-poppins font-medium text-sm text-gray-700") %>
+        <%= password_input(f, :password,
+          required: true,
+          class:
+            "mt-1 font-poppins block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring focus:ring-indigo-200 focus:ring-opacity-50"
+        ) %>
+        <%= error_tag(f, :password) %>
+      </div>
 
-  <div class="mb-4">
-    <%= label f, :password, class: "block font-poppins font-medium text-sm text-gray-700" %>
-    <%= password_input f, :password, required: true, class: "mt-1 font-poppins block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring focus:ring-indigo-200 focus:ring-opacity-50" %>
-    <%= error_tag f, :password %>
+      <button
+        class="w-full px-4 font-poppins py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-gradient-to-r from-purple-400 to-pink-600 hover:from-purple-500 hover:to-pink-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
+        type="submit"
+      >
+        Sign up
+      </button>
+    </.form>
+    <div class="flex justify-center mt-6">
+      <p class="mt-2 font-poppins text-sm">
+        Already have an account? <%= link("Log in",
+          to: Routes.user_session_path(@conn, :new),
+          class: "font-bold text-blue-500 hover:text-blue-700"
+        ) %> <br />
+      </p>
+    </div>
   </div>
-
-  <button class="w-full px-4 font-poppins py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-gradient-to-r from-purple-400 to-pink-600 hover:from-purple-500 hover:to-pink-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500" type="submit">
-    Sign up
-  </button>
-</.form>
-<div class="flex justify-center mt-6">
-<p class="mt-2 font-poppins text-sm">
-  Already have an account?
-  <%= link "Log in", to: Routes.user_session_path(@conn, :new), class: "font-bold text-blue-500 hover:text-blue-700" %> <br>
-</p>
-</div>
 </div>
-</div>
-
diff --git a/lib/fitness_web/templates/user_reset_password/edit.html.heex b/lib/fitness_web/templates/user_reset_password/edit.html.heex
index 5dc70fe..60e2ebc 100644
--- a/lib/fitness_web/templates/user_reset_password/edit.html.heex
+++ b/lib/fitness_web/templates/user_reset_password/edit.html.heex
@@ -1,38 +1,63 @@
 <h1 class="text-2xl font-poppins font-bold mb-6">Reset password</h1>
 
 <div class="w-96">
-  <.form class="bg-white font-poppins shadow-md rounded px-8 pt-6 pb-8 mb-4" let={f} for={@changeset} action={Routes.user_reset_password_path(@conn, :update, @token)}>
+  <.form
+    :let={f}
+    class="bg-white font-poppins shadow-md rounded px-8 pt-6 pb-8 mb-4"
+    for={@changeset}
+    action={Routes.user_reset_password_path(@conn, :update, @token)}
+  >
     <%= if @changeset.action do %>
       <div class="mb-4">
-        <p class="text-red-500 text-xs font-poppins italic">Oops, something went wrong! Please check the errors below.</p>
+        <p class="text-red-500 text-xs font-poppins italic">
+          Oops, something went wrong! Please check the errors below.
+        </p>
       </div>
     <% end %>
 
     <div class="mb-4">
-      <%= label f, :password, class: "block font-poppins text-gray-700 font-bold mb-2" %>
-      <%= password_input f, :password, class: "shadow font-poppins appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline", required: true %>
-      <%= error_tag f, :password %>
+      <%= label(f, :password, class: "block font-poppins text-gray-700 font-bold mb-2") %>
+      <%= password_input(f, :password,
+        class:
+          "shadow font-poppins appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline",
+        required: true
+      ) %>
+      <%= error_tag(f, :password) %>
     </div>
 
     <div class="mb-6">
-      <%= label f, :password_confirmation, class: "block font-poppins text-gray-700 font-bold mb-2" %>
-      <%= password_input f, :password_confirmation, class: " font-poppins shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline", required: true %>
-      <%= error_tag f, :password_confirmation %>
+      <%= label(f, :password_confirmation,
+        class: "block font-poppins text-gray-700 font-bold mb-2"
+      ) %>
+      <%= password_input(f, :password_confirmation,
+        class:
+          " font-poppins shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline",
+        required: true
+      ) %>
+      <%= error_tag(f, :password_confirmation) %>
     </div>
 
     <div class="flex items-center justify-between">
-      <%= submit "Reset password", class: "bg-blue-500 font-poppins hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline" %>
+      <%= submit("Reset password",
+        class:
+          "bg-blue-500 font-poppins hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline"
+      ) %>
     </div>
   </.form>
 
   <div class="flex justify-center mt-6">
     <p class="mt-1 font-poppins text-base">
-      Don't have an account? <%= link "Sign up", to: Routes.user_registration_path(@conn, :new), class: "font-medium font-poppins text-blue-500 hover:text-blue-600" %> 
+      Don't have an account? <%= link("Sign up",
+        to: Routes.user_registration_path(@conn, :new),
+        class: "font-medium font-poppins text-blue-500 hover:text-blue-600"
+      ) %>
     </p>
   </div>
 
-    <p class="text-center font-poppins mt-2 text-sm">
-      Forgot your password? <%= link "Reset it", to: Routes.user_reset_password_path(@conn, :new), class: "font-medium font-poppins text-blue-500 hover:text-blue-600" %>
-    </p>
+  <p class="text-center font-poppins mt-2 text-sm">
+    Forgot your password? <%= link("Reset it",
+      to: Routes.user_reset_password_path(@conn, :new),
+      class: "font-medium font-poppins text-blue-500 hover:text-blue-600"
+    ) %>
+  </p>
 </div>
-
diff --git a/lib/fitness_web/templates/user_reset_password/new.html.heex b/lib/fitness_web/templates/user_reset_password/new.html.heex
index cc8882b..6c01961 100644
--- a/lib/fitness_web/templates/user_reset_password/new.html.heex
+++ b/lib/fitness_web/templates/user_reset_password/new.html.heex
@@ -2,27 +2,42 @@
   <div class="w-full max-w-md p-6 bg-white rounded-lg shadow-md">
     <h1 class="text-2xl font-poppins font-bold mb-6 text-center">Forgot your password?</h1>
 
-    <.form let={f} for={:user} action={Routes.user_reset_password_path(@conn, :create)} class="bg-white font-poppins rounded px-8 pt-6 pb-8 mb-4">
+    <.form
+      :let={f}
+      for={%{}}
+      as={:user}
+      action={Routes.user_reset_password_path(@conn, :create)}
+      class="bg-white font-poppins rounded px-8 pt-6 pb-8 mb-4"
+    >
       <div class="flex flex-col space-y-2">
-        <%= label f, :email, class: "font-semibold font-poppins" %>
-        <%= email_input f, :email, required: true, class: "shadow font-poppins appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline" %>
+        <%= label(f, :email, class: "font-semibold font-poppins") %>
+        <%= email_input(f, :email,
+          required: true,
+          class:
+            "shadow font-poppins appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
+        ) %>
       </div>
 
-
       <div class="flex items-center justify-center font-poppins pt-6">
-        <%= submit "Send instructions to reset password", class: "max-w-md  font-poppins px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-gradient-to-r from-purple-400 to-pink-600 hover:from-purple-500 hover:to-pink-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500" %>
+        <%= submit("Send instructions to reset password",
+          class:
+            "max-w-md  font-poppins px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-gradient-to-r from-purple-400 to-pink-600 hover:from-purple-500 hover:to-pink-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
+        ) %>
       </div>
       <div class="flex justify-center mt-6">
         <p class="mt-1 font-poppins text-sm">
-          Already have an account?
-          <%= link "Log in", to: Routes.user_session_path(@conn, :new), class: "font-medium font-poppins font-poppins text-blue-500 hover:text-blue-600" %> <br>
+          Already have an account? <%= link("Log in",
+            to: Routes.user_session_path(@conn, :new),
+            class: "font-medium font-poppins font-poppins text-blue-500 hover:text-blue-600"
+          ) %> <br />
         </p>
       </div>
       <p class="text-center mt-2 font-poppins text-xs">
-        Don't have an account? <%= link "Sign up", to: Routes.user_registration_path(@conn, :new), class: "font-medium font-poppins font-poppins text-blue-500 hover:text-blue-600" %> 
+        Don't have an account? <%= link("Sign up",
+          to: Routes.user_registration_path(@conn, :new),
+          class: "font-medium font-poppins font-poppins text-blue-500 hover:text-blue-600"
+        ) %>
       </p>
     </.form>
   </div>
 </div>
-
-
diff --git a/lib/fitness_web/templates/user_session/new.html.heex b/lib/fitness_web/templates/user_session/new.html.heex
index 5948b6d..e38440c 100644
--- a/lib/fitness_web/templates/user_session/new.html.heex
+++ b/lib/fitness_web/templates/user_session/new.html.heex
@@ -1,38 +1,64 @@
-
 <div class="flex justify-center items-center h-screen bg-gray-100">
   <div class="w-full max-w-md p-6 bg-white rounded-lg shadow-lg">
     <h1 class="font-bold font-poppins text-2xl mb-6">Log in</h1>
-    <.form let={f} for={@conn} action={Routes.user_session_path(@conn, :create)} as={:user} class="space-y-4">
+    <.form
+      :let={f}
+      for={@conn}
+      action={Routes.user_session_path(@conn, :create)}
+      as={:user}
+      class="space-y-4"
+    >
       <%= if @error_message do %>
         <div class="bg-red-100 font-poppins text-red-700 px-3 py-2 rounded-md">
           <p><%= @error_message %></p>
         </div>
       <% end %>
       <div>
-        <%= label f, :email, class: "block font-poppins font-medium text-sm text-gray-700" %>
-        <%= email_input f, :email, required: true, class: "mt-1 font-poppins block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring focus:ring-indigo-200 focus:ring-opacity-50" %>
+        <%= label(f, :email, class: "block font-poppins font-medium text-sm text-gray-700") %>
+        <%= email_input(f, :email,
+          required: true,
+          class:
+            "mt-1 font-poppins block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring focus:ring-indigo-200 focus:ring-opacity-50"
+        ) %>
       </div>
       <div>
-        <%= label f, :password, class: "block font-poppins font-medium text-sm text-gray-700" %>
-        <%= password_input f, :password, required: true, class: "mt-1 font-poppins block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring focus:ring-indigo-200 focus:ring-opacity-50" %>
+        <%= label(f, :password, class: "block font-poppins font-medium text-sm text-gray-700") %>
+        <%= password_input(f, :password,
+          required: true,
+          class:
+            "mt-1 font-poppins block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring focus:ring-indigo-200 focus:ring-opacity-50"
+        ) %>
       </div>
       <div class="flex items-center">
-        <%= checkbox f, :remember_me, class: "rounded font-poppins border-gray-300 text-indigo-600 shadow-sm focus:border-indigo-500 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 h-4 w-4 mr-2" %>
-        <%= label f, :remember_me, "Remember me", class: "font-medium font-poppins text-sm text-gray-700" %>
+        <%= checkbox(f, :remember_me,
+          class:
+            "rounded font-poppins border-gray-300 text-indigo-600 shadow-sm focus:border-indigo-500 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 h-4 w-4 mr-2"
+        ) %>
+        <%= label(f, :remember_me, "Remember me",
+          class: "font-medium font-poppins text-sm text-gray-700"
+        ) %>
       </div>
       <div>
-        <%= submit "Log in", class: "w-full font-poppins px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-gradient-to-r from-purple-400 to-pink-600 hover:from-purple-500 hover:to-pink-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500" %>
+        <%= submit("Log in",
+          class:
+            "w-full font-poppins px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-gradient-to-r from-purple-400 to-pink-600 hover:from-purple-500 hover:to-pink-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
+        ) %>
       </div>
     </.form>
     <div class="flex justify-center mt-6">
       <p class="mt-1 font-poppins text-base">
-        Don't have an account? <%= link "Sign up", to: Routes.user_registration_path(@conn, :new), class: "font-medium font-poppins text-blue-500 hover:text-blue-600" %> 
+        Don't have an account? <%= link("Sign up",
+          to: Routes.user_registration_path(@conn, :new),
+          class: "font-medium font-poppins text-blue-500 hover:text-blue-600"
+        ) %>
       </p>
     </div>
 
-      <p class="text-center font-poppins mt-2 text-sm">
-        Forgot your password? <%= link "Reset it", to: Routes.user_reset_password_path(@conn, :new), class: "font-medium font-poppins text-blue-500 hover:text-blue-600" %>
-      </p>
+    <p class="text-center font-poppins mt-2 text-sm">
+      Forgot your password? <%= link("Reset it",
+        to: Routes.user_reset_password_path(@conn, :new),
+        class: "font-medium font-poppins text-blue-500 hover:text-blue-600"
+      ) %>
+    </p>
   </div>
 </div>
-
diff --git a/lib/fitness_web/templates/user_settings/edit.html.heex b/lib/fitness_web/templates/user_settings/edit.html.heex
index b2386a4..f2adb3f 100644
--- a/lib/fitness_web/templates/user_settings/edit.html.heex
+++ b/lib/fitness_web/templates/user_settings/edit.html.heex
@@ -1,73 +1,114 @@
-  
-  <div class="flex justify-center items-center h-screen bg-gray-100"> 
-    
-    <div class="w-full max-w-md p-6 bg-white rounded-lg shadow-lg">
+<div class="flex justify-center items-center h-screen bg-gray-100">
+  <div class="w-full max-w-md p-6 bg-white rounded-lg shadow-lg">
+    <h3 class="font-bold font-poppins text-xl  mt-6 mb-6"># Change email</h3>
 
-    <h3 class="font-bold font-poppins text-xl  mt-6 mb-6"> # Change email</h3>
-    
-    <.form let={f} for={@email_changeset} action={Routes.user_settings_path(@conn, :update)} id="update_email">
+    <.form
+      :let={f}
+      for={@email_changeset}
+      action={Routes.user_settings_path(@conn, :update)}
+      id="update_email"
+    >
       <%= if @email_changeset.action do %>
-      <div class="bg-red-100 border font-poppins border-red-400 text-red-700 px-4 py-3 rounded">
-        <p>Oops, something went wrong! Please check the errors below.</p>
-      </div>
+        <div class="bg-red-100 border font-poppins border-red-400 text-red-700 px-4 py-3 rounded">
+          <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="mt-6 mb-6 ">
-        <%= label f, :email, class: "text-sm font-poppins font-medium" %>
-        <%= email_input f, :email, required: true, class: "form-input rounded-md  font-poppins shadow-sm block w-full" %>
-        <%= error_tag f, :email %>
+        <%= label(f, :email, class: "text-sm font-poppins font-medium") %>
+        <%= email_input(f, :email,
+          required: true,
+          class: "form-input rounded-md  font-poppins shadow-sm block w-full"
+        ) %>
+        <%= error_tag(f, :email) %>
       </div>
-      
+
       <div class="mt-6 mb-6 ">
-        <%= label f, :current_password, for: "current_password_for_email", class: "text-sm font-poppins font-medium" %>
-        <%= password_input f, :current_password, required: true, name: "current_password", placeholder: "********", id: "current_password_for_email", class: "form-input font-poppins rounded-md shadow-sm block w-full" %>
-        <%= error_tag f, :current_password %>
+        <%= label(f, :current_password,
+          for: "current_password_for_email",
+          class: "text-sm font-poppins font-medium"
+        ) %>
+        <%= password_input(f, :current_password,
+          required: true,
+          name: "current_password",
+          placeholder: "********",
+          id: "current_password_for_email",
+          class: "form-input font-poppins rounded-md shadow-sm block w-full"
+        ) %>
+        <%= error_tag(f, :current_password) %>
       </div>
-    
-    <div class="pt-6 mr-1 ml-1">
-      <%= submit "Change email", class: "w-full font-poppins px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-gradient-to-r from-purple-400 to-pink-600 hover:from-purple-500 hover:to-pink-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500" %>
-    </div>
-  </.form>
-</div>
+
+      <div class="pt-6 mr-1 ml-1">
+        <%= submit("Change email",
+          class:
+            "w-full font-poppins px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-gradient-to-r from-purple-400 to-pink-600 hover:from-purple-500 hover:to-pink-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
+        ) %>
+      </div>
+    </.form>
+  </div>
 </div>
-  
-  <div class="flex justify-center items-center h-screen bg-gray-100">
+
+<div class="flex justify-center items-center h-screen bg-gray-100">
   <div class="w-full max-w-md p-6 bg-white rounded-lg shadow-lg">
+    <h3 class="font-bold font-poppins mt-6 text-xl mb-6"># Change password</h3>
 
-    
-  <h3 class="font-bold font-poppins mt-6 text-xl mb-6"># Change password</h3>
-  
-  <.form let={f} for={@password_changeset} action={Routes.user_settings_path(@conn, :update)} id="update_password">
-    <%= 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" %>
-    <div class="mt-6 mb-6">  
-      <%= label f, :password, "New password", class: "text-sm font-poppins font-medium" %>
-      <%= password_input f, :password, required: true, placeholder: "********", class: "form-input font-poppins rounded-md shadow-sm block w-full" %>
-      <%= error_tag f, :password %>
-    </div>
+    <.form
+      :let={f}
+      for={@password_changeset}
+      action={Routes.user_settings_path(@conn, :update)}
+      id="update_password"
+    >
+      <%= if @password_changeset.action do %>
+        <div class="alert alert-danger">
+          <p>Oops, something went wrong! Please check the errors below.</p>
+        </div>
+      <% end %>
 
-    <div class="mt-6 mb-6">
-      <%= label f, :password_confirmation, "Confirm new password", class: "text-sm font-poppins font-medium" %>  
-      <%= password_input f, :password_confirmation, required: true, placeholder: "********", class: "form-input font-poppins rounded-md shadow-sm block w-full" %>
-      <%= error_tag f, :password_confirmation %>
-    </div>
-    
-    <div class="mt-6 mb-6">
-      <%= label f, :current_password, for: "current_password_for_password", class: "text-sm font-poppins font-medium" %>
-      <%= password_input f, :current_password, required: true, placeholder: "********", class: "form-input font-poppins font-poppins rounded-md shadow-sm block w-full", name: "current_password", id: "current_password_for_password" %>
-      <%= error_tag f, :current_password %>
-    </div>
-    
-    <div class="pt-6 mr-1 ml-1">
-      <%= submit "Change password", class: "w-full font-poppins px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-gradient-to-r from-purple-400 to-pink-600 hover:from-purple-500 hover:to-pink-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500" %>
-    </div>
-  </.form>
-</div>
+      <%= hidden_input(f, :action, name: "action", value: "update_password") %>
+      <div class="mt-6 mb-6">
+        <%= label(f, :password, "New password", class: "text-sm font-poppins font-medium") %>
+        <%= password_input(f, :password,
+          required: true,
+          placeholder: "********",
+          class: "form-input font-poppins rounded-md shadow-sm block w-full"
+        ) %>
+        <%= error_tag(f, :password) %>
+      </div>
+
+      <div class="mt-6 mb-6">
+        <%= label(f, :password_confirmation, "Confirm new password",
+          class: "text-sm font-poppins font-medium"
+        ) %>
+        <%= password_input(f, :password_confirmation,
+          required: true,
+          placeholder: "********",
+          class: "form-input font-poppins rounded-md shadow-sm block w-full"
+        ) %>
+        <%= error_tag(f, :password_confirmation) %>
+      </div>
+
+      <div class="mt-6 mb-6">
+        <%= label(f, :current_password,
+          for: "current_password_for_password",
+          class: "text-sm font-poppins font-medium"
+        ) %>
+        <%= password_input(f, :current_password,
+          required: true,
+          placeholder: "********",
+          class: "form-input font-poppins font-poppins rounded-md shadow-sm block w-full",
+          name: "current_password",
+          id: "current_password_for_password"
+        ) %>
+        <%= error_tag(f, :current_password) %>
+      </div>
+
+      <div class="pt-6 mr-1 ml-1">
+        <%= submit("Change password",
+          class:
+            "w-full font-poppins px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-gradient-to-r from-purple-400 to-pink-600 hover:from-purple-500 hover:to-pink-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
+        ) %>
+      </div>
+    </.form>
+  </div>
 </div>
-  
\ No newline at end of file
diff --git a/mix.exs b/mix.exs
index 4113d88..0e13fee 100644
--- a/mix.exs
+++ b/mix.exs
@@ -34,15 +34,16 @@ defmodule Fitness.MixProject do
   defp deps do
     [
       {:bcrypt_elixir, "~> 3.0"},
-      {:phoenix, "~> 1.6.15"},
+      {:phoenix, "~> 1.7.0"},
+      {:phoenix_view, "~> 2.0"},
       {: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.5"},
+      {:phoenix_live_view, "~> 0.19.0"},
       {:floki, ">= 0.30.0", only: :test},
-      {:phoenix_live_dashboard, "~> 0.6"},
+      {:phoenix_live_dashboard, "~> 0.8"},
       {:esbuild, "~> 0.4", runtime: Mix.env() == :dev},
       {:swoosh, "~> 1.3"},
       {:telemetry_metrics, "~> 0.6"},
diff --git a/mix.lock b/mix.lock
index 2ced981..c715225 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,17 +1,17 @@
 %{
   "bcrypt_elixir": {:hex, :bcrypt_elixir, "3.0.1", "9be815469e6bfefec40fa74658ecbbe6897acfb57614df1416eeccd4903f602c", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "486bb95efb645d1efc6794c1ddd776a186a9a713abf06f45708a6ce324fb96cf"},
-  "castore": {:hex, :castore, "1.0.1", "240b9edb4e9e94f8f56ab39d8d2d0a57f49e46c56aced8f873892df8ff64ff5a", [:mix], [], "hexpm", "b4951de93c224d44fac71614beabd88b71932d0b1dea80d2f80fb9044e01bbb3"},
+  "castore": {:hex, :castore, "1.0.3", "7130ba6d24c8424014194676d608cb989f62ef8039efd50ff4b3f33286d06db8", [:mix], [], "hexpm", "680ab01ef5d15b161ed6a95449fac5c6b8f60055677a8e79acf01b27baa4390b"},
   "chartkick": {:hex, :chartkick, "1.0.0", "8f640a746ebb90f5975ad0096da872023bc5c9ccf5d6d5654c4fed11c32b9686", [:mix], [{:elixir_uuid, "~> 1.2", [hex: :elixir_uuid, repo: "hexpm", optional: false]}], "hexpm", "219e4b95a9b89723a2155ba0f4928c4789a6f67a49d478f3fa9f92793c37231a"},
   "comeonin": {:hex, :comeonin, "5.3.3", "2c564dac95a35650e9b6acfe6d2952083d8a08e4a89b93a481acb552b325892e", [:mix], [], "hexpm", "3e38c9c2cb080828116597ca8807bb482618a315bfafd98c90bc22a821cc84df"},
   "connection": {:hex, :connection, "1.1.0", "ff2a49c4b75b6fb3e674bfc5536451607270aac754ffd1bdfe175abe4a6d7a68", [:mix], [], "hexpm", "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"},
-  "cowboy": {:hex, :cowboy, "2.9.0", "865dd8b6607e14cf03282e10e934023a1bd8be6f6bacf921a7e2a96d800cd452", [:make, :rebar3], [{:cowlib, "2.11.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "2c729f934b4e1aa149aff882f57c6372c15399a20d54f65c8d67bef583021bde"},
+  "cowboy": {:hex, :cowboy, "2.10.0", "ff9ffeff91dae4ae270dd975642997afe2a1179d94b1887863e43f681a203e26", [:make, :rebar3], [{:cowlib, "2.12.1", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b"},
   "cowboy_telemetry": {:hex, :cowboy_telemetry, "0.4.0", "f239f68b588efa7707abce16a84d0d2acf3a0f50571f8bb7f56a15865aae820c", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"},
-  "cowlib": {:hex, :cowlib, "2.11.0", "0b9ff9c346629256c42ebe1eeb769a83c6cb771a6ee5960bd110ab0b9b872063", [:make, :rebar3], [], "hexpm", "2b3e9da0b21c4565751a6d4901c20d1b4cc25cbb7fd50d91d2ab6dd287bc86a9"},
+  "cowlib": {:hex, :cowlib, "2.12.1", "a9fa9a625f1d2025fe6b462cb865881329b5caff8f1854d1cbc9f9533f00e1e1", [:make, :rebar3], [], "hexpm", "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"},
   "db_connection": {:hex, :db_connection, "2.4.3", "3b9aac9f27347ec65b271847e6baeb4443d8474289bd18c1d6f4de655b70c94d", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c127c15b0fa6cfb32eed07465e05da6c815b032508d4ed7c116122871df73c12"},
-  "decimal": {:hex, :decimal, "2.0.0", "a78296e617b0f5dd4c6caf57c714431347912ffb1d0842e998e9792b5642d697", [:mix], [], "hexpm", "34666e9c55dea81013e77d9d87370fe6cb6291d1ef32f46a1600230b1d44f577"},
+  "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
   "earmark": {:hex, :earmark, "1.4.37", "56ce845c543393aa3f9b294c818c3d783452a4a67e4ab18c4303a954a8b59363", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}], "hexpm", "d86d5e12868db86d5321b00e62a4bbcb4150346e4acc9a90a041fb188a5cb106"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.31", "a93921cdc6b9b869f519213d5bc79d9e218ba768d7270d46fdcf1c01bacff9e2", [:mix], [], "hexpm", "317d367ee0335ef037a87e46c91a2269fef6306413f731e8ec11fc45a7efd059"},
-  "ecto": {:hex, :ecto, "3.9.5", "9f0aa7ae44a1577b651c98791c6988cd1b69b21bc724e3fd67090b97f7604263", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "d4f3115d8cbacdc0bfa4b742865459fb1371d0715515842a1fb17fe31920b74c"},
+  "ecto": {:hex, :ecto, "3.9.6", "2f420c173efcb2e22fa4f8fc41e75e02b3c5bd4cffef12085cae5418c12e530d", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "df17bc06ba6f78a7b764e4a14ef877fe5f4499332c5a105ace11fe7013b72c84"},
   "ecto_sql": {:hex, :ecto_sql, "3.9.2", "34227501abe92dba10d9c3495ab6770e75e79b836d114c41108a4bf2ce200ad5", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.9.2", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "1eb5eeb4358fdbcd42eac11c1fbd87e3affd7904e639d77903c1358b2abd3f70"},
   "elixir_make": {:hex, :elixir_make, "0.7.6", "67716309dc5d43e16b5abbd00c01b8df6a0c2ab54a8f595468035a50189f9169", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "5a0569756b0f7873a77687800c164cca6dfc03a09418e6fcf853d78991f49940"},
   "elixir_uuid": {:hex, :elixir_uuid, "1.2.1", "dce506597acb7e6b0daeaff52ff6a9043f5919a4c3315abb4143f0b00378c097", [:mix], [], "hexpm", "f7eba2ea6c3555cea09706492716b0d87397b88946e6380898c2889d68585752"},
@@ -21,19 +21,19 @@
   "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
   "floki": {:hex, :floki, "0.34.2", "5fad07ef153b3b8ec110b6b155ec3780c4b2c4906297d0b4be1a7162d04a7e02", [:mix], [], "hexpm", "26b9d50f0f01796bc6be611ca815c5e0de034d2128e39cc9702eee6b66a4d1c8"},
   "gettext": {:hex, :gettext, "0.22.1", "e7942988383c3d9eed4bdc22fc63e712b655ae94a672a27e4900e3d4a2c43581", [:mix], [{:expo, "~> 0.4.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "ad105b8dab668ee3f90c0d3d94ba75e9aead27a62495c101d94f2657a190ac5d"},
-  "jason": {:hex, :jason, "1.4.0", "e855647bc964a44e2f67df589ccf49105ae039d4179db7f6271dfd3843dc27e6", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"},
+  "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},
   "makeup": {:hex, :makeup, "1.1.0", "6b67c8bc2882a6b6a445859952a602afc1a41c2e08379ca057c0f525366fc3ca", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.16.1", "cc9e3ca312f1cfeccc572b37a09980287e243648108384b97ff2b76e505c3555", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"},
-  "mime": {:hex, :mime, "2.0.3", "3676436d3d1f7b81b5a2d2bd8405f412c677558c81b1c92be58c00562bb59095", [:mix], [], "hexpm", "27a30bf0db44d25eecba73755acf4068cbfe26a4372f9eb3e4ea3a45956bff6b"},
+  "mime": {:hex, :mime, "2.0.5", "dc34c8efd439abe6ae0343edbb8556f4d63f178594894720607772a041b04b02", [:mix], [], "hexpm", "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.3.0", "9e18a119d9efc3370a3ef2a937bf0b24c088d9c4bf0ba9d7c3751d49d347d035", [:mix], [], "hexpm", "7977f183127a7cbe9346981e2f480dc04c55ffddaef746bd58debd566070eef8"},
-  "phoenix": {:hex, :phoenix, "1.6.16", "e5bdd18c7a06da5852a25c7befb72246de4ddc289182285f8685a40b7b5f5451", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 1.0 or ~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e15989ff34f670a96b95ef6d1d25bad0d9c50df5df40b671d8f4a669e050ac39"},
+  "phoenix": {:hex, :phoenix, "1.7.7", "4cc501d4d823015007ba3cdd9c41ecaaf2ffb619d6fb283199fa8ddba89191e0", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "8966e15c395e5e37591b6ed0bd2ae7f48e961f0f60ac4c733f9566b519453085"},
   "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.0", "0672ed4e4808b3fbed494dded89958e22fb882de47a97634c0b13e7b0b5f7720", [:mix], [{:ecto, "~> 3.3", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "09864e558ed31ee00bd48fcc1d4fc58ae9678c9e81649075431e69dbabb43cc1"},
-  "phoenix_html": {:hex, :phoenix_html, "3.3.1", "4788757e804a30baac6b3fc9695bf5562465dd3f1da8eb8460ad5b404d9a2178", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "bed1906edd4906a15fd7b412b85b05e521e1f67c9a85418c55999277e553d0d3"},
-  "phoenix_live_dashboard": {:hex, :phoenix_live_dashboard, "0.6.5", "1495bb014be12c9a9252eca04b9af54246f6b5c1e4cd1f30210cd00ec540cf8e", [:mix], [{:ecto, "~> 3.6.2 or ~> 3.7", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_mysql_extras, "~> 0.3", [hex: :ecto_mysql_extras, repo: "hexpm", optional: true]}, {:ecto_psql_extras, "~> 0.7", [hex: :ecto_psql_extras, repo: "hexpm", optional: true]}, {:mime, "~> 1.6 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.17.7", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "ef4fa50dd78364409039c99cf6f98ab5209b4c5f8796c17f4db118324f0db852"},
+  "phoenix_html": {:hex, :phoenix_html, "3.3.2", "d6ce982c6d8247d2fc0defe625255c721fb8d5f1942c5ac051f6177bffa5973f", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "44adaf8e667c1c20fb9d284b6b0fa8dc7946ce29e81ce621860aa7e96de9a11d"},
+  "phoenix_live_dashboard": {:hex, :phoenix_live_dashboard, "0.8.1", "c4f2a2d3b26e6ca684d162ccf18aaeed8bed2181896e0393d0a2959789482e51", [:mix], [{:ecto, "~> 3.6.2 or ~> 3.7", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_mysql_extras, "~> 0.5", [hex: :ecto_mysql_extras, repo: "hexpm", optional: true]}, {:ecto_psql_extras, "~> 0.7", [hex: :ecto_psql_extras, repo: "hexpm", optional: true]}, {:ecto_sqlite3_extras, "~> 1.1.7 or ~> 1.2.0", [hex: :ecto_sqlite3_extras, repo: "hexpm", optional: true]}, {:mime, "~> 1.6 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.19.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6 or ~> 1.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "1ca0f954274ce1916f771f86b3d49a91d3447e7c32d171660676095c5f30abe9"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.4.1", "2aff698f5e47369decde4357ba91fc9c37c6487a512b41732818f2204a8ef1d3", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "9bffb834e7ddf08467fe54ae58b5785507aaba6255568ae22b4d46e2bb3615ab"},
-  "phoenix_live_view": {:hex, :phoenix_live_view, "0.17.14", "5ec615d4d61bf9d4755f158bd6c80372b715533fe6d6219e12d74fb5eedbeac1", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.0 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.1", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "afeb6ba43ce329a6f7fc1c9acdfc6d3039995345f025febb7f409a92f6faebd3"},
-  "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.1", "ba04e489ef03763bf28a17eb2eaddc2c20c6d217e2150a61e3298b0f4c2012b5", [:mix], [], "hexpm", "81367c6d1eea5878ad726be80808eb5a787a23dee699f96e72b1109c57cdd8d9"},
-  "phoenix_template": {:hex, :phoenix_template, "1.0.1", "85f79e3ad1b0180abb43f9725973e3b8c2c3354a87245f91431eec60553ed3ef", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "157dc078f6226334c91cb32c1865bf3911686f8bcd6bcff86736f6253e6993ee"},
+  "phoenix_live_view": {:hex, :phoenix_live_view, "0.19.5", "6e730595e8e9b8c5da230a814e557768828fd8dfeeb90377d2d8dbb52d4ec00a", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b2eaa0dd3cfb9bd7fb949b88217df9f25aed915e986a28ad5c8a0d054e7ca9d3"},
+  "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
+  "phoenix_template": {:hex, :phoenix_template, "1.0.3", "32de561eefcefa951aead30a1f94f1b5f0379bc9e340bb5c667f65f1edfa4326", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "16f4b6588a4152f3cc057b9d0c0ba7e82ee23afa65543da535313ad8d25d8e2c"},
   "phoenix_view": {:hex, :phoenix_view, "2.0.2", "6bd4d2fd595ef80d33b439ede6a19326b78f0f1d8d62b9a318e3d9c1af351098", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}], "hexpm", "a929e7230ea5c7ee0e149ffcf44ce7cf7f4b6d2bfe1752dd7c084cdff152d36f"},
   "plug": {:hex, :plug, "1.14.2", "cff7d4ec45b4ae176a227acd94a7ab536d9b37b942c8e8fa6dfc0fff98ff4d80", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "842fc50187e13cf4ac3b253d47d9474ed6c296a8732752835ce4a86acdf68d13"},
   "plug_cowboy": {:hex, :plug_cowboy, "2.6.1", "9a3bbfceeb65eff5f39dab529e5cd79137ac36e913c02067dba3963a26efe9b2", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"},
@@ -46,4 +46,6 @@
   "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
   "telemetry_metrics": {:hex, :telemetry_metrics, "0.6.1", "315d9163a1d4660aedc3fee73f33f1d355dcc76c5c3ab3d59e76e3edf80eef1f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"},
   "telemetry_poller": {:hex, :telemetry_poller, "1.0.0", "db91bb424e07f2bb6e73926fcafbfcbcb295f0193e0a00e825e589a0a47e8453", [:rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b3a24eafd66c3f42da30fc3ca7dda1e9d546c12250a2d60d7b81d264fbec4f6e"},
+  "websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},
+  "websock_adapter": {:hex, :websock_adapter, "0.5.4", "7af8408e7ed9d56578539594d1ee7d8461e2dd5c3f57b0f2a5352d610ddde757", [:mix], [{:bandit, ">= 0.6.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "d2c238c79c52cbe223fcdae22ca0bb5007a735b9e933870e241fce66afb4f4ab"},
 }
diff --git a/priv/repo/migrations/20230417211058_create_workout_items.exs b/priv/repo/migrations/20230417211058_create_workout_items.exs
index e7caa0e..a32c109 100644
--- a/priv/repo/migrations/20230417211058_create_workout_items.exs
+++ b/priv/repo/migrations/20230417211058_create_workout_items.exs
@@ -9,7 +9,9 @@ defmodule Fitness.Repo.Migrations.CreateWorkoutItems do
       add :reps, :integer
       add :check_box, :boolean, default: false, null: false
       add :exercise_id, references(:exercises, on_delete: :delete_all), null: false
-      add :workout_template_id, references(:workout_templates, on_delete: :delete_all), null: false
+
+      add :workout_template_id, references(:workout_templates, on_delete: :delete_all),
+        null: false
 
       timestamps()
     end
diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs
index b066dcc..c89db31 100644
--- a/priv/repo/seeds.exs
+++ b/priv/repo/seeds.exs
@@ -13,21 +13,105 @@
 alias Fitness.Exercises
 alias Fitness.Accounts
 
-
 File.read!("priv/repo/list_of_exercises.txt")
 |> :erlang.binary_to_term()
 |> Enum.uniq()
 |> Enum.each(fn workout -> Exercises.create_exercise(workout) end)
 
+Accounts.register_user(%{
+  email: "test@test.com",
+  password: "test@test.com",
+  is_admin: true,
+  username: "Admin001",
+  name: "Admin"
+})
+
+Accounts.register_user(%{
+  email: "test@test1.com",
+  password: "mak12345",
+  is_admin: false,
+  username: "puppies-lover",
+  name: "Andervrs",
+  player_score: "1001"
+})
+
+Accounts.register_user(%{
+  email: "test@test2.com",
+  password: "mak12345",
+  is_admin: false,
+  username: "Full-stack-developer",
+  name: "Alfred",
+  player_score: "800"
+})
+
+Accounts.register_user(%{
+  email: "test@test3.com",
+  password: "mak12345",
+  is_admin: false,
+  username: "Captain-America",
+  name: "john",
+  player_score: "1000"
+})
+
+Accounts.register_user(%{
+  email: "test@test4.com",
+  password: "mak12345",
+  is_admin: false,
+  username: "Rhythm-Rider",
+  name: "Einer",
+  player_score: "700"
+})
+
+Accounts.register_user(%{
+  email: "test@test5.com",
+  password: "mak12345",
+  is_admin: false,
+  username: "Richie-Rich",
+  name: "yusef",
+  player_score: "900"
+})
+
+Accounts.register_user(%{
+  email: "test@test6.com",
+  password: "mak12345",
+  is_admin: false,
+  username: "The-Label-Man",
+  name: "eddie",
+  player_score: "10000"
+})
+
+Accounts.register_user(%{
+  email: "test@test7.com",
+  password: "mak12345",
+  is_admin: false,
+  username: "The-Wizard",
+  name: "brook",
+  player_score: "5000"
+})
+
+Accounts.register_user(%{
+  email: "test@test8.com",
+  password: "mak12345",
+  is_admin: false,
+  username: "Albert-Einstein",
+  name: "steve",
+  player_score: "600"
+})
+
+Accounts.register_user(%{
+  email: "test@test9.com",
+  password: "mak12345",
+  is_admin: false,
+  username: "The-Bird-Man",
+  name: "marko",
+  player_score: "500"
+})
 
-Accounts.register_user(%{email: "test@test.com", password: "test@test.com", is_admin: true, username: "Admin001", name: "Admin"})
-Accounts.register_user(%{email: "test@test1.com", password: "mak12345", is_admin: false, username: "puppies-lover", name: "Andervrs", player_score: "1001"})
-Accounts.register_user(%{email: "test@test2.com", password: "mak12345", is_admin: false, username: "Full-stack-developer", name: "Alfred", player_score: "800"})
-Accounts.register_user(%{email: "test@test3.com", password: "mak12345", is_admin: false, username: "Captain-America", name: "john", player_score: "1000"})
-Accounts.register_user(%{email: "test@test4.com", password: "mak12345", is_admin: false, username: "Rhythm-Rider", name: "Einer", player_score: "700"})
-Accounts.register_user(%{email: "test@test5.com", password: "mak12345", is_admin: false, username: "Richie-Rich", name: "yusef", player_score: "900"})
-Accounts.register_user(%{email: "test@test6.com", password: "mak12345", is_admin: false, username: "The-Label-Man", name: "eddie", player_score: "10000"})
-Accounts.register_user(%{email: "test@test7.com", password: "mak12345", is_admin: false, username: "The-Wizard", name: "brook", player_score: "5000"})
-Accounts.register_user(%{email: "test@test8.com", password: "mak12345", is_admin: false, username: "Albert-Einstein", name: "steve", player_score: "600"})
-Accounts.register_user(%{email: "test@test9.com", password: "mak12345", is_admin: false, username: "The-Bird-Man", name: "marko", player_score: "500"})
-Accounts.register_user(%{email: "test@test10.com", password: "mak12345", is_admin: false, username: "Elixir-Newbie", name: "mohsin",player_score: "2000"})
+Accounts.register_user(%{
+  email: "test@test10.com",
+  password: "mak12345",
+  is_admin: false,
+  username: "Elixir-Newbie",
+  name: "mohsin",
+  player_score: "2000"
+})
diff --git a/test/fitness/accounts_test.exs b/test/fitness/accounts_test.exs
index b5868fc..ea5db29 100644
--- a/test/fitness/accounts_test.exs
+++ b/test/fitness/accounts_test.exs
@@ -59,13 +59,23 @@ defmodule Fitness.AccountsTest do
     end
 
     test "validates email and password when given" do
-      {:error, changeset} = Accounts.register_user(%{email: "not valid", password: "1", name: "not valid123", username: "not valid"})
+      {:error, changeset} =
+        Accounts.register_user(%{
+          email: "not valid",
+          password: "1",
+          name: "not valid123",
+          username: "not valid"
+        })
 
       assert %{
                email: ["must have the @ sign and no spaces"],
                password: ["should be at least 6 character(s)"],
-               name: ["A name must be made up of only letters and should not include any symbols or numbers."],
-               username: ["A username should consist of both letters and numbers, and should not contain any spaces"]
+               name: [
+                 "A name must be made up of only letters and should not include any symbols or numbers."
+               ],
+               username: [
+                 "A username should consist of both letters and numbers, and should not contain any spaces"
+               ]
              } = errors_on(changeset)
     end
 
diff --git a/test/fitness/exercises_test.exs b/test/fitness/exercises_test.exs
index 7349a76..7f0a6b0 100644
--- a/test/fitness/exercises_test.exs
+++ b/test/fitness/exercises_test.exs
@@ -21,7 +21,15 @@ defmodule Fitness.ExercisesTest do
     end
 
     test "create_exercise/1 with valid data creates a exercise" do
-      valid_attrs = %{description: "some description", gif_url: "some gif_url", level: "some level", name: "some name", type: "some type", equipment: "some equipment",body_part: "some body part"}
+      valid_attrs = %{
+        description: "some description",
+        gif_url: "some gif_url",
+        level: "some level",
+        name: "some name",
+        type: "some type",
+        equipment: "some equipment",
+        body_part: "some body part"
+      }
 
       assert {:ok, %Exercise{} = exercise} = Exercises.create_exercise(valid_attrs)
       assert exercise.description == "some description"
@@ -39,7 +47,14 @@ defmodule Fitness.ExercisesTest do
 
     test "update_exercise/2 with valid data updates the exercise" do
       exercise = exercise_fixture()
-      update_attrs = %{description: "some updated description", gif_url: "some updated gif_url", level: "some updated level", name: "some updated name", type: "some updated type"}
+
+      update_attrs = %{
+        description: "some updated description",
+        gif_url: "some updated gif_url",
+        level: "some updated level",
+        name: "some updated name",
+        type: "some updated type"
+      }
 
       assert {:ok, %Exercise{} = exercise} = Exercises.update_exercise(exercise, update_attrs)
       assert exercise.description == "some updated description"
diff --git a/test/fitness/workout_templates_test.exs b/test/fitness/workout_templates_test.exs
index 5cba24d..b75b21b 100644
--- a/test/fitness/workout_templates_test.exs
+++ b/test/fitness/workout_templates_test.exs
@@ -30,10 +30,10 @@ defmodule Fitness.WorkoutTemplatesTest do
       user = user_fixture()
       valid_attrs = %{name: "some name", user_id: user.id}
 
-       assert {:ok, %WorkoutTemplate{} = workout_template} =
+      assert {:ok, %WorkoutTemplate{} = workout_template} =
                WorkoutTemplates.create_workout_template(valid_attrs)
 
-       assert workout_template.name == "some name"
+      assert workout_template.name == "some name"
     end
 
     test "create_workout_template/1 with invalid data returns error changeset" do
diff --git a/test/fitness_web/controllers/user_auth_test.exs b/test/fitness_web/controllers/user_auth_test.exs
index 36a5c06..1970582 100644
--- a/test/fitness_web/controllers/user_auth_test.exs
+++ b/test/fitness_web/controllers/user_auth_test.exs
@@ -132,7 +132,7 @@ defmodule FitnessWeb.UserAuthTest do
       conn = conn |> fetch_flash() |> UserAuth.require_authenticated_user([])
       assert conn.halted
       assert redirected_to(conn) == Routes.user_session_path(conn, :new)
-      assert get_flash(conn, :error) == "You must log in to access this page."
+      assert Phoenix.Flash.get(conn.assigns.flash, :error) == "You must log in to access this page."
     end
 
     test "stores the path to redirect to on GET", %{conn: conn} do
diff --git a/test/fitness_web/controllers/user_confirmation_controller_test.exs b/test/fitness_web/controllers/user_confirmation_controller_test.exs
index ba7f9f8..3e2fc0b 100644
--- a/test/fitness_web/controllers/user_confirmation_controller_test.exs
+++ b/test/fitness_web/controllers/user_confirmation_controller_test.exs
@@ -26,7 +26,7 @@ defmodule FitnessWeb.UserConfirmationControllerTest do
         })
 
       assert redirected_to(conn) == "/"
-      assert get_flash(conn, :info) =~ "If your email is in our system"
+      assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "If your email is in our system"
       assert Repo.get_by!(Accounts.UserToken, user_id: user.id).context == "confirm"
     end
 
@@ -39,7 +39,7 @@ defmodule FitnessWeb.UserConfirmationControllerTest do
         })
 
       assert redirected_to(conn) == "/"
-      assert get_flash(conn, :info) =~ "If your email is in our system"
+      assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "If your email is in our system"
       refute Repo.get_by(Accounts.UserToken, user_id: user.id)
     end
 
@@ -50,7 +50,7 @@ defmodule FitnessWeb.UserConfirmationControllerTest do
         })
 
       assert redirected_to(conn) == "/"
-      assert get_flash(conn, :info) =~ "If your email is in our system"
+      assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "If your email is in our system"
       assert Repo.all(Accounts.UserToken) == []
     end
   end
@@ -75,7 +75,7 @@ defmodule FitnessWeb.UserConfirmationControllerTest do
 
       conn = post(conn, Routes.user_confirmation_path(conn, :update, token))
       assert redirected_to(conn) == "/"
-      assert get_flash(conn, :info) =~ "User confirmed successfully"
+      assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "User confirmed successfully"
       assert Accounts.get_user!(user.id).confirmed_at
       refute get_session(conn, :user_token)
       assert Repo.all(Accounts.UserToken) == []
@@ -83,7 +83,7 @@ defmodule FitnessWeb.UserConfirmationControllerTest do
       # When not logged in
       conn = post(conn, Routes.user_confirmation_path(conn, :update, token))
       assert redirected_to(conn) == "/"
-      assert get_flash(conn, :error) =~ "User confirmation link is invalid or it has expired"
+      assert Phoenix.Flash.get(conn.assigns.flash, :error) =~ "User confirmation link is invalid or it has expired"
 
       # When logged in
       conn =
@@ -92,13 +92,13 @@ defmodule FitnessWeb.UserConfirmationControllerTest do
         |> post(Routes.user_confirmation_path(conn, :update, token))
 
       assert redirected_to(conn) == "/"
-      refute get_flash(conn, :error)
+      refute Phoenix.Flash.get(conn.assigns.flash, :error)
     end
 
     test "does not confirm email with invalid token", %{conn: conn, user: user} do
       conn = post(conn, Routes.user_confirmation_path(conn, :update, "oops"))
       assert redirected_to(conn) == "/"
-      assert get_flash(conn, :error) =~ "User confirmation link is invalid or it has expired"
+      assert Phoenix.Flash.get(conn.assigns.flash, :error) =~ "User confirmation link is invalid or it has expired"
       refute Accounts.get_user!(user.id).confirmed_at
     end
   end
diff --git a/test/fitness_web/controllers/user_reset_password_controller_test.exs b/test/fitness_web/controllers/user_reset_password_controller_test.exs
index 0d40786..00fec94 100644
--- a/test/fitness_web/controllers/user_reset_password_controller_test.exs
+++ b/test/fitness_web/controllers/user_reset_password_controller_test.exs
@@ -12,7 +12,7 @@ defmodule FitnessWeb.UserResetPasswordControllerTest do
   describe "GET /users/reset_password" do
     test "renders the reset password page", %{conn: conn} do
       conn = get(conn, Routes.user_reset_password_path(conn, :new))
-     response = html_response(conn, 200)
+      response = html_response(conn, 200)
       assert response =~ "Forgot your password?"
     end
   end
@@ -26,7 +26,7 @@ defmodule FitnessWeb.UserResetPasswordControllerTest do
         })
 
       assert redirected_to(conn) == "/"
-      assert get_flash(conn, :info) =~ "If your email is in our system"
+      assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "If your email is in our system"
       assert Repo.get_by!(Accounts.UserToken, user_id: user.id).context == "reset_password"
     end
 
@@ -37,7 +37,7 @@ defmodule FitnessWeb.UserResetPasswordControllerTest do
         })
 
       assert redirected_to(conn) == "/"
-      assert get_flash(conn, :info) =~ "If your email is in our system"
+      assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "If your email is in our system"
       assert Repo.all(Accounts.UserToken) == []
     end
   end
@@ -60,7 +60,7 @@ defmodule FitnessWeb.UserResetPasswordControllerTest do
     test "does not render reset password with invalid token", %{conn: conn} do
       conn = get(conn, Routes.user_reset_password_path(conn, :edit, "oops"))
       assert redirected_to(conn) == "/"
-      assert get_flash(conn, :error) =~ "Reset password link is invalid or it has expired"
+      assert Phoenix.Flash.get(conn.assigns.flash, :error) =~ "Reset password link is invalid or it has expired"
     end
   end
 
@@ -85,7 +85,7 @@ defmodule FitnessWeb.UserResetPasswordControllerTest do
 
       assert redirected_to(conn) == Routes.user_session_path(conn, :new)
       refute get_session(conn, :user_token)
-      assert get_flash(conn, :info) =~ "Password reset successfully"
+      assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "Password reset successfully"
       assert Accounts.get_user_by_email_and_password(user.email, "new valid password")
     end
 
@@ -107,7 +107,7 @@ defmodule FitnessWeb.UserResetPasswordControllerTest do
     test "does not reset password with invalid token", %{conn: conn} do
       conn = put(conn, Routes.user_reset_password_path(conn, :update, "oops"))
       assert redirected_to(conn) == "/"
-      assert get_flash(conn, :error) =~ "Reset password link is invalid or it has expired"
+      assert Phoenix.Flash.get(conn.assigns.flash, :error) =~ "Reset password link is invalid or it has expired"
     end
   end
 end
diff --git a/test/fitness_web/controllers/user_settings_controller_test.exs b/test/fitness_web/controllers/user_settings_controller_test.exs
index 8f28481..ea8eec3 100644
--- a/test/fitness_web/controllers/user_settings_controller_test.exs
+++ b/test/fitness_web/controllers/user_settings_controller_test.exs
@@ -34,7 +34,7 @@ defmodule FitnessWeb.UserSettingsControllerTest do
 
       assert redirected_to(new_password_conn) == Routes.user_settings_path(conn, :edit)
       assert get_session(new_password_conn, :user_token) != get_session(conn, :user_token)
-      assert get_flash(new_password_conn, :info) =~ "Password updated successfully"
+      assert Phoenix.Flash.get(new_password_conn.assigns.flash, :info) =~ "Password updated successfully"
       assert Accounts.get_user_by_email_and_password(user.email, "new valid password")
     end
 
@@ -70,7 +70,7 @@ defmodule FitnessWeb.UserSettingsControllerTest do
         })
 
       assert redirected_to(conn) == Routes.user_settings_path(conn, :edit)
-      assert get_flash(conn, :info) =~ "A link to confirm your email"
+      assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "A link to confirm your email"
       assert Accounts.get_user_by_email(user.email)
     end
 
@@ -104,19 +104,19 @@ defmodule FitnessWeb.UserSettingsControllerTest do
     test "updates the user email once", %{conn: conn, user: user, token: token, email: email} do
       conn = get(conn, Routes.user_settings_path(conn, :confirm_email, token))
       assert redirected_to(conn) == Routes.user_settings_path(conn, :edit)
-      assert get_flash(conn, :info) =~ "Email changed successfully"
+      assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "Email changed successfully"
       refute Accounts.get_user_by_email(user.email)
       assert Accounts.get_user_by_email(email)
 
       conn = get(conn, Routes.user_settings_path(conn, :confirm_email, token))
       assert redirected_to(conn) == Routes.user_settings_path(conn, :edit)
-      assert get_flash(conn, :error) =~ "Email change link is invalid or it has expired"
+      assert Phoenix.Flash.get(conn.assigns.flash, :error) =~ "Email change link is invalid or it has expired"
     end
 
     test "does not update email with invalid token", %{conn: conn, user: user} do
       conn = get(conn, Routes.user_settings_path(conn, :confirm_email, "oops"))
       assert redirected_to(conn) == Routes.user_settings_path(conn, :edit)
-      assert get_flash(conn, :error) =~ "Email change link is invalid or it has expired"
+      assert Phoenix.Flash.get(conn.assigns.flash, :error) =~ "Email change link is invalid or it has expired"
       assert Accounts.get_user_by_email(user.email)
     end
 
diff --git a/test/fitness_web/live/exercise_live_test.exs b/test/fitness_web/live/exercise_live_test.exs
index f357042..6c56061 100644
--- a/test/fitness_web/live/exercise_live_test.exs
+++ b/test/fitness_web/live/exercise_live_test.exs
@@ -25,7 +25,15 @@ defmodule FitnessWeb.ExerciseLiveTest do
     equipment: "Others",
     body_part: "Others"
   }
-  @invalid_attrs %{description: nil, gif_url: nil, level: "Others", name: nil, type: "Others", equipment: "Others", body_part: "Others"}
+  @invalid_attrs %{
+    description: nil,
+    gif_url: nil,
+    level: "Others",
+    name: nil,
+    type: "Others",
+    equipment: "Others",
+    body_part: "Others"
+  }
 
   setup %{conn: conn} do
     conn =
@@ -83,7 +91,6 @@ defmodule FitnessWeb.ExerciseLiveTest do
 
       {:ok, index_live, _html} = live(conn, Routes.exercise_index_path(conn, :index))
 
-
       assert index_live |> element("#exercise-#{exercise.id} a", "Edit") |> render_click() =~
                "Edit Exercise"
 
@@ -104,7 +111,6 @@ defmodule FitnessWeb.ExerciseLiveTest do
     end
 
     test "deletes exercise in listing", %{conn: conn, exercise: exercise, user: user} do
-
       conn = conn |> log_in_user(user)
       {:ok, index_live, _html} = live(conn, Routes.exercise_index_path(conn, :index))
 
@@ -127,7 +133,6 @@ defmodule FitnessWeb.ExerciseLiveTest do
 
       {:ok, show_live, _html} = live(conn, Routes.exercise_show_path(conn, :show, exercise))
 
-
       assert show_live |> element("a", "Edit") |> render_click() =~
                "Edit Exercise"
 
diff --git a/test/fitness_web/live/workout_template_live_test.exs b/test/fitness_web/live/workout_template_live_test.exs
index 2da4a5a..f260ba6 100644
--- a/test/fitness_web/live/workout_template_live_test.exs
+++ b/test/fitness_web/live/workout_template_live_test.exs
@@ -18,7 +18,11 @@ defmodule FitnessWeb.WorkoutTemplateLiveTest do
   describe "Index" do
     setup [:create_workout_template]
 
-    test "lists all workout_templates", %{conn: conn, workout_template: workout_template, user: user} do
+    test "lists all workout_templates", %{
+      conn: conn,
+      workout_template: workout_template,
+      user: user
+    } do
       conn = conn |> log_in_user(user)
 
       {:ok, _index_live, html} = live(conn, Routes.workout_template_index_path(conn, :index))
@@ -33,30 +37,36 @@ defmodule FitnessWeb.WorkoutTemplateLiveTest do
       {:ok, index_live, _html} = live(conn, Routes.workout_template_index_path(conn, :index))
 
       assert index_live |> element("a", "New Workout") |> render_click() =~
-      "New Workout template"
+               "New Workout template"
 
       assert_patch(index_live, Routes.workout_template_index_path(conn, :new))
 
       assert index_live
-      |> form("#workout_template-form", workout_template: @invalid_attrs)
-      |> render_change() =~ "can&#39;t be blank"
+             |> form("#workout_template-form", workout_template: @invalid_attrs)
+             |> render_change() =~ "can&#39;t be blank"
 
       {:error, {:live_redirect, %{to: location}}} =
         index_live
         |> form("#workout_template-form", workout_template: @create_attrs)
         |> render_submit()
 
-        {:ok, _, html} = live(conn, location)
+      {:ok, _, html} = live(conn, location)
 
       assert html =~ "SOME NAME"
     end
 
-    test "updates workout_template in listing", %{conn: conn, workout_template: workout_template, user: user} do
+    test "updates workout_template in listing", %{
+      conn: conn,
+      workout_template: workout_template,
+      user: user
+    } do
       conn = conn |> log_in_user(user)
 
       {:ok, index_live, _html} = live(conn, Routes.workout_template_index_path(conn, :index))
 
-      assert index_live |> element("#workout_template-#{workout_template.id} a", "Edit") |> render_click() =~
+      assert index_live
+             |> element("#workout_template-#{workout_template.id} a", "Edit")
+             |> render_click() =~
                "Edit Workout template"
 
       assert_patch(index_live, Routes.workout_template_index_path(conn, :edit, workout_template))
@@ -75,12 +85,19 @@ defmodule FitnessWeb.WorkoutTemplateLiveTest do
       assert html =~ "SOME UPDATED NAME"
     end
 
-    test "deletes workout_template in listing", %{conn: conn, workout_template: workout_template, user: user} do
+    test "deletes workout_template in listing", %{
+      conn: conn,
+      workout_template: workout_template,
+      user: user
+    } do
       conn = conn |> log_in_user(user)
 
       {:ok, index_live, _html} = live(conn, Routes.workout_template_index_path(conn, :index))
 
-      assert index_live |> element("#workout_template-#{workout_template.id} a", "Delete") |> render_click()
+      assert index_live
+             |> element("#workout_template-#{workout_template.id} a", "Delete")
+             |> render_click()
+
       refute has_element?(index_live, "#workout_template-#{workout_template.id}")
     end
   end
@@ -88,22 +105,33 @@ defmodule FitnessWeb.WorkoutTemplateLiveTest do
   describe "Show" do
     setup [:create_workout_template]
 
-    test "displays workout_template", %{conn: conn, workout_template: workout_template, user: user} do
+    test "displays workout_template", %{
+      conn: conn,
+      workout_template: workout_template,
+      user: user
+    } do
       conn = conn |> log_in_user(user)
-      {:ok, _show_live, html} = live(conn, Routes.workout_template_show_path(conn, :show, workout_template))
+
+      {:ok, _show_live, html} =
+        live(conn, Routes.workout_template_show_path(conn, :show, workout_template))
 
       assert html =~ "Show Workout template"
       assert html =~ String.upcase(workout_template.name)
     end
 
-    test "Add workout_items within modal", %{conn: conn, workout_template: workout_template, user: user} do
-       conn = conn |> log_in_user(user)
+    test "Add workout_items within modal", %{
+      conn: conn,
+      workout_template: workout_template,
+      user: user
+    } do
+      conn = conn |> log_in_user(user)
 
-       {:ok, show_live, _html} = live(conn, Routes.workout_template_show_path(conn, :show, workout_template))
+      {:ok, show_live, _html} =
+        live(conn, Routes.workout_template_show_path(conn, :show, workout_template))
 
-       assert show_live |> element("a", "ADD EXERCISE") |> render_click() =~ "Add New Exercises"
+      assert show_live |> element("a", "ADD EXERCISE") |> render_click() =~ "Add New Exercises"
 
-       assert_patch(show_live, Routes.workout_template_show_path(conn, :edit, workout_template))
+      assert_patch(show_live, Routes.workout_template_show_path(conn, :edit, workout_template))
 
       #  assert show_live
       #         |> form("#workout_items_form", workout_items: @invalid_attrs_workout_items)
diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex
index 4843dcc..44caeee 100644
--- a/test/support/conn_case.ex
+++ b/test/support/conn_case.ex
@@ -28,6 +28,8 @@ defmodule FitnessWeb.ConnCase do
 
       # The default endpoint for testing
       @endpoint FitnessWeb.Endpoint
+
+      use FitnessWeb, :verified_routes
     end
   end