Map window with GtkBox

diff --git a/src/mainWindow.js b/src/mainWindow.js
index 83ba6de..67a6e08 100644
--- a/src/mainWindow.js
+++ b/src/mainWindow.js
@@ -55,6 +55,7 @@ const MainWindow = new Lang.Class({
         let ui = Utils.getUIObject('main-window', [ 'app-window',
                                                     'header-bar',
                                                     'layers-button']);
+        overlay = new Gtk.Box({ orientation: Gtk.Orientation.HORIZONTAL });
         this.window = ui.appWindow;
         this.window.application = app;
         this._overlay = overlay;
@@ -62,12 +63,12 @@ const MainWindow = new Lang.Class({
         ui.appWindow.add(this._overlay);

         this.mapView = new MapView.MapView();
-        overlay.add(this.mapView);
+        overlay.pack_start(this.mapView, 1, 1, 0);

         this.mapView.gotoUserLocation(false);

         this._sidebar = new Sidebar.Sidebar(this.mapView);
-        overlay.add_overlay(this._sidebar);
+        overlay.pack_start(this._sidebar, 1, 1, 0);
         Application.routeService.route.connect('update',
                                                this._setRevealSidebar.bind(this, true));

@@ -83,7 +84,7 @@ const MainWindow = new Lang.Class({
         this._initSignals();
         this._restoreWindowGeometry();

-        this._overlay.add_overlay(new ZoomControl.ZoomControl(this.mapView));
+        //this._overlay.add_overlay(new ZoomControl.ZoomControl(this.mapView));
         this._overlay.show_all();
     },

diff --git a/src/mapBubble.js b/src/mapBubble.js
index 5ca0135..f747327 100644
--- a/src/mapBubble.js
+++ b/src/mapBubble.js
@@ -37,6 +37,8 @@ const MapBubble = new Lang.Class({
         params.relative_to = params.mapView;
         delete params.mapView;

+        params.modal = false;
+
         this.parent(params);
     },