diff --git a/src/kcmoduleqml.cpp b/src/kcmoduleqml.cpp
index 0dc4d14..89d146f 100644
--- a/src/kcmoduleqml.cpp
+++ b/src/kcmoduleqml.cpp
@@ -1,259 +1,276 @@
 /* This file is part of the KDE Project
    Copyright (c) 2014 Marco Martin <mart@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License version 2 as published by the Free Software Foundation.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #include "kcmoduleqml_p.h"
 
 #include <QDebug>
 
 #include <QVBoxLayout>
 #include <QtQml>
 #include <QQmlEngine>
 #include <QQmlContext>
 #include <QQuickWindow>
 #include <QQuickItem>
 #include <QGuiApplication>
 #include <QQuickWidget>
 
 #include <kdeclarative/kdeclarative.h>
 #include <kquickaddons/configmodule.h>
 #include <KAboutData>
 #include <KLocalizedString>
 #include <KPackage/Package>
 #include <KPackage/PackageLoader>
 
 class KCModuleQmlPrivate
 {
 public:
     KCModuleQmlPrivate(KQuickAddons::ConfigModule *cm)
         : quickWindow(nullptr),
           configModule(cm)
     {
         //ensure the engine is present, then ref it
         engine();
         engineRef = s_engine;
     }
 
     ~KCModuleQmlPrivate()
     {
         //when the only remaining are out two refs, reset the pointers, causing deletion
         //when the refcount is 2, we are sure that the only refs are s_engine and our copy
         //of engineRef
         if (engineRef.use_count() == 2) {
             s_engine.reset();
         }
     }
 
     static QQmlEngine *engine()
     {
         if (!s_engine) {
             s_engine = std::make_shared<QQmlEngine>();
             KDeclarative::KDeclarative::setupEngine(s_engine.get());
         }
         return s_engine.get();
     }
 
     QQuickWindow *quickWindow;
     QQuickWidget *quickWidget;
     QQuickItem *rootPlaceHolder;
     KQuickAddons::ConfigModule *configModule;
 
     //used to delete the engine
     std::shared_ptr<QQmlEngine> engineRef;
     static std::shared_ptr<QQmlEngine> s_engine;
 };
 
 std::shared_ptr<QQmlEngine> KCModuleQmlPrivate::s_engine = std::shared_ptr<QQmlEngine>();
 
 KCModuleQml::KCModuleQml(KQuickAddons::ConfigModule *configModule, QWidget* parent, const QVariantList& args)
     : KCModule(parent, args),
       d(new KCModuleQmlPrivate(configModule))
 {
 
     connect(configModule, &KQuickAddons::ConfigModule::quickHelpChanged,
             this, &KCModuleQml::quickHelpChanged);
     //HACK:Here is important those two enums keep having the exact same values
     //but the kdeclarative one can't use the KCModule's enum
     setButtons((KCModule::Buttons)(int)d->configModule->buttons());
     connect(configModule, &KQuickAddons::ConfigModule::buttonsChanged, [=] {
         setButtons((KCModule::Buttons)(int)d->configModule->buttons());
     });
 
     if (d->configModule->needsSave()) {
         emit changed(true);
     }
     connect(configModule, &KQuickAddons::ConfigModule::needsSaveChanged, [=] {
         emit changed(d->configModule->needsSave());
     });
 
     setNeedsAuthorization(d->configModule->needsAuthorization());
     connect(configModule, &KQuickAddons::ConfigModule::needsAuthorizationChanged, [=] {
         setNeedsAuthorization(d->configModule->needsAuthorization());
     });
 
     setRootOnlyMessage(d->configModule->rootOnlyMessage());
     setUseRootOnlyMessage(d->configModule->useRootOnlyMessage());
     connect(configModule, &KQuickAddons::ConfigModule::rootOnlyMessageChanged, [=] {
         setRootOnlyMessage(d->configModule->rootOnlyMessage());
     });
     connect(configModule, &KQuickAddons::ConfigModule::useRootOnlyMessageChanged, [=] {
         setUseRootOnlyMessage(d->configModule->useRootOnlyMessage());
     });
 
     if (!d->configModule->authActionName().isEmpty()) {
         setAuthAction(KAuth::Action(d->configModule->authActionName()));
     }
     connect(configModule, &KQuickAddons::ConfigModule::authActionNameChanged, [=] {
         setAuthAction(d->configModule->authActionName());
     });
     setFocusPolicy(Qt::StrongFocus);
 
 
 
     //Build the UI
     QVBoxLayout* layout = new QVBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
 
     d->quickWidget = new QQuickWidget(d->engine(), this);
     d->quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView);
     d->quickWidget->setFocusPolicy(Qt::StrongFocus);
     d->quickWidget->installEventFilter(this);
     d->quickWindow = d->quickWidget->quickWindow();
     d->quickWindow->setColor(QGuiApplication::palette().window().color());
     connect(qApp, &QGuiApplication::paletteChanged, d->quickWindow, [=]() {
         d->quickWindow->setColor(QGuiApplication::palette().window().color());
     });
 
     QQmlComponent *component = new QQmlComponent(d->quickWidget->engine(), this);
     //this has activeFocusOnTab to notice when the navigation wraps
     //around, so when we need to go outside and inside
     //pushPage/popPage are needed as push of StackView can't be directly invoked from c++
     //because its parameters are QQmlV4Function which is not public
-    component->setData(QByteArrayLiteral("import QtQuick 2.3\nimport org.kde.kirigami 2.4 as Kirigami\nKirigami.ApplicationItem{contentItem.anchors.topMargin: Kirigami.Units.gridUnit*2.2;header:Kirigami.ApplicationHeader{headerStyle:ApplicationHeaderStyle.Breadcrumb;backButtonEnabled:false;background.visible:false;maximumHeight: preferredHeight;preferredHeight:Math.round(Kirigami.Units.gridUnit*1.6);}\nfunction __pushPage(page){return pageStack.push(page)}\npageStack.defaultColumnWidth:width\npageStack.separatorVisible:false\nactiveFocusOnTab:true}"), QUrl());
+    component->setData(QByteArrayLiteral("import QtQuick 2.3\n"
+        "import org.kde.kirigami 2.4 as Kirigami\n"
+        "Kirigami.ApplicationItem{"
+            "function __pushPage(page){"
+                "return pageStack.push(page);"
+            "}\n"
+            "signal levelPushed(string title);"
+            "signal levelRemoved();"
+            "pageStack.onPagePushed:levelPushed(page.title);"
+            "pageStack.onPageRemoved:levelRemoved();"
+            "pageStack.defaultColumnWidth:width;"
+            "pageStack.separatorVisible:false;"
+            "pageStack.globalToolBar.style:Kirigami.ApplicationHeaderStyle.None;"
+            "activeFocusOnTab:true"
+        "}"), QUrl());
     d->rootPlaceHolder = qobject_cast<QQuickItem *>(component->create());
     d->quickWidget->setContent(QUrl(), component, d->rootPlaceHolder);
 
     QQmlEngine::setContextForObject(d->configModule, QQmlEngine::contextForObject(d->rootPlaceHolder));
 
+    connect(d->rootPlaceHolder, SIGNAL(levelPushed(QString)), this, SLOT(pushLevel(QString)));
+    connect(d->rootPlaceHolder, SIGNAL(levelRemoved()), this, SLOT(popLevel()));
+
     QMetaObject::invokeMethod(d->rootPlaceHolder, "__pushPage", Qt::DirectConnection, Q_ARG(QVariant, QVariant::fromValue(d->configModule->mainUi())));
 
     layout->addWidget(d->quickWidget);
 }
 
 KCModuleQml::~KCModuleQml()
 {
     delete d;
 }
 
 bool KCModuleQml::eventFilter(QObject* watched, QEvent* event)
 {
     //FIXME: those are all workarounds around the QQuickWidget brokeness
     //BUG https://bugreports.qt.io/browse/QTBUG-64561
     if (watched == d->quickWidget && event->type() == QEvent::KeyPress) {
         //allow tab navigation inside the qquickwidget
         QKeyEvent *ke = static_cast<QKeyEvent *>(event);
 
         QQuickItem *currentItem = d->quickWindow->activeFocusItem();
         if (!currentItem) {
             return KCModule::eventFilter(watched, event);
         }
         if (currentItem->scopedFocusItem()) {
             currentItem = currentItem->scopedFocusItem();
         }
 
         if (ke->key() == Qt::Key_Tab) {
             //nextItemInFocusChain will always return something, in the worst case will still be currentItem
             QQuickItem *nextItem = currentItem->nextItemInFocusChain(true);
             //when it arrives at the place holder item, go out of the qqw and
             //go to the other widgets around systemsettigns
             if (nextItem == d->rootPlaceHolder) {
                 QWidget *w = d->quickWidget->nextInFocusChain();
                 while (!(w->focusPolicy() & Qt::TabFocus)) {
                     w = w->nextInFocusChain();
                 }
                 w->setFocus(Qt::TabFocusReason);
             } else {
                 nextItem->forceActiveFocus(Qt::TabFocusReason);
             }
             return true;
         } else if (ke->key() == Qt::Key_Backtab
                    || (ke->key() == Qt::Key_Tab && (ke->modifiers() & Qt::ShiftModifier))) {
             QQuickItem *nextItem = currentItem->nextItemInFocusChain(false);
 
             if (nextItem == d->rootPlaceHolder) {
                 QWidget *w = d->quickWidget->previousInFocusChain();
                 while (!(w->focusPolicy() & Qt::TabFocus)) {
                     w = w->previousInFocusChain();
                 }
                 w->setFocus(Qt::BacktabFocusReason);
             } else {
                 nextItem->forceActiveFocus(Qt::BacktabFocusReason);
             }
             return true;
         }
     }
     return KCModule::eventFilter(watched, event);
 }
 
 void KCModuleQml::focusInEvent(QFocusEvent *event)
 {
     Q_UNUSED(event)
 
     if (event->reason() == Qt::TabFocusReason) {
         d->rootPlaceHolder->nextItemInFocusChain(true)->forceActiveFocus(Qt::TabFocusReason);
     } else if (event->reason() == Qt::BacktabFocusReason) {
         d->rootPlaceHolder->nextItemInFocusChain(false)->forceActiveFocus(Qt::BacktabFocusReason);
     }
     
 }
 
 QSize KCModuleQml::sizeHint() const
 {
     if (!d->configModule->mainUi()) {
         return QSize();
     }
 
     return QSize(d->configModule->mainUi()->implicitWidth(), d->configModule->mainUi()->implicitHeight());
 }
 
 QString KCModuleQml::quickHelp() const
 {
     return d->configModule->quickHelp();
 }
 
 const KAboutData *KCModuleQml::aboutData() const
 {
     return d->configModule->aboutData();
 }
 
 void KCModuleQml::load()
 {
     d->configModule->load();
 }
 
 void KCModuleQml::save()
 {
     d->configModule->save();
     d->configModule->setNeedsSave(false);
 }
 
 void KCModuleQml::defaults()
 {
     d->configModule->defaults();
 }
 
 #include "moc_kcmoduleqml_p.cpp"