diff --git a/nymea-app/ui/MainMenu.qml b/nymea-app/ui/MainMenu.qml
index 326a00ac..ce643e5c 100644
--- a/nymea-app/ui/MainMenu.qml
+++ b/nymea-app/ui/MainMenu.qml
@@ -8,6 +8,7 @@ import NymeaApp.Utils 1.0
 
 Drawer {
     id: root
+    dragMargin: 4
 
     property ConfiguredHostsModel configuredHosts: null
     readonly property Engine currentEngine: configuredHosts.count > 0 ? configuredHosts.get(configuredHosts.currentIndex).engine : null
diff --git a/nymea-app/ui/MainPage.qml b/nymea-app/ui/MainPage.qml
index 369f9754..6598a4ab 100644
--- a/nymea-app/ui/MainPage.qml
+++ b/nymea-app/ui/MainPage.qml
@@ -118,7 +118,7 @@ Page {
                 }
             }
             Repeater {
-                model: swipeView.currentItem.item.hasOwnProperty("headerButtons") ? swipeView.currentItem.item.headerButtons : 0
+                model: swipeView.currentItem != null && swipeView.currentItem.item.hasOwnProperty("headerButtons") ? swipeView.currentItem.item.headerButtons : 0
                 delegate: HeaderButton {
                     imageSource: swipeView.currentItem.item.headerButtons[index].iconSource
                     onClicked: swipeView.currentItem.item.headerButtons[index].trigger()
diff --git a/nymea-app/ui/mainviews/energy/PowerBalanceStats.qml b/nymea-app/ui/mainviews/energy/PowerBalanceStats.qml
index adc9ff1a..7164fa45 100644
--- a/nymea-app/ui/mainviews/energy/PowerBalanceStats.qml
+++ b/nymea-app/ui/mainviews/energy/PowerBalanceStats.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.3
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.2
-import QtCharts 2.3
+import QtCharts 2.2
 import Nymea 1.0
 import "qrc:/ui/components/"