diff --git a/src/components/Layout/Layout.js b/src/components/Layout/Layout.js
index 08ad6bc54..e1a6c9fff 100644
--- a/src/components/Layout/Layout.js
+++ b/src/components/Layout/Layout.js
@@ -39,11 +39,11 @@ class Layout extends React.Component {
         ) : null }
         <div className={ cx(styles.header, { fixed: this.props.fixed }) }>
           <div className={ styles.headerLeft }>
-            <Link to="/">{ store.team.name }</Link>
+            <Link to="/" className={ styles.team }>{ store.team.name }</Link>
+            <span className={ styles.title }>
+              { this.props.title && (<span>&nbsp;/&nbsp;</span>) }{ this.props.title }
+            </span>
           </div>
-          <Flex align="center" className={ styles.title }>
-            { this.props.title }
-          </Flex>
           <Flex direction="row" className={ styles.headerRight }>
             <Flex align="center" className={ styles.actions }>
               { this.props.actions }
diff --git a/src/components/Layout/Layout.scss b/src/components/Layout/Layout.scss
index 23ed3df5e..513d225cc 100644
--- a/src/components/Layout/Layout.scss
+++ b/src/components/Layout/Layout.scss
@@ -10,10 +10,9 @@
 
 .header {
   display: flex;
-  justify-content: space-around;
+  justify-content: space-between;
   align-items: center;
 
-  position: relative;
   padding: 0 20px;
 
   height: $headerHeight;
@@ -32,34 +31,32 @@
   }
 }
 
-.title {
-  a {
-    color: $textColor;
-  }
-}
-
 .headerLeft {
   display: flex;
   align-items: center;
 
-  position: absolute;
-  left: 20px;
-  top: 0;
-  bottom: 0;
-
-  a {
+  .team {
     font-family: 'Atlas Grotesk';
     font-weight: bold;
     color: $textColor;
     text-decoration: none;
     font-size: 16px;
   }
+
+  .title {
+    color: #ccc;
+
+    a {
+      color: #ccc;
+    }
+
+    a:hover {
+      color: $textColor;
+    }
+  }
 }
 
 .headerRight {
-  position: absolute;
-  right: 20px;
-  margin-top: -1px;
 }
 
 .content {