diff --git a/web/app.react.js b/web/app.react.js
--- a/web/app.react.js
+++ b/web/app.react.js
@@ -53,6 +53,7 @@
 import './typography.css';
 import css from './style.css';
 import getTitle from './title/getTitle';
+import Topbar from './topbar/topbar.react';
 import { type NavInfo } from './types/nav-types';
 import { canonicalURLFromReduxState, navInfoFromURL } from './url-utils';
 
@@ -232,6 +233,7 @@
         </header>
         <InputStateContainer>
           <div className={css['main-content-container']}>
+            <Topbar navInfo={this.props.navInfo} />
             <div className={css['main-content']}>{mainContent}</div>
           </div>
         </InputStateContainer>
diff --git a/web/calendar/filter-panel.css b/web/calendar/filter-panel.css
--- a/web/calendar/filter-panel.css
+++ b/web/calendar/filter-panel.css
@@ -1,7 +1,7 @@
 div.container {
   position: fixed;
   width: 300px;
-  top: 62px;
+  top: 126px;
   bottom: 0;
   background-attachment: fixed;
   display: flex;
diff --git a/web/style.css b/web/style.css
--- a/web/style.css
+++ b/web/style.css
@@ -97,6 +97,7 @@
   grid-area: app;
   display: flex;
   overflow: hidden;
+  flex-direction: column;
 }
 div.main-content {
   display: flex;