diff --git a/src/ui/component/app/view.jsx b/src/ui/component/app/view.jsx
index 938099c58..e387f8bc8 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_CLASS} ref={appRef} onContextMenu={e => openContextMenu(e)}>
+    <div className="main-wrapper" ref={appRef} onContextMenu={e => openContextMenu(e)}>
       <Header />
 
       <div className="main-wrapper__inner">
diff --git a/src/ui/component/router/index.js b/src/ui/component/router/index.js
index 24e323e83..11f9ee843 100644
--- a/src/ui/component/router/index.js
+++ b/src/ui/component/router/index.js
@@ -1,18 +1,9 @@
 import { connect } from 'react-redux';
-<<<<<<< HEAD
 import { selectScrollStartingPosition } from 'redux/selectors/app';
 import Router from './view';
 
 const select = state => ({
   currentScroll: selectScrollStartingPosition(state),
-=======
-import Router from './view';
-
-const select = state => ({
-  scroll: state.app.scrollHistory[state.app.scrollHistory.length - 1],
-  scrollHistory: state.app.scrollHistory,
-  currentScroll: state.app.currentScroll || 0,
->>>>>>> restore that shit
 });
 
 export default connect(select)(Router);
diff --git a/src/ui/component/router/view.jsx b/src/ui/component/router/view.jsx
index 71accfa97..13f6b3872 100644
--- a/src/ui/component/router/view.jsx
+++ b/src/ui/component/router/view.jsx
@@ -22,11 +22,7 @@ import NavigationHistory from 'page/navigationHistory';
 import TagsPage from 'page/tags';
 import FollowingPage from 'page/following';
 
-<<<<<<< HEAD
 // Tell the browser we are handling scroll restoration
-=======
-// Let app handle scroll
->>>>>>> restore that shit
 if ('scrollRestoration' in history) {
   history.scrollRestoration = 'manual';
 }
diff --git a/src/ui/component/splash/view.jsx b/src/ui/component/splash/view.jsx
index 826ff8c46..29a338793 100644
--- a/src/ui/component/splash/view.jsx
+++ b/src/ui/component/splash/view.jsx
@@ -52,6 +52,8 @@ export default class SplashScreen extends React.PureComponent<Props, State> {
   }
 
   componentDidMount() {
+    this.props.onReadyToLaunch();
+
     const { checkDaemonVersion } = this.props;
     this.adjustErrorTimeout();
     Lbry.connect()
diff --git a/src/ui/redux/reducers/app.js b/src/ui/redux/reducers/app.js
index 250f46bb1..bea508dcf 100644
--- a/src/ui/redux/reducers/app.js
+++ b/src/ui/redux/reducers/app.js
@@ -67,11 +67,8 @@ const defaultState: AppState = {
   scrollHistory: [0],
 };
 
-<<<<<<< HEAD
 // @@router comes from react-router
 // This action is dispatched any time a user navigates forward or back
-=======
->>>>>>> restore that shit
 reducers['@@router/LOCATION_CHANGE'] = (state, action) => {
   const { currentScroll } = state;
   const scrollHistory = state.scrollHistory.slice();
diff --git a/src/ui/scss/component/_claim-list.scss b/src/ui/scss/component/_claim-list.scss
index 3e6e8ed7f..3d59ab22c 100644
--- a/src/ui/scss/component/_claim-list.scss
+++ b/src/ui/scss/component/_claim-list.scss
@@ -186,3 +186,12 @@
   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/_main.scss b/src/ui/scss/component/_main.scss
index 7c0262f20..fd334b8b0 100644
--- a/src/ui/scss/component/_main.scss
+++ b/src/ui/scss/component/_main.scss
@@ -11,8 +11,6 @@
   max-width: 1200px;
   margin-left: auto;
   margin-right: auto;
-  padding-left: var(--spacing-large);
-  padding-right: var(--spacing-large);
   padding-bottom: var(--spacing-main-padding);
 }
 
diff --git a/src/ui/scss/component/_navigation.scss b/src/ui/scss/component/_navigation.scss
index 96c11292c..50bcc11a2 100644
--- a/src/ui/scss/component/_navigation.scss
+++ b/src/ui/scss/component/_navigation.scss
@@ -1,3 +1,10 @@
+.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 e14b0282b..e8c85ae92 100644
--- a/src/ui/util/query-params.js
+++ b/src/ui/util/query-params.js
@@ -27,7 +27,6 @@ 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 ? '&' : '?';