diff --git a/templates/partials/calendar.html b/templates/partials/calendar.html
index f1d6763..fb1af92 100644
--- a/templates/partials/calendar.html
+++ b/templates/partials/calendar.html
@@ -1,4 +1,4 @@
-<div class="md:p-8 p-5 dark:bg-gray-800 bg-white rounded-t" id="monthly-calendar-{{ user_id }}">
+<div class="px-5 py-2 dark:bg-gray-800 bg-white rounded-t" id="monthly-calendar-{{ user_id }}">
     <div class="px-4 flex items-center justify-between">
         <span tabindex="0" class="focus:outline-none  text-base font-bold dark:text-gray-100 text-gray-800">{{
             calendar_month.month_year }}</span>
@@ -66,9 +66,10 @@
                 <p
                     class="text-base {% if d.is_current_month %} text-gray-500 {% else %} text-gray-300 {% endif %} dark:text-gray-100 font-medium text-center">
                 <div class="w-full h-full">
-                    <div class="flex items-center justify-center w-full rounded-full cursor-pointer">
+                    <div
+                        class="flex items-center justify-center w-full rounded-full {% if d.is_workout %}cursor-pointer{% endif %}">
                         <a role="link" tabindex="0"
-                            class="{% if d.is_workout %}focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-700 focus:bg-indigo-500 hover:bg-indigo-500{% endif %} {% if d.is_current_date %}bg-indigo-700{% elif d.is_workout %}bg-indigo-300{% endif %} text-base w-8 h-8 px-2 flex items-center justify-center font-medium text-white rounded-full"
+                            class="{% if d.is_workout %}focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-700 focus:bg-indigo-500 hover:bg-indigo-500{% endif %} {% if d.is_current_date %}bg-indigo-700{% elif d.is_workout %}bg-indigo-300{% endif %} text-base w-8 h-8 px-2 flex items-center justify-center font-medium {% if d.is_workout or d.is_current_date %}text-white{% elif d.is_current_month %}text-gray-500{% else %}text-gray-300{% endif %} rounded-full"
                             {% if d.is_workout
                             %}hx-get="{{ url_for('calendar_workout_view', user_id=user_id, workout_id=d.workout.id) }}"
                             hx-target="#selected-workout-view-{{ user_id }}"
diff --git a/templates/partials/selected_workout_view.html b/templates/partials/selected_workout_view.html
index 162bf2d..1edb411 100644
--- a/templates/partials/selected_workout_view.html
+++ b/templates/partials/selected_workout_view.html
@@ -1,4 +1,4 @@
-<div class="p-4 bg-white  shadow-sm dark:bg-gray-700 dark:border-gray-600 cursor-pointer mb-10">
+<div class="px-4 bg-white  shadow-sm dark:bg-gray-700 dark:border-gray-600 cursor-pointer mb-10">
     <div class="flex justify-end mb-2">
         <button type="button"
             class="inline-block rounded-full border-2 border-danger px-6 pb-[6px] pt-2 text-xs font-medium uppercase leading-normal text-danger transition duration-150 ease-in-out hover:border-danger-600 hover:bg-neutral-500 hover:bg-opacity-10 hover:text-danger-600 focus:border-danger-600 focus:text-danger-600 focus:outline-none focus:ring-0 active:border-danger-700 active:text-danger-700 dark:hover:bg-neutral-100 dark:hover:bg-opacity-10 flex flex-row items-center"
diff --git a/templates/workouts_list.html b/templates/workouts_list.html
index c0618d8..49c112e 100644
--- a/templates/workouts_list.html
+++ b/templates/workouts_list.html
@@ -65,7 +65,8 @@
     <div class="!visible collapse p-4 hidden">
         {{ render_partial('partials/calendar.html', calendar_month=u.calendar_month, user_id = u.id) }}
 
-        <div id="workouts-list-wrapper-for-user-{{ u.id }}">{{ render_partial('partials/workouts_list_fragment.html',
+        <div id="workouts-list-wrapper-for-user-{{ u.id }}" class="mt-5 pl-2">{{
+            render_partial('partials/workouts_list_fragment.html',
             workouts=workouts[:7], user_id = u.id) }}</div>