diff --git a/src/App.scss b/src/App.scss
index db87cc4b..3b4d6e26 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -127,7 +127,7 @@ nav {
   box-shadow: var(--topBarShadow);
   box-sizing: border-box;
   height: var(--navbar-height);
-  position: fixed;
+  position: relative;
 }
 
 #sidebar {
@@ -135,7 +135,7 @@ nav {
 }
 
 .column.-scrollable {
-  top: var(--navbar-height);
+  top: 0;
   position: sticky;
 }
 
@@ -297,7 +297,7 @@ nav {
       margin-left: 0;
       margin-right: 0;
       padding-top: 0;
-      margin-top: var(--navbar-height);
+      margin-top: 0;
       margin-bottom: 0;
     }
 
diff --git a/src/components/timeline/timeline.scss b/src/components/timeline/timeline.scss
index 9e009fd3..d39feac8 100644
--- a/src/components/timeline/timeline.scss
+++ b/src/components/timeline/timeline.scss
@@ -23,6 +23,7 @@
 
     .timeline-heading {
       .button-default, .alert {
+	position: sticky;
         line-height: 2em;
         width: 100%;
       }
diff --git a/src/panel.scss b/src/panel.scss
index 3a814269..25a60601 100644
--- a/src/panel.scss
+++ b/src/panel.scss
@@ -81,7 +81,7 @@
 
   &.-sticky {
     position: sticky;
-    top: var(--navbar-height);
+    top: 0;
   }
 
   &::after,