diff --git a/package.json b/package.json
index 4323306..af0c06f 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "deploy": "./deploy.sh"
   },
   "dependencies": {
-    "gatsby": "^1.9.253",
+    "gatsby": "^1.9.254",
     "gatsby-link": "^1.6.41",
     "gatsby-plugin-google-analytics": "^1.0.31",
     "gatsby-plugin-react-helmet": "^2.0.11",
@@ -21,7 +21,7 @@
     "gatsby-plugin-remove-trailing-slashes": "^1.0.9",
     "gatsby-plugin-sass": "^1.0.26",
     "gatsby-plugin-svgr": "^1.0.0",
-    "gatsby-source-filesystem": "^1.5.33",
+    "gatsby-source-filesystem": "^1.5.34",
     "gatsby-transformer-json": "^1.0.16",
     "react-helmet": "^5.2.0",
     "react-markdown": "^3.3.0",
diff --git a/src/layouts/index.js b/src/layouts/index.js
index d0f480f..41f9919 100644
--- a/src/layouts/index.js
+++ b/src/layouts/index.js
@@ -28,16 +28,18 @@ const TemplateWrapper = ({ data, location, children }) => {
       <Head meta={meta} location={location} />
       <Header meta={meta} isHomepage={isHomepage} />
 
-      <TransitionGroup appear={true}>
-        <FadeIn
-          key={location.pathname}
-          timeout={{ enter: 300, exit: 200, appear: 300 }}
-        >
-          <TransitionHandler location={location}>
-            {children()}
-          </TransitionHandler>
-        </FadeIn>
-      </TransitionGroup>
+      <main className="screen">
+        <TransitionGroup appear={true}>
+          <FadeIn
+            key={location.pathname}
+            timeout={{ enter: 300, exit: 200, appear: 300 }}
+          >
+            <TransitionHandler location={location}>
+              {children()}
+            </TransitionHandler>
+          </FadeIn>
+        </TransitionGroup>
+      </main>
 
       <Footer meta={meta} />
     </div>
diff --git a/src/pages/404.js b/src/pages/404.js
index 36f4d07..5e58e85 100644
--- a/src/pages/404.js
+++ b/src/pages/404.js
@@ -1,9 +1,7 @@
 import React from 'react'
 
 const NotFound = () => (
-  <main className="screen screen--404">
-    <h1>Shenanigans, page not found.</h1>
-  </main>
+  <h1>Shenanigans, page not found.</h1>
 )
 
 export default NotFound
diff --git a/src/pages/index.js b/src/pages/index.js
index d5e34ad..e8843fa 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -3,9 +3,7 @@ import PropTypes from 'prop-types'
 import Projects from '../components/organisms/Projects'
 
 const Home = ({ data }) => (
-  <main className="screen screen--home">
-    <Projects data={data} />
-  </main>
+  <Projects data={data} />
 )
 
 Home.propTypes = {
diff --git a/src/templates/Project.js b/src/templates/Project.js
index 09e80e5..04790c4 100644
--- a/src/templates/Project.js
+++ b/src/templates/Project.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react'
+import React, { Component, Fragment } from 'react'
 import PropTypes from 'prop-types'
 import Helmet from 'react-helmet'
 import ReactMarkdown from 'react-markdown'
@@ -25,7 +25,7 @@ class Project extends Component {
     const { next, previous } = pathContext
 
     return (
-      <main className="screen screen--project">
+      <Fragment>
         <Helmet>
           <title>{title}</title>
         </Helmet>
@@ -61,7 +61,7 @@ class Project extends Component {
         </article>
 
         <ProjectNav previous={previous} next={next} />
-      </main>
+      </Fragment>
     )
   }
 }
