diff --git a/content-scripts/extension-context/youtube-features/appearance/comments/comments.js b/content-scripts/extension-context/youtube-features/appearance/comments/comments.js
index 6b27af5bd..e2bd170e6 100644
--- a/content-scripts/extension-context/youtube-features/appearance/comments/comments.js
+++ b/content-scripts/extension-context/youtube-features/appearance/comments/comments.js
@@ -24,7 +24,7 @@ extension.features.comments = function (anything) {
 					event.clientY - rect.top + rect.height >= 0 &&
 					rect.top + rect.height - event.clientY < 48
 				) {
-					document.querySelector('ytd-comments').toggleAttribute('it-activated');
+					target.parentNode.parentNode.parentNode.toggleAttribute('it-activated');
 				}
 			}
 		}
diff --git a/content-scripts/extension-context/youtube-features/appearance/header/header.css b/content-scripts/extension-context/youtube-features/appearance/header/header.css
index 3eb16b150..8f4b95166 100644
--- a/content-scripts/extension-context/youtube-features/appearance/header/header.css
+++ b/content-scripts/extension-context/youtube-features/appearance/header/header.css
@@ -43,6 +43,10 @@ html[it-header-position=hidden] ytd-page-manager#page-manager,
 html[it-header-position=hidden_on_video_page][data-page-type='video'] ytd-page-manager#page-manager,
 html[it-header-position=hover] ytd-page-manager#page-manager,
 html[it-header-position=hover_on_video_page][data-page-type='video'] ytd-page-manager#page-manager,
+html[it-header-position=hidden][data-page-type='channel'] tp-yt-app-header#header,
+html[it-header-position=hidden_on_video_page][data-page-type='channel'] tp-yt-app-header#header,
+html[it-header-position=hover][data-page-type='channel'] tp-yt-app-header#header,
+html[it-header-position=hover_on_video_page][data-page-type='channel'] tp-yt-app-header#header,
 html[it-header-position=static] ytd-page-manager#page-manager {
 	margin-top: 0;
 }
diff --git a/content-scripts/extension-context/youtube-features/appearance/player/player.css b/content-scripts/extension-context/youtube-features/appearance/player/player.css
index 9c2c92987..332072dd3 100644
--- a/content-scripts/extension-context/youtube-features/appearance/player/player.css
+++ b/content-scripts/extension-context/youtube-features/appearance/player/player.css
@@ -510,4 +510,13 @@ html[it-player-view-button=true] .ytp-size-button,
 html[it-player-screen-button=true] .ytp-fullscreen-button,
 html[it-player-remote-button=true] .ytp-remote-button {
 	display: none !important;
+}
+
+/*--------------------------------------------------------------
+# SKIP OVERLAY
+--------------------------------------------------------------*/
+
+html[it-player-hide-skip-overlay=true] .ytp-doubletap-ui, .ytp-doubletap-ui-legacy
+{
+    visibility: hidden;
 }
\ No newline at end of file
diff --git a/content-scripts/website-context/functions.js b/content-scripts/website-context/functions.js
index e4f6da61d..fc3a60a95 100644
--- a/content-scripts/website-context/functions.js
+++ b/content-scripts/website-context/functions.js
@@ -212,7 +212,7 @@ ImprovedTube.pageType = function () {
 		document.documentElement.dataset.pageType = 'subscriptions';
 	} else if (/\/watch\?/.test(location.href)) {
 		document.documentElement.dataset.pageType = 'video';
-	} else if (/\/channel|user|c\//.test(location.href)) {
+	} else if (/\/channel|\/user|\/c\/|\/@.*\//.test(location.href)) {
 		document.documentElement.dataset.pageType = 'channel';
 	} else {
 		document.documentElement.dataset.pageType = 'other';