diff --git a/imports/Spectral/Component/Timeline/MessageDelegate.qml b/imports/Spectral/Component/Timeline/MessageDelegate.qml
index ec03a5888..c55d7315b 100644
--- a/imports/Spectral/Component/Timeline/MessageDelegate.qml
+++ b/imports/Spectral/Component/Timeline/MessageDelegate.qml
@@ -90,7 +90,7 @@ RowLayout {
                 }
 
                 TextEdit {
-                    Layout.fillWidth: true
+                    Layout.maximumWidth: parent.width
 
                     text: "<style>pre {white-space: pre-wrap} a{color: " + color + ";} .user-pill{}</style>" + (replyVisible ? reply.display : "")
 
diff --git a/imports/Spectral/Component/Timeline/StateDelegate.qml b/imports/Spectral/Component/Timeline/StateDelegate.qml
index 50fa544cf..78e3ad3db 100644
--- a/imports/Spectral/Component/Timeline/StateDelegate.qml
+++ b/imports/Spectral/Component/Timeline/StateDelegate.qml
@@ -43,7 +43,7 @@ RowLayout {
     }
 
     Label {
-        text: model.display
+        text: display
         color: MPalette.foreground
         font.pixelSize: 13
         font.weight: Font.Medium
diff --git a/imports/Spectral/Component/Timeline/TextDelegate.qml b/imports/Spectral/Component/Timeline/TextDelegate.qml
index 5ab5f2058..a8dabadde 100644
--- a/imports/Spectral/Component/Timeline/TextDelegate.qml
+++ b/imports/Spectral/Component/Timeline/TextDelegate.qml
@@ -3,7 +3,7 @@ import QtQuick 2.12
 import org.kde.kirigami 2.4 as Kirigami
 
 TextEdit {
-    text: "<style>pre {white-space: pre-wrap} a{color: " + Kirigami.Theme.linkColor + ";} .user-pill{}</style>" + model.display
+    text: "<style>pre {white-space: pre-wrap} a{color: " + Kirigami.Theme.linkColor + ";} .user-pill{}</style>" + display
 
     font {
         pixelSize: Kirigami.Theme.defaultFont.pixelSize * 1.2
diff --git a/imports/Spectral/Component/Timeline/TimelineContainer.qml b/imports/Spectral/Component/Timeline/TimelineContainer.qml
index 28b644871..97b7dc50b 100644
--- a/imports/Spectral/Component/Timeline/TimelineContainer.qml
+++ b/imports/Spectral/Component/Timeline/TimelineContainer.qml
@@ -4,22 +4,33 @@ import QtQuick.Layouts 1.12
 
 import org.kde.kirigami 2.4 as Kirigami
 
-Controls.ItemDelegate {
+Item {
     default property alias innerObject : column.children
 
-    horizontalPadding: Kirigami.Units.largeSpacing
-    verticalPadding: Kirigami.Units.smallSpacing
+    readonly property int horizontalPadding: Kirigami.Units.largeSpacing
+    readonly property int verticalPadding: Kirigami.Units.smallSpacing
+
+    height: column.implicitHeight + verticalPadding * 2
+
+    ColumnLayout {
+        x: horizontalPadding
+        y: verticalPadding
+
+        width: parent.width - horizontalPadding * 2
 
-    contentItem: ColumnLayout {
         id: column
 
         SectionDelegate {
-            //            anchors.horizontalCenter: parent.horizontalCenter
-            //            width: Math.min(implicitWidth, parent.width)
             Layout.maximumWidth: parent.width
             Layout.alignment: Qt.AlignHCenter
 
             visible: showSection
         }
     }
+
+    Controls.ItemDelegate {
+        anchors.fill: parent
+
+        z: -1
+    }
 }
diff --git a/imports/Spectral/Panel/RoomListPanel.qml b/imports/Spectral/Panel/RoomListPanel.qml
index 7797b8230..df6676420 100644
--- a/imports/Spectral/Panel/RoomListPanel.qml
+++ b/imports/Spectral/Panel/RoomListPanel.qml
@@ -16,7 +16,7 @@ Kirigami.ScrollablePage {
     signal enterRoom(var room)
     signal leaveRoom(var room)
 
-    title: "Spectral"
+    title: "Rooms"
     actions {
         main: Kirigami.Action {
             iconName: "document-edit"
diff --git a/imports/Spectral/Panel/RoomPanel.qml b/imports/Spectral/Panel/RoomPanel.qml
index b1b940c18..9bbcde9ab 100644
--- a/imports/Spectral/Panel/RoomPanel.qml
+++ b/imports/Spectral/Panel/RoomPanel.qml
@@ -164,8 +164,8 @@ Kirigami.ScrollablePage {
                         Layout.fillWidth: true
 
                         innerObject: ImageDelegate {
-                            Layout.fillWidth: true
-                            Layout.preferredHeight: info.h
+                            Layout.preferredWidth: Math.min(320, info.w)
+                            Layout.preferredHeight: Math.min(320, info.h)
                         }
                     }
                 }