diff --git a/web/react/components/admin_console/analytics.jsx b/web/react/components/admin_console/analytics.jsx
index 0a159d2e38..2a3070854a 100644
--- a/web/react/components/admin_console/analytics.jsx
+++ b/web/react/components/admin_console/analytics.jsx
@@ -75,10 +75,12 @@ export default class Analytics extends React.Component {
         }
 
         let loading = (
-            <FormattedMessage
-                id='admin.analytics.loading'
-                defaultMessage='Loading...'
-            />
+            <h5>
+                <FormattedMessage
+                    id='admin.analytics.loading'
+                    defaultMessage='Loading...'
+                />
+            </h5>
         );
 
         let firstRow;
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 005a822099..8fc3cd63d3 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -419,7 +419,7 @@ export default class ChannelHeader extends React.Component {
                                         </ul>
                                     </div>
                                     <OverlayTrigger
-                                        trigger={['hover', 'focus']}
+                                        trigger={'click'}
                                         placement='bottom'
                                         overlay={popoverContent}
                                         ref='headerOverlay'
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 04ba9c51e9..6443846e11 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -12,37 +12,37 @@ body {
   width: 100%;
   height: 100%;
   &.white {
-      background: #fff;
-      > .container-fluid {
-          overflow: auto;
-      }
-      .inner__wrap {
-          > .row.content {
-              min-height: 100%;
-              margin-bottom: -89px;
-          }
+    background: #fff;
+    > .container-fluid {
+      overflow: auto;
+    }
+    .inner__wrap {
+      > .row.content {
+        min-height: 100%;
+        margin-bottom: -89px;
       }
+    }
   }
 }
 
 .inner__wrap {
+  height: 100%;
+  > .row.main {
     height: 100%;
-    > .row.main {
-        height: 100%;
-        position: relative;
-    }
+    position: relative;
+  }
 }
 
 .container-fluid {
-    @include legacy-pie-clearfix;
-    height: 100%;
-    position: relative;
+  @include legacy-pie-clearfix;
+  height: 100%;
+  position: relative;
 }
 
 .channel-view {
-    @include clearfix;
-    height: 100%;
-    position: relative;
+  @include clearfix;
+  height: 100%;
+  position: relative;
 }
 
 img {
@@ -65,7 +65,9 @@ img {
     background: rgba(black, 0.05);
   }
   .popover-content {
-    white-space: pre-wrap;
+    p:last-child {
+      margin-bottom: 5px;
+    }
   }
 }
 
@@ -105,8 +107,8 @@ a:focus, a:hover {
 }
 
 .nopadding {
- padding: 0;
- margin: 0;
+  padding: 0;
+  margin: 0;
 }
 
 .text-danger, a.text-danger {
diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss
index 4a4de5c3b1..93cb04198b 100644
--- a/web/sass-files/sass/partials/_headers.scss
+++ b/web/sass-files/sass/partials/_headers.scss
@@ -298,8 +298,13 @@
 	height: 30px;
 	width: 24px;
 	line-height: 26px;
-	margin-right: 10px;
+	margin-right: 9px;
 	font-size: 22px;
+	.channel__wrap.move--left & {
+		position: absolute;
+		right: -400px;
+		top: 14px;
+	}
 	> a {
 		color: inherit;
 		text-decoration: none;
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 77b66a1a8a..aba58eed64 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -283,8 +283,8 @@ body.ios {
 	width: 40px;
 	height: 40px;
 	position: absolute;
-	bottom: 50px;
-	right: 5px;
+	bottom: 0;
+	left: 10px;
 	z-index: 50;
 	@include opacity(0);
 	@include single-transition(all, 0.3s);
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 832481cc5b..09d498a691 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -60,6 +60,11 @@
 
         &.move--left {
             @include translateX(0);
+
+            .search-bar__container {
+                padding-right: 8px;
+            }
+
         }
 
     }
@@ -68,6 +73,13 @@
 
         &.move--left {
             margin-right: 0;
+
+            .channel-header__links {
+                position: relative;
+                right: auto;
+                top: auto;
+            }
+
         }
 
     }
diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss
index 693c59a31e..aa398e9160 100644
--- a/web/sass-files/sass/partials/_search.scss
+++ b/web/sass-files/sass/partials/_search.scss
@@ -1,11 +1,14 @@
 @charset "UTF-8";
 
 #channel-header .search-bar__container {
-	padding: 0 8px 0 3px;
+	padding: 0 9px 0 3px;
 }
 .search-bar__container {
 	padding: 12px 8px 0 0;
 	@include flex(0 0 56px);
+	.sidebar--right.move--left & {
+		padding-right: 42px;
+	}
 }
 .search__clear {
 	display: none;