diff --git a/src/ui/component/app/view.jsx b/src/ui/component/app/view.jsx
index e387f8bc8..938099c58 100644
--- a/src/ui/component/app/view.jsx
+++ b/src/ui/component/app/view.jsx
@@ -51,7 +51,7 @@ function App(props: Props) {
   }, [userId]);
 
   return (
-    <div className="main-wrapper" ref={appRef} onContextMenu={e => openContextMenu(e)}>
+    <div className={MAIN_WRAPPER_CLASS} ref={appRef} onContextMenu={e => openContextMenu(e)}>
       <Header />
 
       <div className="main-wrapper__inner">
diff --git a/src/ui/component/uriIndicator/view.jsx b/src/ui/component/uriIndicator/view.jsx
index 56d643e13..4a929ce6a 100644
--- a/src/ui/component/uriIndicator/view.jsx
+++ b/src/ui/component/uriIndicator/view.jsx
@@ -63,7 +63,7 @@ class UriIndicator extends React.PureComponent<Props> {
 
       return (
         <Button className="button--uri-indicator" navigate={channelLink}>
-          <Tooltip label={'test' || <ClaimPreview uri={channelLink} type="small" />}>{inner}</Tooltip>
+          <Tooltip label={<ClaimPreview uri={channelLink} type="small" />}>{inner}</Tooltip>
         </Button>
       );
     } else {
diff --git a/src/ui/scss/component/_claim-list.scss b/src/ui/scss/component/_claim-list.scss
index 3d59ab22c..3e6e8ed7f 100644
--- a/src/ui/scss/component/_claim-list.scss
+++ b/src/ui/scss/component/_claim-list.scss
@@ -186,12 +186,3 @@
   margin-right: auto;
   padding-right: var(--spacing-medium);
 }
-
-.claim-preview-tags {
-  margin-left: 0;
-
-  // change this
-  .tag {
-    max-width: 10rem;
-  }
-}
diff --git a/src/ui/scss/component/_navigation.scss b/src/ui/scss/component/_navigation.scss
index 50bcc11a2..96c11292c 100644
--- a/src/ui/scss/component/_navigation.scss
+++ b/src/ui/scss/component/_navigation.scss
@@ -1,10 +1,3 @@
-.navigation-wrapper {
-  // width: var(--side-nav-width);
-  // left: calc(100% - var(--side-nav-width));
-  // height: 100%;
-  // position: absolute;
-}
-
 .navigation {
   width: var(--side-nav-width);
   font-size: 1.4rem;
diff --git a/src/ui/util/query-params.js b/src/ui/util/query-params.js
index e8c85ae92..e14b0282b 100644
--- a/src/ui/util/query-params.js
+++ b/src/ui/util/query-params.js
@@ -27,6 +27,7 @@ export function toQueryString(params) {
   return parts.join('&');
 }
 
+// https://stackoverflow.com/questions/5999118/how-can-i-add-or-update-a-query-string-parameter
 export function updateQueryParam(uri, key, value) {
   const re = new RegExp('([?&])' + key + '=.*?(&|$)', 'i');
   const separator = uri.indexOf('?') !== -1 ? '&' : '?';