diff --git a/frontend/app/components/Session_/Autoplay/Autoplay.js b/frontend/app/components/Session_/Autoplay/Autoplay.js
index ef501f3e6..6b5279cfe 100644
--- a/frontend/app/components/Session_/Autoplay/Autoplay.js
+++ b/frontend/app/components/Session_/Autoplay/Autoplay.js
@@ -24,7 +24,7 @@ function Autoplay(props) {
             name="sessionsLive"
             onChange={ props.toggleAutoplay }
             checked={ autoplay }
-            style={{ margin: '0 10px' }}
+            style={{ margin: '0px 10px 0px 12px'}}
           />
         }
         tooltip={'Autoplay'}
diff --git a/frontend/app/components/Session_/PlayerBlockHeader.js b/frontend/app/components/Session_/PlayerBlockHeader.js
index 9a14541b2..2d8d78059 100644
--- a/frontend/app/components/Session_/PlayerBlockHeader.js
+++ b/frontend/app/components/Session_/PlayerBlockHeader.js
@@ -55,11 +55,13 @@ export default class PlayerBlockHeader extends React.PureComponent {
 
   backHandler = () => {
     const { history, siteId, funnelPage } = this.props;
-    if (funnelPage) {
-      if (funnelPage.get('issueId')) {
-        history.push(withSiteId(funnelIssueRoute(funnelPage.get('funnelId'), funnelPage.get('issueId')), siteId))
+    const funnelId = funnelPage && funnelPage.get('funnelId');
+    const issueId = funnelPage && funnelPage.get('issueId');
+    if (funnelId || issueId) {
+      if (issueId) {
+        history.push(withSiteId(funnelIssueRoute(funnelId, issueId), siteId))
       } else
-        history.push(withSiteId(funnelRoute(funnelPage.get('funnelId')), siteId));
+        history.push(withSiteId(funnelRoute(funnelId), siteId));
     } else 
       history.push(withSiteId(SESSIONS_ROUTE), siteId);
   }
diff --git a/frontend/app/styles/semantic.css b/frontend/app/styles/semantic.css
index 69a8828b9..cf6034861 100644
--- a/frontend/app/styles/semantic.css
+++ b/frontend/app/styles/semantic.css
@@ -309,4 +309,8 @@
 
 a:hover {
   color: $teal;
+}
+
+.ui.toggle.checkbox {
+  min-height: 20px !important;
 }
\ No newline at end of file