diff --git a/src/components/NavigationItems.js b/src/components/NavigationItems.js
index 8eb59b7cb..5fb14938b 100644
--- a/src/components/NavigationItems.js
+++ b/src/components/NavigationItems.js
@@ -1,4 +1,5 @@
 import React, { Fragment, useState, useContext, useEffect } from 'react';
+import { css } from '@emotion/core';
 import usePrevious from '../hooks/usePrevious';
 import PropTypes from 'prop-types';
 import FeatherIcon from './FeatherIcon';
@@ -131,6 +132,14 @@ const NavItem = ({ page, depthLevel, searchTerm, filteredPageNames }) => {
       key={page.displayName}
       data-depth={depthLevel}
       className={cx({ [styles.filterOn]: filteredPageNames })}
+      css={
+        depthLevel === 0 &&
+        css`
+          &:not(:last-child) {
+            margin-bottom: 2rem;
+          }
+        `
+      }
     >
       {page.url ? (
         <Link
diff --git a/src/components/NavigationItems.module.scss b/src/components/NavigationItems.module.scss
index 1c8600349..4fa67290a 100644
--- a/src/components/NavigationItems.module.scss
+++ b/src/components/NavigationItems.module.scss
@@ -25,7 +25,6 @@
 
   [data-depth='0'] > & {
     font-weight: 600;
-    padding: 1em 0;
   }
 }
 
diff --git a/src/components/Sidebar.js b/src/components/Sidebar.js
index 7b34ed2b5..944a1b1df 100644
--- a/src/components/Sidebar.js
+++ b/src/components/Sidebar.js
@@ -14,7 +14,7 @@ const Sidebar = ({ className }) => {
       data-swiftype-index={false}
       className={className}
       css={css`
-        padding: 2rem;
+        padding: 0 2rem 2rem;
         border-right: 1px solid var(--divider-color);
 
         @media screen and (max-width: 760px) {
@@ -23,32 +23,43 @@ const Sidebar = ({ className }) => {
         }
       `}
     >
-      <Link to="/">
-        <Logo
+      <div
+        css={css`
+          background: var(--primary-background-color);
+          position: sticky;
+          top: 0;
+          z-index: 10;
+          padding: 1rem 0;
+          margin-bottom: 1rem;
+        `}
+      >
+        <Link
           css={css`
-            width: 200px;
-
-            @media screen and (max-width: 760px) {
-              width: 160px;
-            }
+            display: block;
+            display: flex;
+            margin-bottom: 1rem;
           `}
+          to="/"
+        >
+          <Logo
+            css={css`
+              display: block;
+              width: 150px;
+
+              @media screen and (max-width: 760px) {
+                width: 160px;
+              }
+            `}
+          />
+        </Link>
+        <SearchInput
+          placeholder="Search developer docs"
+          onClear={() => setSearchTerm('')}
+          onChange={(e) => setSearchTerm(e.target.value)}
+          value={searchTerm}
         />
-      </Link>
-      <SearchInput
-        css={css`
-          margin: 1rem 0;
-        `}
-        placeholder="Search developer docs"
-        onClear={() => setSearchTerm('')}
-        onChange={(e) => setSearchTerm(e.target.value)}
-        value={searchTerm}
-      />
-      <Navigation
-        css={css`
-          margin-top: 1rem;
-        `}
-        searchTerm={searchTerm}
-      />
+      </div>
+      <Navigation searchTerm={searchTerm} />
     </aside>
   );
 };