diff --git a/qmlUiKirigami/AlbumView.qml b/qmlUiKirigami/AlbumView.qml
--- a/qmlUiKirigami/AlbumView.qml
+++ b/qmlUiKirigami/AlbumView.qml
@@ -24,22 +24,26 @@
 
 import org.kde.kirigami 2.1 as Kirigami
 
-Kirigami.ScrollablePage {
+Controls.Page {
     
     property alias model: gridView.model
     signal imageClicked(var files, string cover)
-    
-    GridView {
+
+    contentItem: GridView {
         id: gridView
         
         property int iconSize: Kirigami.Units.iconSizes.enormous
         
         cellWidth: width / Math.floor(width / (iconSize + Kirigami.Units.largeSpacing*2))
-        cellHeight: iconSize + Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing*2
+        cellHeight: iconSize + Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing*2        
         
-        delegate: FocusScope {
-            
+        focus: true
+        highlight: Rectangle { color: Kirigami.Theme.highlightColor}
+        
+        Component {
+            id: albumCover           
             Image {
+                opacity: 0.7
                 source: model.cover
                 width: gridView.cellWidth - Kirigami.Units.largeSpacing
                 height: gridView.cellHeight - Kirigami.Units.largeSpacing
@@ -53,18 +57,13 @@
                     }
                 }
             }
-            
-            Kirigami.BasicListItem {
-                label: model.fileCount == 1 ? qsTr(" %1 \n 1 Image").arg(model.display) : qsTr(" %1 \n %2 Images").arg(model.display).arg(model.fileCount);
-                reserveSpaceForIcon: false
-                width: gridView.cellWidth - Kirigami.Units.smallSpacing
-                background: Rectangle {
-                    anchors.fill: parent
-                    opacity: 0.7
-                    color: Kirigami.Theme.backgroundColor
-                }
-            }
         }
+        
+        delegate: albumCover
+        
+        Component.onCompleted: forceActiveFocus()
+        
+        onCurrentIndexChanged: console.log("albumView changed currentIndex to "+ currentIndex)
     }
     
 }