diff --git a/public/popup.css b/public/popup.css
index df46ff0f..d50b3feb 100644
--- a/public/popup.css
+++ b/public/popup.css
@@ -173,6 +173,13 @@ div.logoText>p, .recordingSubtitle {
   font-size: 19px;
 }
 
+#mainControls > label > svg {
+  min-width: 16px;
+  min-height: 16px;
+  margin-top: auto;
+  margin-bottom: auto;
+}
+
 label>svg>path {
   fill: var(--sb-main-fg-color);
 }
@@ -225,6 +232,7 @@ label>svg, button#optionsButton>img, .logoText>img, #usernameValue {
 #usernameValue{
   overflow: hidden;
   text-overflow: ellipsis;
+  max-width: 130px;
 }
 
 #setUsername {
diff --git a/src/popup.ts b/src/popup.ts
index 732deee7..a0dbe7aa 100644
--- a/src/popup.ts
+++ b/src/popup.ts
@@ -333,6 +333,7 @@ async function runThePopup(messageListener?: MessageListener) {
                     if (response.value) {
                         PageElements.whitelistChannel.style.display = "none";
                         PageElements.unwhitelistChannel.style.display = "unset";
+                        PageElements.whitelistToggle.checked = true;
                         document.querySelectorAll('label > svg')[0].classList.add("rotated");
 
                         PageElements.downloadedSponsorMessageTimes.innerText = chrome.i18n.getMessage("channelWhitelisted");
@@ -969,7 +970,7 @@ async function runThePopup(messageListener?: MessageListener) {
                     PageElements.unwhitelistChannel.style.display = "unset";
                     document.querySelectorAll('label > svg')[0].classList.add("rotated");
 
-                    //if (!Config.config.forceChannelCheck) PageElements.whitelistForceCheck.style.display = "unset";
+                    //TODO if (!Config.config.forceChannelCheck) PageElements.whitelistForceCheck.style.display = "unset";
 
                     PageElements.downloadedSponsorMessageTimes.innerText = chrome.i18n.getMessage("channelWhitelisted");
                     PageElements.downloadedSponsorMessageTimes.style.fontWeight = "bold";