diff --git a/src/pages/404.js b/src/pages/404.js
index 22e35f8d44..380e49faaa 100644
--- a/src/pages/404.js
+++ b/src/pages/404.js
@@ -1,11 +1,11 @@
-import React from 'react'
-import Layout from '../components/layout'
+import React from 'react';
+import Layout from '../components/Layout';
 
 const NotFoundPage = () => (
   <Layout>
     <h1>NOT FOUND</h1>
     <p>You just hit a route that doesn&#39;t exist... the sadness.</p>
   </Layout>
-)
+);
 
-export default NotFoundPage
+export default NotFoundPage;
diff --git a/src/pages/accept-privacy-terms.js b/src/pages/accept-privacy-terms.js
index c741ab970f..c733df5214 100644
--- a/src/pages/accept-privacy-terms.js
+++ b/src/pages/accept-privacy-terms.js
@@ -13,7 +13,7 @@ import {
 } from 'react-bootstrap';
 import Helmet from 'react-helmet';
 
-import Layout from '../components/layout';
+import Layout from '../components/Layout';
 import { ButtonSpacer, Spacer } from '../components/helpers';
 import { acceptTerms, userSelector } from '../redux';
 import { createSelector } from 'reselect';
diff --git a/src/pages/index.js b/src/pages/index.js
index 607c5d5187..b54fb84de0 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -12,7 +12,7 @@ import {
 import { faDatabase } from '@fortawesome/free-solid-svg-icons';
 
 import { Spacer } from '../components/helpers';
-import Layout from '../components/layout';
+import Layout from '../components/Layout';
 import Login from '../components/Header/components/Login';
 
 import './index.css';
@@ -27,6 +27,8 @@ const BigCallToAction = () => (
 
 const IndexPage = () => (
   <Layout disableSettings={true}>
+    <Spacer />
+    <Spacer />
     <Grid className='text-center'>
       <Row>
         <h1 className='big-heading'>Learn to code for free.</h1>
diff --git a/src/pages/welcome.js b/src/pages/welcome.js
index 3744364b75..5353faec06 100644
--- a/src/pages/welcome.js
+++ b/src/pages/welcome.js
@@ -7,7 +7,7 @@ import { createSelector } from 'reselect';
 import { Grid, Row, Col, Button } from 'react-bootstrap';
 
 import { Loader, Spacer } from '../components/helpers';
-import Layout from '../components/layout';
+import Layout from '../components/Layout';
 import { userSelector, userFetchStateSelector } from '../redux';
 import { randomQuote } from '../utils/get-words';
 
@@ -38,6 +38,7 @@ const mapDispatchToProps = dispatch => bindActionCreators({}, dispatch);
 
 function Welcome({
   fetchState: { pending, complete },
+  fetchState,
   user: {
     acceptedPrivacyTerms,
     name = '',
@@ -47,6 +48,7 @@ function Welcome({
     completedLegacyCertCount = 0
   }
 }) {
+  console.log(fetchState);
   if (pending && !complete) {
     return (
       <Layout>