diff --git a/templates/partials/page/calendar.html b/templates/partials/page/calendar.html
index 63585fe..a66f7dd 100644
--- a/templates/partials/page/calendar.html
+++ b/templates/partials/page/calendar.html
@@ -74,366 +74,303 @@
 
         <div class="grid grid-cols-7 overflow-hidden flex-1 pl-2 pr-2 w-full">
 
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">1</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer">
+                <div class="bottom flex-grow h-30 py-1 w-full">
                     <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs">
                         <span class="ml-2 font-medium leading-none truncate">Squat</span>
                         <span class="ml-2 font-light leading-none">5x50kg</span>
-
                     </button>
                     <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs">
                         <span class="ml-2 font-medium leading-none truncate">DB Seal row</span>
                         <span class="ml-2 font-light leading-none">12x20kg</span>
-
                     </button>
                 </div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">2</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer">
-                    <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs hover:bg-gray-200">
+                <div class="bottom flex-grow h-30 py-1 w-full">
+                    <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs">
                         <span class="ml-2 font-medium leading-none truncate">Squat</span>
                         <span class="ml-2 font-light leading-none">5x50kg</span>
-
                     </button>
-                    <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs hover:bg-gray-200">
+                    <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs">
                         <span class="ml-2 font-medium leading-none truncate">DB Seal row</span>
                         <span class="ml-2 font-light leading-none">12x20kg</span>
-
                     </button>
                 </div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">3</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">4</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">6</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">7</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer">
-                    <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs hover:bg-gray-200">
+                <div class="bottom flex-grow h-30 py-1 w-full">
+                    <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs">
                         <span class="ml-2 font-medium leading-none truncate">Squat</span>
                         <span class="ml-2 font-light leading-none">5x50kg</span>
-
                     </button>
-                    <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs hover:bg-gray-200">
+                    <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs">
                         <span class="ml-2 font-medium leading-none truncate">DB Seal row</span>
                         <span class="ml-2 font-light leading-none">12x20kg</span>
-
                     </button>
                 </div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold text-sm">8</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-
-            <!--         line 1 -->
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">9</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">10</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">12</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer">
-                    <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs hover:bg-gray-200">
+                <div class="bottom flex-grow h-30 py-1 w-full">
+                    <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs">
                         <span class="ml-2 font-medium leading-none truncate">Squat</span>
                         <span class="ml-2 font-light leading-none">5x50kg</span>
-
                     </button>
-                    <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs hover:bg-gray-200">
+                    <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs">
                         <span class="ml-2 font-medium leading-none truncate">DB Seal row</span>
                         <span class="ml-2 font-light leading-none">12x20kg</span>
-
                     </button>
                 </div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">13</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
             <div
-                class="rounded-md border-4 border-green-50 border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+                class="rounded-md border-4 border-green-50 border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">14</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">15</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold text-sm">16</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <!--         line 1 -->
-
-            <!--         line 2 -->
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">16</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer">
-                    <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs hover:bg-gray-200">
+                <div class="bottom flex-grow h-30 py-1 w-full">
+                    <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs">
                         <span class="ml-2 font-medium leading-none truncate">Squat</span>
                         <span class="ml-2 font-light leading-none">5x50kg</span>
-
                     </button>
-                    <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs hover:bg-gray-200">
+                    <button class="flex items-center flex-shrink-0 h-5 px-1 text-xs">
                         <span class="ml-2 font-medium leading-none truncate">DB Seal row</span>
                         <span class="ml-2 font-light leading-none">12x20kg</span>
-
                     </button>
                 </div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">17</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">18</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">19</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">20</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">21</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold text-sm">22</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <!--         line 2 -->
-
-            <!--         line 3 -->
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">23</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">24</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">25</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">26</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">27</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">28</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold text-sm">29</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <!--         line 3 -->
-
-            <!--         line 4 -->
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">30</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2">
+            <div class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">31</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
             <div
-                class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 bg-gray-100 pt-2 pl-2">
+                class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer bg-gray-100 pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">1</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
             <div
-                class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 bg-gray-100 pt-2 pl-2">
+                class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer bg-gray-100 pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">2</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
             <div
-                class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 bg-gray-100 pt-2 pl-2">
+                class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer bg-gray-100 pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">3</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
             <div
-                class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 bg-gray-100 pt-2 pl-2">
+                class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer bg-gray-100 pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold">4</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
             <div
-                class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 bg-gray-100 pt-2 pl-2">
+                class="border flex flex-col h-40 mx-auto mx-auto overflow-hidden w-full pt-2 pl-2 cursor-pointer bg-gray-100 pt-2 pl-2 cursor-pointer">
                 <div class="top h-5 w-full">
                     <span class="text-gray-500 font-semibold text-sm">5</span>
                 </div>
-                <div class="bottom flex-grow h-30 py-1 w-full cursor-pointer"></div>
+                <div class="bottom flex-grow h-30 py-1 w-full"></div>
             </div>
 
-
-            <!--         line 4 -->
         </div>
-
-
     </div>
     {% elif selected_view == 'year'%}
     <div class="flex px-2 py-2 -mb-px">