diff --git a/discover/qml/AddonsView.qml b/discover/qml/AddonsView.qml
--- a/discover/qml/AddonsView.qml
+++ b/discover/qml/AddonsView.qml
@@ -13,17 +13,14 @@
     readonly property bool containsAddons: rep.count>0 || isExtended
     readonly property bool isExtended: ResourcesModel.isExtended(application.appstreamId)
 
+    header: Kirigami.Heading { text: i18n("Addons") }
+
     ColumnLayout
     {
         visible: addonsView.containsAddons
         enabled: !addonsView.isInstalling
         spacing: Kirigami.Units.largeSpacing
 
-        Kirigami.Heading {
-            level: 3
-            text: i18n("Addons")
-        }
-
         Repeater
         {
             id: rep
diff --git a/discover/qml/DiscoverWindow.qml b/discover/qml/DiscoverWindow.qml
--- a/discover/qml/DiscoverWindow.qml
+++ b/discover/qml/DiscoverWindow.qml
@@ -193,10 +193,13 @@
             property alias title: heading.text
             property alias description: desc.text
             property bool acted: false
+
+            header: Kirigami.Heading {
+                id: heading
+                wrapMode: Text.WordWrap
+            }
+
             ColumnLayout {
-                Kirigami.Heading {
-                    id: heading
-                }
                 Label {
                     id: desc
                     Layout.fillWidth: true
diff --git a/discover/qml/ReviewsPage.qml b/discover/qml/ReviewsPage.qml
--- a/discover/qml/ReviewsPage.qml
+++ b/discover/qml/ReviewsPage.qml
@@ -49,25 +49,30 @@
         width: parent.width
         spacing: Kirigami.Units.largeSpacing
 
-        Button {
-            id: reviewButton
-
-            Layout.alignment: Qt.AlignHCenter
-            Layout.topMargin: enabled ? undefined : Kirigami.Units.largeSpacing
-
-            visible: page.reviewsBackend != null
-            enabled: page.resource.isInstalled
-            text: i18n("Write a Review...")
-            onClicked: page.openReviewDialog()
+        Kirigami.Heading {
+            Layout.fillWidth: true
+            wrapMode: Text.WordWrap
+            text: i18n("Reviews for %1", page.resource.name)
         }
-        Label {
-            Layout.alignment: Qt.AlignHCenter
+
+        RowLayout {
             Layout.bottomMargin: Kirigami.Units.largeSpacing
 
-            text: i18n("Install this app to write a review")
-            wrapMode: Text.WordWrap
-            visible: !reviewButton.enabled
-            opacity: 0.6
+            Button {
+                id: reviewButton
+
+                visible: page.reviewsBackend != null
+                enabled: page.resource.isInstalled
+                text: i18n("Write a Review...")
+                onClicked: page.openReviewDialog()
+            }
+            Label {
+                text: i18n("Install this app to write a review")
+                wrapMode: Text.WordWrap
+                visible: !reviewButton.enabled
+                opacity: 0.6
+            }
+
         }
     }
 
diff --git a/discover/qml/SourcesPage.qml b/discover/qml/SourcesPage.qml
--- a/discover/qml/SourcesPage.qml
+++ b/discover/qml/SourcesPage.qml
@@ -113,10 +113,13 @@
                 property alias title: heading.text
                 property alias description: desc.text
                 property bool acted: false
+
+                header: Kirigami.Heading {
+                    id: heading
+                    wrapMode: Text.WordWrap
+                }
+
                 ColumnLayout {
-                    Kirigami.Heading {
-                        id: heading
-                    }
                     Label {
                         id: desc
                         Layout.fillWidth: true
diff --git a/discover/qml/UpdatesPage.qml b/discover/qml/UpdatesPage.qml
--- a/discover/qml/UpdatesPage.qml
+++ b/discover/qml/UpdatesPage.qml
@@ -36,6 +36,8 @@
 
     readonly property var sheet: Kirigami.OverlaySheet {
         id: sheet
+        header: Kirigami.Heading { text: i18n("Update issue") }
+
         ColumnLayout {
             Label {
                 id: desc