diff --git a/src/js/background/main.js b/src/js/background/main.js
index 3d7bcef..2ab1a5c 100644
--- a/src/js/background/main.js
+++ b/src/js/background/main.js
@@ -49,11 +49,6 @@ const SECTIONS = [
   {
     name: "Left Navigation Bar",
     options: [
-      {
-        name: "Disable the YouTube logo link",
-        id: "remove_logo_link",
-        defaultValue: false
-      },
       {
         name: "Hide home button",
         id: "remove_home_link",
@@ -69,6 +64,11 @@ const SECTIONS = [
         id: "remove_shorts_link",
         defaultValue: true
       },
+      {
+        name: "Disable the YouTube logo link",
+        id: "remove_logo_link",
+        defaultValue: false
+      },
     ]
   },
   {
diff --git a/src/js/content-script.js b/src/js/content-script.js
index a95bb67..8ec0317 100644
--- a/src/js/content-script.js
+++ b/src/js/content-script.js
@@ -81,6 +81,13 @@ function runDynamicSettings() {
     handleUrlChange();
   }
 
+  // Mark the left nav bar sections
+  // const leftSections = document.querySelectorAll('ytd-guide-section-renderer');
+  // leftSections.forEach(section => {
+  //   const title = section.querySelector('#guide-section-title');
+  //   console.log('title', title.innerText);
+  // });
+
   // Hide shorts on the results page
   if (onResultsPage) {
     const shortResults = Array.from(document.querySelectorAll('a[href^="/shorts/"]:not([marked_as_short])'));
@@ -93,10 +100,20 @@ function runDynamicSettings() {
 
   // Disable autoplay
   if (cache['disable_autoplay'] === true) {
-    document.querySelectorAll('.ytp-autonav-toggle-button[aria-checked=true]')?.[0]?.click();
+    const autoplayButton = document.querySelectorAll('.ytp-autonav-toggle-button[aria-checked=true]');
+    autoplayButton?.forEach(e => {
+      if (e && e.offsetParent) {
+        e.click();
+      }
+    });
 
     // mobile
-    document.querySelectorAll('.ytm-autonav-toggle-button-container[aria-pressed=true]')?.[0]?.click();
+    const mAutoplayButton = document.querySelectorAll('.ytm-autonav-toggle-button-container[aria-pressed=true]');
+    mAutoplayButton?.forEach(e => {
+      if (e && e.offsetParent) {
+        e.click();
+      }
+    });
   }
 
   // // Enable theater mode
@@ -113,12 +130,20 @@ function runDynamicSettings() {
   if (cache['auto_skip_ads'] === true) {
 
     // Close overlay ads.
-    Array.from(document.querySelectorAll('.ytp-ad-overlay-close-button'))?.forEach(e => e?.click());
+    Array.from(document.querySelectorAll('.ytp-ad-overlay-close-button'))?.forEach(e => {
+      if (e && e.offsetParent) {
+        e.click();
+      }
+    });
 
     // Click on "Skip ad" button
     const skippableAd = document.querySelectorAll('.ytp-ad-skip-button').length;
     if (skippableAd) {
-      document.querySelectorAll('.ytp-ad-skip-button')?.[0]?.click();
+      document.querySelectorAll('.ytp-ad-skip-button')?.forEach(e => {
+        if (e && e.offsetParent) {
+          e.click();
+        }
+      });
     } else {
 
       // Speed through ads that can't be skipped (yet).