diff --git a/app.py b/app.py
index be6e1e7..ba7275e 100644
--- a/app.py
+++ b/app.py
@@ -255,8 +255,8 @@ def render_users_and_workouts():
         users_data.append(user_data)
 
     if htmx:
-        render_template('users_and_workouts_wrapper.html',
-                        users=users_data, bikes=Bike.query.all())
+        return render_template('users_and_workouts_wrapper.html',
+                               users=users_data, bikes=Bike.query.all())
     return render_template('users_and_workouts.html', users=users_data, bikes=Bike.query.all())
 
 
diff --git a/templates/users.html b/templates/users.html
index b0ade3c..627f5d8 100644
--- a/templates/users.html
+++ b/templates/users.html
@@ -1,7 +1,7 @@
 <form class="block p-6 bg-white border border-gray-200 rounded-lg shadow mt-8" hx-post="{{ url_for('users') }}"
     hx-target="#users-container">
 
-    <div class="grid gap-4 grid-cols-1 md:grid-cols-3 mb-2 mb-2">
+    <div class="grid gap-4 grid-cols-1 md:grid-cols-3">
         <div class="w-full mb-6 md:mb-0">
             <label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2" for="grid-city">
                 Name
diff --git a/templates/users_and_workouts_wrapper.html b/templates/users_and_workouts_wrapper.html
index c055a38..f847125 100644
--- a/templates/users_and_workouts_wrapper.html
+++ b/templates/users_and_workouts_wrapper.html
@@ -4,6 +4,14 @@
 {% endwith %}
 {% endfor %}
 
+<script>
+    document.querySelectorAll('.accordion-button').forEach(header => {
+        header.addEventListener('click', () => {
+            header.parentElement.parentElement.querySelector('div.collapse').classList.toggle('hidden');
+        });
+    });
+</script>
+
 {% with users=users, bikes=bikes %}
 {% include 'users.html' %}
 {% endwith %}
\ No newline at end of file
diff --git a/templates/workouts_list.html b/templates/workouts_list.html
index cb83d07..978610b 100644
--- a/templates/workouts_list.html
+++ b/templates/workouts_list.html
@@ -36,11 +36,14 @@
         </div>
         <button
             class="shadow mt-6 bg-purple-500 hover:bg-purple-400 focus:shadow-outline focus:outline-none text-white font-bold py-2 px-4 rounded w-full ml-0 md:ml-4"
-            type="submit">New Workout</button>
+            type="submit" onclick="location.href = '{{ url_for('new_workout', user_id=u.id) }}';">New Workout</button>
     </div>
 </div>
 
-<div class="border border-t-0  border-neutral-200 border-b-lg bg-white dark:border-neutral-600 dark:bg-neutral-800">
+<div
+    class="border border-t-0  border-neutral-200 border-b-lg bg-white dark:border-neutral-600 dark:bg-neutral-800 mb-8">
+    {% if u.workouts_count > 0 %}
+
     <h2 class="mb-0">
         <button
             class="accordion-button group relative flex w-full items-center rounded-t-[15px] border-0 bg-white py-4 px-5 text-left text-base text-neutral-800 transition [overflow-anchor:none] hover:z-[2] focus:z-[3] focus:outline-none dark:bg-neutral-800 dark:text-white [&:not([data-te-collapse-collapsed])]:bg-white [&:not([data-te-collapse-collapsed])]:text-primary [&:not([data-te-collapse-collapsed])]:[box-shadow:inset_0_-1px_0_rgba(229,231,235)] dark:[&:not([data-te-collapse-collapsed])]:bg-neutral-800 dark:[&:not([data-te-collapse-collapsed])]:text-primary-400 dark:[&:not([data-te-collapse-collapsed])]:[box-shadow:inset_0_-1px_0_rgba(75,85,99)]"
@@ -115,14 +118,5 @@
 
 
     </div>
-</div>
-
-
-
-<script>
-    document.querySelectorAll('.accordion-button').forEach(header => {
-        header.addEventListener('click', () => {
-            header.parentElement.parentElement.querySelector('div.collapse').classList.toggle('hidden');
-        });
-    });
-</script>
\ No newline at end of file
+    {% endif %}
+</div>
\ No newline at end of file