diff --git a/tethys_layouts/static/tethys_layouts/map_layout/flat_map.css b/tethys_layouts/static/tethys_layouts/map_layout/flat_map.css
index 35fe6737e..f4e054ccc 100644
--- a/tethys_layouts/static/tethys_layouts/map_layout/flat_map.css
+++ b/tethys_layouts/static/tethys_layouts/map_layout/flat_map.css
@@ -64,13 +64,13 @@
 }
 
 .ol-zoom-extent {
-    top: 45px;
+    top: 2.75em;
     border-radius: 0;
 }
 
 .ol-zoom-extent button {
     border-radius: 0;
-    height: 2.15em;
+    height: 2.25em;
 }
 
 
diff --git a/tethys_layouts/static/tethys_layouts/map_layout/map_layout.css b/tethys_layouts/static/tethys_layouts/map_layout/map_layout.css
index 08195120b..2b7c7305c 100644
--- a/tethys_layouts/static/tethys_layouts/map_layout/map_layout.css
+++ b/tethys_layouts/static/tethys_layouts/map_layout/map_layout.css
@@ -10,8 +10,16 @@
     height: 100%;
 }
 
-#app-content-wrapper #app-content #app-navigation .nav {
+#app-content-wrapper #app-content #app-navigation {
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+}
+
+#app-content-wrapper #app-content #app-navigation .nav,
+#app-content-wrapper #app-content #app-navigation #nav-header {
     height: auto;
+    flex: 0 0 auto;
 }
 
 #inner-app-content {
@@ -26,14 +34,16 @@
 
 /* Map Tabs */
 .map-tabs {
-    height: calc(100% - 100px);
+    display: flex;
+    flex-direction: column;
+    flex: 1 1 auto;
+    min-height: 0;
 }
 
 .map-tabs .tab-content {
     overflow-y: auto;
-    max-height: 95%;
-    min-height: 90%;
-    height: auto;
+    flex: 1 1 auto;
+    min-height: 0;
 }
 
 /* Layer Selector */