diff --git a/package.json b/package.json
index 433dc50f1..a583a712d 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
     "lodash.defaultsdeep": "3.10.0",
     "lodash.merge": "3.3.2",
     "lodash.omit": "3.1.0",
+    "lodash.pickby": "^4.4.0",
     "lodash.range": "3.0.1",
     "minilog": "2.0.8",
     "node-sass": "3.3.3",
@@ -73,6 +74,7 @@
     "react-modal": "1.3.0",
     "react-onclickoutside": "4.1.1",
     "react-redux": "4.4.5",
+    "react-responsive": "^1.1.4",
     "react-slick": "0.12.2",
     "react-telephone-input": "3.4.5",
     "redux": "3.5.2",
diff --git a/src/components/footer/www/footer.jsx b/src/components/footer/www/footer.jsx
index 600e2dbd9..cd2689207 100644
--- a/src/components/footer/www/footer.jsx
+++ b/src/components/footer/www/footer.jsx
@@ -3,6 +3,7 @@ var FormattedMessage = require('react-intl').FormattedMessage;
 
 var FooterBox = require('../container/footer.jsx');
 var LanguageChooser = require('../../languagechooser/languagechooser.jsx');
+var MediaQuery = require('react-responsive');
 
 require('./footer.scss');
 
@@ -11,7 +12,7 @@ var Footer = React.createClass({
     render: function () {
         return (
             <FooterBox>
-                {this.props.layout == 'COLS4' || this.props.layout == 'COLS6' ? [
+                <MediaQuery maxWidth={639}>
                     <div className="lists">
                         <dl>
                             <dd>
@@ -48,7 +49,8 @@ var Footer = React.createClass({
                             </dd>
                         </dl>
                     </div>
-                ] : [
+                </MediaQuery>
+                <MediaQuery minWidth={640}>
                     <div className="lists">
                         <dl>
                             <dt>
@@ -199,7 +201,7 @@ var Footer = React.createClass({
                             </dd>
                         </dl>
                     </div>
-                ]}
+                </MediaQuery>
                 <LanguageChooser />
 
                 <div className="copyright">
diff --git a/src/components/navigation/www/navigation.jsx b/src/components/navigation/www/navigation.jsx
index ce2888ab1..32fbe3587 100644
--- a/src/components/navigation/www/navigation.jsx
+++ b/src/components/navigation/www/navigation.jsx
@@ -17,6 +17,7 @@ var Login = require('../../login/login.jsx');
 var Modal = require('../../modal/modal.jsx');
 var NavigationBox = require('../container/navigation.jsx');
 var Registration = require('../../registration/registration.jsx');
+var MediaQuery = require('react-responsive');
 
 require('./navigation.scss');
 
@@ -248,8 +249,9 @@ var Navigation = React.createClass({
                                 <a className={dropdownClasses}
                                     href="#" onClick={this.handleAccountNavClick}>
                                     <Avatar src={this.props.session.session.user.thumbnailUrl} alt="" />
-                                    {this.props.layout == 'COLS8' || this.props.layout == 'COLS12' ?
-                                        this.props.session.session.user.username : ''}
+                                    <MediaQuery minWidth={640} component='span'>
+                                        {this.props.session.session.user.username}
+                                    </MediaQuery>
                                 </a>
                                 <Dropdown
                                         as="ul"
diff --git a/src/components/page/www/page.jsx b/src/components/page/www/page.jsx
index 2f482c61a..6c0282a67 100644
--- a/src/components/page/www/page.jsx
+++ b/src/components/page/www/page.jsx
@@ -1,5 +1,4 @@
 var React = require('react');
-var connect = require('react-redux').connect;
 var classNames = require('classnames');
 
 var Navigation = require('../../navigation/www/navigation.jsx');
@@ -14,24 +13,17 @@ var Page = React.createClass({
         return (
             <div className="page">
                 <div id="navigation" className={classes}>
-                    <Navigation layout={this.props.layout}/>
+                    <Navigation/>
                 </div>
                 <div id="view">
                     {this.props.children}
                 </div>
                 <div id="footer">
-                    <Footer layout={this.props.layout}/>
+                    <Footer/>
                 </div>
             </div>
         );
     }
 });
 
-var mapStateToProps = function (state) {
-    return {
-        layout: state.layout
-    };
-};
-
-var ConnectedPage = connect(mapStateToProps)(Page);
-module.exports = ConnectedPage;
+module.exports = Page;
diff --git a/src/redux/reducer.js b/src/redux/reducer.js
index e54baf0dc..7824793b0 100644
--- a/src/redux/reducer.js
+++ b/src/redux/reducer.js
@@ -5,12 +5,11 @@ var detailsReducer = require('./conference-details.js').detailsReducer;
 var permissionsReducer = require('./permissions.js').permissionsReducer;
 var sessionReducer = require('./session.js').sessionReducer;
 var tokenReducer = require('./token.js').tokenReducer;
-var layout = require('./layout.js');
+// var layout = require('./layout.js');
 
 var appReducer = combineReducers({
     session: sessionReducer,
     token: tokenReducer,
-    layout: layout,
     permissions: permissionsReducer,
     conferenceSchedule: scheduleReducer,
     conferenceDetails: detailsReducer
diff --git a/src/views/splash/splash.jsx b/src/views/splash/splash.jsx
index 368b03396..574e4af35 100644
--- a/src/views/splash/splash.jsx
+++ b/src/views/splash/splash.jsx
@@ -6,7 +6,6 @@ var React = require('react');
 var api = require('../../lib/api');
 var render = require('../../lib/render.jsx');
 var sessionActions = require('../../redux/session.js');
-var layout = require('../../redux/layout.js');
 var shuffle = require('../../lib/shuffle.js').shuffle;
 
 var Activity = require('../../components/activity/activity.jsx');
@@ -43,12 +42,6 @@ var Splash = injectIntl(React.createClass({
             permissions: {}
         };
     },
-    componentWillMount: function () {
-        this.props.dispatch(layout.getLayout());
-        for (var query in layout.mediaQueries) {
-            layout.mediaQueries[query].addListener(this.onResize);
-        }
-    },
     componentDidUpdate: function (prevProps) {
         if (this.props.session.session.user != prevProps.session.session.user) {
             if (this.props.session.session.user) {
@@ -94,9 +87,6 @@ var Splash = injectIntl(React.createClass({
             }
         }
     },
-    onResize: function () {
-        this.props.dispatch(layout.getLayout());
-    },
     getActivity: function () {
         api({
             uri: '/proxy/users/' + this.props.session.session.user.username + '/activity?limit=5'
@@ -449,8 +439,7 @@ var Splash = injectIntl(React.createClass({
 var mapStateToProps = function (state) {
     return {
         session: state.session,
-        permissions: state.permissions,
-        layout: state.layout
+        permissions: state.permissions
     };
 };
 
diff --git a/src/views/splash/splash.scss b/src/views/splash/splash.scss
index 9739992cf..841b2c73a 100644
--- a/src/views/splash/splash.scss
+++ b/src/views/splash/splash.scss
@@ -65,8 +65,17 @@
 
             .box {
                 width: $cols6;
-                white-space: normal;
             }
         }
     }
 }
+
+//6 columns
+@media only screen and (min-width: $tablet) and (max-width: $desktop - 1) {
+    .splash {
+        .splash-header {
+            margin: 0 auto;
+            width: $cols8;
+        }
+    }
+}