diff --git a/repo/weekly-view/client.mjs b/repo/weekly-view/client.mjs
index 452e7af..7b1afd4 100644
--- a/repo/weekly-view/client.mjs
+++ b/repo/weekly-view/client.mjs
@@ -9,21 +9,22 @@
 export default async function ({ web }, db) {
   const pageSelector = '.notion-page-content',
     calendarSelector = '.notion-calendar-view',
-    collectionSelector =
-            '.notion-page-content > .notion-selectable.notion-collection_view-block',
-    viewSelector = ':scope>div>div>div>div>div',
+    viewSelector =
+      '.notion-page-content > .notion-selectable.notion-collection_view-block',
+    viewControlSelector = ':scope>div>div>div>div>div',
     todaySelector = '.notion-calendar-view-day[style*="background"]',
     weekSelector = '[style^="position: relative; display: flex; height: "]',
     toolbarBtnSelector =
-            '.notion-calendar-view > :first-child > :first-child > :first-child > :nth-last-child(2)';
+      '.notion-calendar-view > :first-child > :first-child > :first-child > :nth-last-child(2)';
 
   const transformCalendarView = () => {
     const $page = document.querySelector(pageSelector);
-    document.querySelectorAll(collectionSelector).forEach(async ($view) => {      // Get view controls children nodes, convert to array, filter out non-text
+    document.querySelectorAll(viewSelector).forEach(async ($view) => {    
+      let currentText;  
+      // Get view controls children nodes, convert to array, filter out non-text
       const viewNodes = []
-        .slice.call($view.querySelector(viewSelector).children)
+        .slice.call($view.querySelector(viewControlSelector).children)
         .filter(node => node.tagName.toLowerCase().match(/(div|span)/g));
-      let currentText;
 
       // Find current view by analyzing children (which changes on viewport) 
       if (viewNodes.length === 1)
@@ -34,36 +35,33 @@ export default async function ({ web }, db) {
         // Wide/Desktop: Tabs listed, current view indicated by border style
         currentText = viewNodes
           // Find selected view by border style (possibly fragile)
-          .filter((e) => e.children[0].style.borderBottomWidth.toString() === '2px' )[0]
-          // Format
+          .filter((e) => e.children[0].style.borderBottomWidth.toString() === '2px')[0]
           .innerText.toLowerCase();
       }
-        
-      // Check if view is weekly
-      if (currentText !== 'weekly')
-        return;
+      
+      if (currentText !== 'weekly') return;
 
-      const $calendar =
-                $view.parentElement.parentElement.parentElement.parentElement;
+      const $calendar = $view.parentElement.parentElement.parentElement.parentElement;
       if (!$calendar.querySelector(todaySelector)) {
         $calendar.querySelector(toolbarBtnSelector).click();
       }
       await new Promise((res, rej) => requestAnimationFrame(res));
       if ($page) {
         for (const $week of $calendar.querySelectorAll(weekSelector)) {
-          if (!$week.querySelector(todaySelector)) 
+          if (!$week.querySelector(todaySelector)) {
+            $week.style.height = 0;
             $week.style.visibility = 'hidden';
+          }
         }
       } else {
-        const $weekContainer =
-                    $calendar.querySelector(weekSelector).parentElement;
+        const $weekContainer = $calendar.querySelector(weekSelector).parentElement;
         for (const $week of $calendar.querySelectorAll(weekSelector)) {
           if ($week.querySelector(todaySelector)) {
             $weekContainer.style.maxHeight = $week.style.height;
             break;
           } else {
             $week.style.height = '0';
-            $week.style.opacity = '0';
+            $week.style.visibility = 'hidden';
           }
         }
       }