diff --git a/gatsby-browser.js b/gatsby-browser.js
index 3106bf8..2f3892a 100644
--- a/gatsby-browser.js
+++ b/gatsby-browser.js
@@ -1,6 +1,4 @@
-exports.onInitialClientRender = () => {
-  require('./src/styles/base.scss')
-}
+require('./src/styles/base.scss')
 
 exports.onClientEntry = () => {
   // IntersectionObserver polyfill for gatsby-image (Safari, IE)
diff --git a/gatsby-node.js b/gatsby-node.js
index a56ca8e..69284ab 100644
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -1,25 +1,5 @@
 const path = require('path')
 
-// Intersection Observer polyfill
-// requires `npm install intersection-observer`
-// https://github.com/gatsbyjs/gatsby/issues/2288#issuecomment-334467821
-// exports.onCreateWebpackConfig = ({ actions, loaders, stage }) => {
-//   const { setWebpackConfig } = actions
-
-//   if (stage === 'build-html') {
-//     const nullRule = {
-//       test: /intersection-observer/,
-//       use: [loaders.null()]
-//     }
-
-//     setWebpackConfig({
-//       module: {
-//         rules: [nullRule]
-//       }
-//     })
-//   }
-// }
-
 //
 // Create project pages from projects.yml
 //
diff --git a/package.json b/package.json
index a091028..bc9c78f 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "file-saver": "^1.3.8",
     "gatsby": "^2.0.0-beta.105",
-    "gatsby-image": "^2.0.0-beta.7",
+    "gatsby-image": "^2.0.0-beta.8",
     "gatsby-plugin-manifest": "^2.0.2-beta.6",
     "gatsby-plugin-matomo": "^0.5.0",
     "gatsby-plugin-offline": "^2.0.0-beta.9",
diff --git a/src/components/Layout.jsx b/src/components/Layout.jsx
index 2d9e2f7..35ec8b2 100644
--- a/src/components/Layout.jsx
+++ b/src/components/Layout.jsx
@@ -7,8 +7,6 @@ import Footer from './organisms/Footer'
 import styles from './Layout.module.scss'
 
 const Layout = ({ children, location }) => {
-  const isHomepage = location.pathname === '/'
-
   return (
     <StaticQuery
       query={graphql`
@@ -54,6 +52,7 @@ const Layout = ({ children, location }) => {
       `}
       render={data => {
         const meta = data.dataYaml
+        const isHomepage = location.pathname === '/'
 
         return (
           <Fragment>
diff --git a/src/components/molecules/Availability.jsx b/src/components/molecules/Availability.jsx
index 7295c4a..8023caf 100644
--- a/src/components/molecules/Availability.jsx
+++ b/src/components/molecules/Availability.jsx
@@ -35,7 +35,7 @@ class Availability extends PureComponent {
                     className={
                       status
                         ? `${styles.availability} ${styles.available}`
-                        : `${styles.availability} ${styles.unavailable}`
+                        : `${styles.availability}`
                     }
                   >
                     <p
diff --git a/src/components/molecules/Availability.module.scss b/src/components/molecules/Availability.module.scss
index e032e1c..e298369 100644
--- a/src/components/molecules/Availability.module.scss
+++ b/src/components/molecules/Availability.module.scss
@@ -18,19 +18,19 @@
         margin-bottom: 0;
     }
 
-    &.available {
-        background: rgba($brand-light, .8);
-        color: $brand-main;
-        position: fixed;
-        bottom: $spacer;
-
-        :global(.dark) & {
-            background: rgba($body-background-color--dark, .8);
-            color: $brand-light;
-        }
-    }
-
     a {
         border-bottom: 1px solid rgba($brand-cyan, .4);
     }
 }
+
+.available {
+    background: rgba($brand-light, .8);
+    color: $brand-main;
+    position: fixed;
+    bottom: $spacer;
+
+    :global(.dark) & {
+        background: rgba($body-background-color--dark, .8);
+        color: $brand-light;
+    }
+}