diff --git a/org.kde.desktop/Menu.qml b/org.kde.desktop/Menu.qml
index b50fe41..3320086 100644
--- a/org.kde.desktop/Menu.qml
+++ b/org.kde.desktop/Menu.qml
@@ -1,87 +1,80 @@
 /*
  * Copyright 2017 Marco Martin <mart@kde.org>
  * Copyright 2017 The Qt Company Ltd.
  *
  * GNU Lesser General Public License Usage
  * Alternatively, this file may be used under the terms of the GNU Lesser
  * General Public License version 3 as published by the Free Software
  * Foundation and appearing in the file LICENSE.LGPLv3 included in the
  * packaging of this file. Please review the following information to
  * ensure the GNU Lesser General Public License version 3 requirements
  * will be met: https://www.gnu.org/licenses/lgpl.html.
  *
  * GNU General Public License Usage
  * Alternatively, this file may be used under the terms of the GNU
  * General Public License version 2.0 or later as published by the Free
  * Software Foundation and appearing in the file LICENSE.GPL included in
  * the packaging of this file. Please review the following information to
  * ensure the GNU General Public License version 2.0 requirements will be
  * met: http://www.gnu.org/licenses/gpl-2.0.html.
  */
 
 
 import QtQuick 2.6
+import QtQuick.Layouts 1.2
 import QtGraphicalEffects 1.0
 import QtQuick.Controls 2.0
 import QtQuick.Templates 2.0 as T
 import org.kde.kirigami 2.2 as Kirigami
 
 T.Menu {
     id: control
 
     implicitWidth: Math.max(background ? background.implicitWidth : 0,
                             contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0)
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
                              contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding
 
     margins: 0
 
-    contentItem: ListView {
-        implicitHeight: contentHeight
-        model: control.contentModel
-        clip: true
-        keyNavigationWraps: false
-        currentIndex: -1
-
-        //ScrollBar.vertical: ScrollBar {}
-    }
+    contentItem: ColumnLayout {}
 
     enter: Transition {
         NumberAnimation {
             property: "opacity"
             from: 0
             to: 1
             easing.type: Easing.InOutQuad
             duration: 150
         }
     }
 
     exit: Transition {
         NumberAnimation {
             property: "opacity"
             from: 1
             to: 0
             easing.type: Easing.InOutQuad
             duration: 150
         }
     }
 
     background: Rectangle {
         radius: 2
-        implicitWidth: 150
+        implicitWidth: Kirigami.Units.gridUnit * 8
         implicitHeight: 40
         color: Kirigami.Theme.backgroundColor
         property color borderColor: Kirigami.Theme.textColor
         border.color: Qt.rgba(borderColor.r, borderColor.g, borderColor.b, 0.3)
         layer.enabled: true
         
         layer.effect: DropShadow {
             transparentBorder: true
             radius: 4
             samples: 8
             horizontalOffset: 2
             verticalOffset: 2
             color: Qt.rgba(0, 0, 0, 0.3)
         }
     }
 }
diff --git a/org.kde.desktop/MenuItem.qml b/org.kde.desktop/MenuItem.qml
index b066fde..6e88f9c 100644
--- a/org.kde.desktop/MenuItem.qml
+++ b/org.kde.desktop/MenuItem.qml
@@ -1,72 +1,75 @@
 /*
  * Copyright 2017 Marco Martin <mart@kde.org>
  * Copyright 2017 The Qt Company Ltd.
  *
  * GNU Lesser General Public License Usage
  * Alternatively, this file may be used under the terms of the GNU Lesser
  * General Public License version 3 as published by the Free Software
  * Foundation and appearing in the file LICENSE.LGPLv3 included in the
  * packaging of this file. Please review the following information to
  * ensure the GNU Lesser General Public License version 3 requirements
  * will be met: https://www.gnu.org/licenses/lgpl.html.
  *
  * GNU General Public License Usage
  * Alternatively, this file may be used under the terms of the GNU
  * General Public License version 2.0 or later as published by the Free
  * Software Foundation and appearing in the file LICENSE.GPL included in
  * the packaging of this file. Please review the following information to
  * ensure the GNU General Public License version 2.0 requirements will be
  * met: http://www.gnu.org/licenses/gpl-2.0.html.
  */
 
 
 import QtQuick 2.6
+import QtQuick.Layouts 1.2
 import QtQuick.Templates 2.0 as T
 import org.kde.kirigami 2.2 as Kirigami
 
 T.MenuItem {
     id: controlRoot
 
     implicitWidth: Math.max(background ? background.implicitWidth : 0,
                             contentItem.implicitWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
                              Math.max(contentItem.implicitHeight,
                                       indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
     baselineOffset: contentItem.y + contentItem.baselineOffset
 
+    Layout.fillWidth: true
     padding: 3
     hoverEnabled: true
 
     contentItem: Label {
         leftPadding: !controlRoot.mirrored ? (controlRoot.indicator ? controlRoot.indicator.width : 0) + controlRoot.spacing : 0
         rightPadding: controlRoot.mirrored ? (controlRoot.indicator ? controlRoot.indicator.width : 0) + controlRoot.spacing : 0
 
         text: controlRoot.text
         font: controlRoot.font
         color: controlRoot.hovered && !controlRoot.pressed ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor
         elide: Text.ElideRight
         visible: controlRoot.text
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
     }
 
     indicator: CheckIndicator {
         x: controlRoot.mirrored ? controlRoot.width - width - controlRoot.rightPadding : controlRoot.leftPadding
         y: controlRoot.topPadding + (controlRoot.availableHeight - height) / 2
 
         visible: controlRoot.checkable
         on: controlRoot.checked
         control: controlRoot
     }
 
     background: Item {
-        implicitWidth: 150
+        anchors.fill: parent
+        implicitWidth: Kirigami.Units.gridUnit * 8
 
         Rectangle {
             anchors.fill: parent
             color: Kirigami.Theme.highlightColor
             opacity: controlRoot.hovered && !controlRoot.pressed ? 1 : 0
             Behavior on opacity { NumberAnimation { duration: 150 } }
         }
     }
 }