diff --git a/client/src/App.js b/client/src/App.js
index 91f0efaf0..09585a5aa 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -23,42 +23,44 @@ export const auth = new Auth(
   client
 )
 
-export const MasterApp = () => (
+export const MasterApp = (props) => (
   <BrowserRouter>
     <ApolloProvider client={client}>
       <MuiThemeProvider theme={theme}>
         <CssBaseline />
         <Header auth={auth} />
-        <Switch>
-          <Route exact path='/' component={Home} />
-          <Route
-            path='/callback'
-            render={props => {
-              auth.handleAuthentication(props)
-              return <Callback {...props} />
-            }}
+        <div className={props.classes.mainContainer}>
+          <Switch>
+            <Route exact path='/' component={Home} />
+            <Route
+              path='/callback'
+              render={props => {
+                auth.handleAuthentication(props)
+                return <Callback {...props} />
+              }}
             />
-          <Route
-            path='/charts'
-            render={props => <Charts {...props} auth={auth} />}
+            <Route
+              path='/charts'
+              render={props => <Charts {...props} auth={auth} />}
             />
-          <Route
-            path='/users'
-            render={props => <Users {...props} auth={auth} />}
+            <Route
+              path='/users'
+              render={props => <Users {...props} auth={auth} />}
             />
-          <Route
-            path='/teams'
-            render={props => <Teams {...props} auth={auth} />}
+            <Route
+              path='/teams'
+              render={props => <Teams {...props} auth={auth} />}
             />
-          <Route
-            path='/events'
-            render={props => <Events {...props} auth={auth} />}
+            <Route
+              path='/events'
+              render={props => <Events {...props} auth={auth} />}
             />
-          <Route
-            path='/key-vault'
-            render={props => <KeyVault {...props} auth={auth} />}
+            <Route
+              path='/key-vault'
+              render={props => <KeyVault {...props} auth={auth} />}
             />
-        </Switch>
+          </Switch>
+        </div>
         <Footer />
       </MuiThemeProvider>
     </ApolloProvider>
diff --git a/client/src/styles/index.js b/client/src/styles/index.js
index 272bbcf66..c28d01f4c 100644
--- a/client/src/styles/index.js
+++ b/client/src/styles/index.js
@@ -66,6 +66,9 @@ export const globalStyles = theme => ({
     [theme.breakpoints.up('sm')]: {
       paddingBottom: theme.spacing.unit * 2
     }
+  },
+  mainContainer: {
+    minHeight: 'calc(100vh - 420px)'
   }
 })