diff --git a/shell/contents/views/Desktop.qml b/shell/contents/views/Desktop.qml
index 9514b81d..ee7088b6 100644
--- a/shell/contents/views/Desktop.qml
+++ b/shell/contents/views/Desktop.qml
@@ -29,158 +29,21 @@ import org.kde.kquickcontrolsaddons 2.0
 import org.kde.activities 0.1 as Activities
 //import "../components"
 
-Item {
+
+Rectangle {
     id: root
-    width: 0
-    height: 0
 
-    property Item containment;
-    property Item containmentNextActivityPreview;
-    property Item wallpaper;
-    property int notificationId: 0;
-    property int buttonHeight: width/4
-    property bool loadCompleted: false
+    visible: false //adjust borders is run during setup. We want to avoid painting till completed
+    property Item containment
 
-    NumberAnimation {
-        id: switchAnim
-        target: activitiesView
-        property: "contentX"
-        duration: units.longDuration
-        easing.type: Easing.InOutQuad
-    }
-    Flickable {
-        id: activitiesView
-        z: 99
-        visible: root.containment
-        anchors.fill: parent
-
-        property int currentIndex: -1
-        property Item nextContainment: root.containment
-        contentWidth: activitiesLayout.width
-        function adjustPosition() {
-            if (!activitiesLayout.loadCompleted) {
-                activitiesView.contentX = currentIndex * width;
-                return;
-            }
-            switchAnim.from = activitiesView.contentX;
-            switchAnim.to = currentIndex * width;
-            switchAnim.running = true;
-        }
-        onCurrentIndexChanged: adjustPosition();
-        
-        //don't animate
-        onWidthChanged: contentX = currentIndex * width;
-
-        onMovementEnded: {
-            currentIndex = Math.round(activitiesView.contentX / width);
-            adjustPosition();
-        }
-        onFlickEnded: movementEnded();
-        Row {
-            id: activitiesLayout
-            height: activitiesView.height
-            spacing: 0
-            //don't try to do anything until we are well set up
-            property bool loadCompleted: root.loadCompleted && width == activitiesView.width * (activitiesLayout.children.length - 1) && activitiesLayout.children.length == activityRepeater.count + 1
-            onLoadCompletedChanged: activitiesView.currentIndexChanged();
-
-            Repeater {
-                id: activityRepeater
-                model: Activities.ActivityModel {
-                    id: activityModel
-                }
-
-                delegate: Item {
-                    id: mainDelegate
-                    width: activitiesView.width
-                    height: activitiesView.height
-                    property Item containment
-                    //inViewport should be only the current, and the other adjacent two
-                    readonly property bool inViewport: activitiesLayout.loadCompleted && root.containment &&
-                            ((x >= activitiesView.contentX &&
-                            x <= activitiesView.contentX + activitiesView.width) ||
-                            (x + width >= activitiesView.contentX &&
-                            x + width < activitiesView.contentX + activitiesView.width))
-                    readonly property bool currentActivity: root.containment && model.current
-
-                    Component.onCompleted: {
-                        inViewportChanged();
-                    }
-                    Connections {
-                        target: activitiesView
-                        onCurrentIndexChanged: {
-                            if (activitiesView.currentIndex == index && !model.current) {
-                                activityModel.setCurrentActivity(model.id, function() {
-                                    inViewportChanged();
-                                    mainDelegate.containment.parent = mainDelegate;
-                                });
-                            }
-                        }
-                    }
-                    Connections {
-                        target: desktop
-                        onCandidateContainmentsChanged: {
-                            inViewportChanged();
-                        }
-                    }
-                    onInViewportChanged: {
-                        if (inViewport && !mainDelegate.containment) {
-                            mainDelegate.containment = desktop.candidateContainments[model.id];
-                            //desktop.containmentItemForActivity(model.id);
-                            containmentNextActivityPreview = containment;
-                            mainDelegate.containment.parent = mainDelegate;
-                            mainDelegate.containment.anchors.fill = mainDelegate;
-                            mainDelegate.containment.visible = true;
-                        }
-                    }
-                    onCurrentActivityChanged: {
-                        if (currentActivity) {
-                            activitiesView.currentIndex = index;
-                        }
-                        mainDelegate.containment.visible = true;
-                    }
-                }
-            }
-        }
-    }
-
-    //TODO: adjust its Y to current containment availablescreenrect
-    PageIndicator {
-        z: 100
-        anchors {
-            bottom: parent.bottom
-            bottomMargin: root.containment.availableScreenRect.y + root.containment.availableScreenRect.height
-            horizontalCenter: parent.horizontalCenter
-        }
-        count: activitiesView.count
-        currentIndex: activitiesView.currentIndex
-    }
-    PlasmaCore.FrameSvgItem {
-        z: 100
-        opacity: activitiesView.flicking || activitiesView.draggingHorizontally ? 1 : 0
-        anchors.centerIn: parent
-        imagePath: "widgets/background"
-        width: activityNameLabel.implicitWidth + units.gridUnit*2
-        height: activityNameLabel.implicitHeight + units.gridUnit*2
-        PlasmaComponents.Label {
-            id: activityNameLabel
-            anchors.centerIn: parent
-            text: activitiesView.nextContainment ? activitiesView.nextContainment.activityName : ""
-        }
-        Behavior on opacity {
-            OpacityAnimator {
-                duration: units.longDuration
-                easing.type: Easing.InOutQuad
-            }
-        }
-    }
+    color: containment.backgroundHints == PlasmaCore.Types.NoBackground ? "transparent" : theme.textColor
 
     function toggleWidgetExplorer(containment) {
         console.log("Widget Explorer toggled");
         if (widgetExplorerStack.source != "") {
             widgetExplorerStack.source = "";
         } else {
-            widgetExplorerStack.setSource(desktop.fileFromPackage("explorer", "WidgetExplorer.qml"), {"containment": containment, "containmentInterface": root.containment})
+            widgetExplorerStack.setSource(Qt.resolvedUrl("../explorer/WidgetExplorer.qml"), {"containment": containment, "containmentInterface": root.containment})
         }
     }
 
@@ -188,40 +51,23 @@ Item {
         id: widgetExplorerStack
         z: 99
         asynchronous: true
-        y: containment ? containment.availableScreenRect.y : 0
-        height: containment ? containment.availableScreenRect.height : parent.height
-        width: parent.width
+        anchors.fill: parent
         
         onLoaded: {
             if (widgetExplorerStack.item) {
                 item.closed.connect(function() {
                     widgetExplorerStack.source = ""
                 });
+
+                item.topPanelHeight = containment.availableScreenRect.y
+                item.bottomPanelHeight = root.height - (containment.availableScreenRect.height + containment.availableScreenRect.y)
+
+                item.leftPanelWidth = containment.availableScreenRect.x
+                item.rightPanelWidth = root.width - (containment.availableScreenRect.width + containment.availableScreenRect.x)
             }
         }
     }
 
-    Binding {
-        target: containment
-        property: "width"
-        value: root.width
-    }
-    //some properties that shouldn't be accessible from elsewhere
-    QtObject {
-        id: internal;
-
-        property Item oldContainment: null;
-        property Item newContainment: null;
-    }
-
-    //pass the focus to the containment, so it can react to homescreen activate/inactivate
-    Connections {
-        target: desktop
-        onActiveChanged: {
-            containment.focus = desktop.active;
-        }
-    }
-
     Loader {
         id: pinOverlay
         anchors {
@@ -233,21 +79,14 @@ Item {
         source: Qt.resolvedUrl("Pin.qml")
     }
 
-    onWidthChanged: {
-        //There will be a resize at the very start which we can't avoid, don't do anything until then
-        //configure the view behavior
-        if (desktop && root.width > 0) {
-            desktop.width = width;
-            desktop.height = height;
-            root.loadCompleted = true;
-        }
+    onContainmentChanged: {
+        containment.parent = root;
+        containment.visible = true;
+        containment.anchors.fill = root;
+        panel.backgroundHints = containment.backgroundHints;
     }
+
     Component.onCompleted: {
-        //configure the view behavior
-        if (desktop && root.width > 0) {
-            desktop.width = width;
-            desktop.height = height;
-            root.loadCompleted = true;
-        }
+        visible = true
     }
 }