diff --git a/client/less/map.less b/client/less/map.less
index 5f53c4ae9b..7176fcdecf 100644
--- a/client/less/map.less
+++ b/client/less/map.less
@@ -2,12 +2,6 @@
  * based off of https://github.com/gitterHQ/sidecar
  * license: MIT
  */
-.map {
-  display: flex;
-  flex-direction: column;
-  max-height: 90vh;
-}
-
 .map-aside {
 
     z-index: 20000;
@@ -87,14 +81,17 @@
 }
 
 .map-fixed-header {
+  position: fixed;
   background: white;
+  width: 100%;
   z-index: 1;
-  flex: 1;
-  padding-bottom: 25px;
+  left: 0;
+  top: 0;
 }
 
 .map-accordion {
-  flex: 9;
+  position: absolute;
+  margin-top: 180px;
   overflow-y: auto;
 }
 
diff --git a/client/main.js b/client/main.js
index 9894049fc9..05fedb25f1 100644
--- a/client/main.js
+++ b/client/main.js
@@ -269,11 +269,15 @@ $(document).ready(function() {
     });
     if (lastChallenge.length) {
       lastChallenge = lastChallenge[lastChallenge.length - 1];
-      var scrollTo = $(lastChallenge).offset().top - 400;
-      $('.map-accordion').scrollTop(scrollTo);
+      var scrollTo = $(lastChallenge).offset().top - 380;
+      $('html, body, .map-accordion').scrollTop(scrollTo);
     }
   }
 
+  if (String(window.location).match(/\/map$/ig)) {
+    $('.text-center').css('top', '50px');
+  }
+
   // map
   $('#nav-map-btn').on('click', () => {
     if (!main.isMapAsideLoad) {
diff --git a/server/views/map/show.jade b/server/views/map/show.jade
index 7e39fd789b..3e932a99f7 100644
--- a/server/views/map/show.jade
+++ b/server/views/map/show.jade
@@ -1,7 +1,6 @@
 extends ../layout-wide
 block content
-      .map
-        .map-fixed-header.text-center
+        .text-center.map-fixed-header
             h1 Challenge Map
             p Required challenges are marked with a *
             .row