diff --git a/client/src/components/Header/index.js b/client/src/components/Header/index.js
index 6d5a5af357..2e6e683c69 100644
--- a/client/src/components/Header/index.js
+++ b/client/src/components/Header/index.js
@@ -11,7 +11,10 @@ import { Link } from '../helpers';
 
 import './header.css';
 
-import { toggleDisplaySideNav, toggleDisplayMenu } from '../layouts/redux';
+import {
+  toggleDisplaySideNav,
+  toggleDisplayMenu
+} from '../layouts/components/guide/redux';
 
 const mapStateToProps = state => {
   return {
@@ -45,7 +48,7 @@ class Header extends Component {
     console.log('header unmount');
   }
 
-  toggleDisplayMenu = () => {
+  toggleDisplayMenuLogic = () => {
     if (this.props.onGuide) {
       this.props.toggleDisplaySideNav();
     } else {
@@ -59,13 +62,13 @@ class Header extends Component {
       !this.menuButtonRef.current.contains(event.target) &&
       !this.props.onGuide
     ) {
-      toggleDisplayMenu();
+      this.toggleDisplayMenuLogic();
     }
   };
 
   handleMediaChange = matches => {
     if (!matches && this.props.displayMenu) {
-      toggleDisplayMenu();
+      this.toggleDisplayMenuLogic();
     }
   };
 
@@ -120,7 +123,7 @@ class Header extends Component {
           )}
           <span
             className='menu-button'
-            onClick={this.toggleDisplayMenu}
+            onClick={this.toggleDisplayMenuLogic}
             ref={this.menuButtonRef}
           >
             Menu
diff --git a/client/src/components/layouts/Default.js b/client/src/components/layouts/Default.js
index b5a2bf425b..534fd5a740 100644
--- a/client/src/components/layouts/Default.js
+++ b/client/src/components/layouts/Default.js
@@ -69,10 +69,10 @@ const propTypes = {
   isOnline: PropTypes.bool.isRequired,
   isSignedIn: PropTypes.bool,
   landingPage: PropTypes.bool,
+  onGuide: PropTypes.bool,
   onlineStatusChange: PropTypes.func.isRequired,
   removeFlashMessage: PropTypes.func.isRequired,
-  showFooter: PropTypes.bool,
-  onGuide: PropTypes.bool
+  showFooter: PropTypes.bool
 };
 
 const mapStateToProps = createSelector(
@@ -160,10 +160,7 @@ class DefaultLayout extends Component {
         >
           <style>{fontawesome.dom.css()}</style>
         </Helmet>
-        <Header
-          disableSettings={disableSettings}
-          onGuide={onGuide}
-        />
+        <Header disableSettings={disableSettings} onGuide={onGuide} />
         <div className={`default-layout ${landingPage ? 'landing-page' : ''}`}>
           <OfflineWarning isOnline={isOnline} isSignedIn={isSignedIn} />
           {hasMessages ? (
diff --git a/client/src/components/layouts/Guide.js b/client/src/components/layouts/Guide.js
index 1dbd2e64cc..5678073e58 100644
--- a/client/src/components/layouts/Guide.js
+++ b/client/src/components/layouts/Guide.js
@@ -11,7 +11,10 @@ import Spacer from '../helpers/Spacer';
 import 'prismjs/themes/prism.css';
 import './guide.css';
 
-import { toggleExpandedState, toggleDisplaySideNav } from './redux';
+import {
+  toggleExpandedState,
+  toggleDisplaySideNav
+} from './components/guide/redux';
 
 const propTypes = {
   children: PropTypes.any,
diff --git a/client/src/components/layouts/redux/index.js b/client/src/components/layouts/components/guide/redux/index.js
similarity index 94%
rename from client/src/components/layouts/redux/index.js
rename to client/src/components/layouts/components/guide/redux/index.js
index ad662dc018..3a050e2351 100644
--- a/client/src/components/layouts/redux/index.js
+++ b/client/src/components/layouts/components/guide/redux/index.js
@@ -1,6 +1,6 @@
 import { createAction, handleActions } from 'redux-actions';
 
-import { createTypes } from '../../../utils/createTypes';
+import { createTypes } from '../../../../../utils/createTypes';
 
 export const ns = 'guideNav';
 
diff --git a/client/src/redux/rootReducer.js b/client/src/redux/rootReducer.js
index 80015534f8..b0194993c1 100644
--- a/client/src/redux/rootReducer.js
+++ b/client/src/redux/rootReducer.js
@@ -9,7 +9,7 @@ import {
 import {
   reducer as guideNav,
   ns as guideNavNameSpace
-} from '../components/layouts/redux';
+} from '../components/layouts/components/guide/redux';
 import { reducer as settings, ns as settingsNameSpace } from './settings';
 import {
   reducer as curriculumMap,