diff --git a/gui/components/MaterialButton.qml b/gui/components/MaterialButton.qml
index 8e90e94a7ecbfe57c9c063c89081a6cd15f9abef..ad1ca597ad76a738b101e02b8d474d6e8b842949 100644
--- a/gui/components/MaterialButton.qml
+++ b/gui/components/MaterialButton.qml
@@ -49,7 +49,7 @@ T.Button {
 
         radius: 4
         border.color: "black"
-        border.width: 1
+        border.width: 2
         color: !control.enabled ? control.Material.buttonDisabledColor : control.highlighted ? control.Material.highlightedButtonColor : Theme.buttonColor
 
         PaddedRectangle {
@@ -67,10 +67,13 @@ T.Button {
         // The layer is disabled when the button color is transparent so you can do
         // Material.background: "transparent" and get a proper flat button without needing
         // to set Material.elevation as well
-        layer.enabled: control.enabled && control.Material.buttonColor.a > 0
+        layer.enabled: true // control.enabled && control.Material.buttonColor.a > 0
+
+        /*
         layer.effect: ElevationEffect {
             elevation: control.Material.elevation
         }
+        */
 
         Ripple {
             clipRadius: 2
diff --git a/gui/components/NavigationDrawer.qml b/gui/components/NavigationDrawer.qml
index c0e467cdda9f2c11049237e56c753d44b4ab3b08..8e7db8e020d2ffacfb20b855309377bc76449b0a 100644
--- a/gui/components/NavigationDrawer.qml
+++ b/gui/components/NavigationDrawer.qml
@@ -7,8 +7,14 @@ import QtQuick.Window 2.0
 Rectangle {
     id: panel
 
-    function show() { open = true; }
-    function hide() { open = false; }
+    function show() {
+        open = true;
+        drawerOn = true;
+    }
+    function hide() {
+        open = false; 
+        drawerOn = false;
+    }
     function toggle() {
         open = open ? false : true;
         drawerOn = open;
@@ -93,6 +99,7 @@ Rectangle {
     function handleClick(mouse) {
         if ((_rightEdge && mouse.x < panel.x ) || mouse.x > panel.width) {
             open = false;
+            drawerOn = false;
         }
     }