diff --git a/src/c3nav/site/static/site/css/c3nav.scss b/src/c3nav/site/static/site/css/c3nav.scss
index e4c444d3..0ed3c36c 100644
--- a/src/c3nav/site/static/site/css/c3nav.scss
+++ b/src/c3nav/site/static/site/css/c3nav.scss
@@ -750,7 +750,9 @@ main:not([data-view=route-result]) #route-dots {
             border-top-width: 1px;
         }
         .location {
-            margin-right: 12px;
+            margin-right: 24px;
+            padding-right: 0;
+            overflow: hidden;
         }
         .button-clear {
             display:block;
diff --git a/src/c3nav/site/static/site/js/c3nav.js b/src/c3nav/site/static/site/js/c3nav.js
index 9ee6c9ce..50d11bb3 100644
--- a/src/c3nav/site/static/site/js/c3nav.js
+++ b/src/c3nav/site/static/site/js/c3nav.js
@@ -1315,7 +1315,7 @@ c3nav = {
         }
     },
     _add_map_padding: function(options, topleft, bottomright) {
-        // add padding information for the current ui layout to fitBoudns options
+        // add padding information for the current ui layout to fitBounds options
         var $search = $('#search'),
             $main = $('main'),
             padBesideSidebar = (
@@ -1324,6 +1324,9 @@ c3nav = {
             ),
             left = padBesideSidebar ? ($search.width() || 0)+10 : 0,
             top = padBesideSidebar ? 10 : ($search.height() || 0)+10;
+        if ('maxWidth' in options) {
+            options.maxWidth = Math.min(options.maxWidth, $main.width()-left-13-50)
+        }
         options[topleft || 'paddingTopLeft'] = L.point(left+13, top+41);
         options[bottomright || 'paddingBottomRight'] = L.point(50, 20);
         return options;