diff --git a/src/app/PublicTransportBackendPage.qml b/src/app/PublicTransportBackendPage.qml
index fb20bbd..a017ced 100644
--- a/src/app/PublicTransportBackendPage.qml
+++ b/src/app/PublicTransportBackendPage.qml
@@ -1,95 +1,108 @@
 /*
     Copyright (C) 2019 Volker Krause <vkrause@kde.org>
 
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     This program is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
     License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
 import QtQuick 2.5
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.1 as QQC2
 import org.kde.kirigami 2.4 as Kirigami
 import org.kde.kpublictransport 1.0 as KPublicTransport
 import org.kde.itinerary 1.0
 
 Kirigami.ScrollablePage {
     id: root
     title: i18n("Public Transport Information Sources")
 
     property alias publicTransportManager: backendModel.manager
 
     KPublicTransport.BackendModel {
         id: backendModel
     }
 
     Component {
         id: backendDelegate
         Kirigami.AbstractListItem {
             highlighted: false
             enabled: model.itemEnabled
 
-            GridLayout {
-                columns: 3
-                rows: 2
+            Item {
+                anchors.margins: Kirigami.Units.largeSpacing
+                implicitHeight: childrenRect.height
 
                 QQC2.Label {
+                    id: nameLabel
                     text: model.name
-                    Layout.fillWidth: true
+                    anchors.left: parent.left
+                    anchors.top: parent.top
+                    anchors.right: securityIcon.left
+                    anchors.rightMargin: Kirigami.Units.largeSpacing
+                    // try to retain trailing abbreviations when we have to elide
+                    elide: text.endsWith(")") ? Text.ElideMiddle : Text.ElideRight
                 }
                 Kirigami.Icon {
+                    id: securityIcon
                     source: model.isSecure ? "channel-secure-symbolic" : "channel-insecure-symbolic"
                     color: model.isSecure ? Kirigami.Theme.positiveTextColor : Kirigami.Theme.negativeTextColor
                     width: height
                     height: Kirigami.Units.gridUnit
+                    anchors.top: parent.top
+                    anchors.right: toggle.left
                 }
                 QQC2.Switch {
                     id: toggle
                     checked: model.backendEnabled
-                    Layout.rowSpan: 2
                     onToggled: model.backendEnabled = checked;
+                    anchors.top: parent.top
+                    anchors.right: parent.right
                 }
                 QQC2.Label {
-                    Layout.columnSpan: 2
-                    Layout.fillWidth: true
+                    anchors.top: nameLabel.bottom
+                    anchors.left: parent.left
+                    anchors.right: toggle.left
+                    anchors.topMargin: Kirigami.Units.smallSpacing
                     text: model.description
                     font.italic: true
+                    wrapMode: Text.WordWrap
                 }
             }
 
             onClicked: {
                 toggle.toggle(); // does not trigger the signal handler for toggled...
                 model.backendEnabled = toggle.checked;
             }
         }
     }
 
     ListView {
         model: backendModel
         delegate: backendDelegate
 
         section.property: "primaryCountryCode"
         section.delegate: Item {
             implicitHeight: headerItem.implicitHeight
             implicitWidth: ListView.view.width
             Kirigami.BasicListItem {
                 id: headerItem
                 label: section == "" ? i18n("Global") : Localizer.countryFlag(section) + " " + Localizer.countryName(section)
                 backgroundColor: Kirigami.Theme.backgroundColor
                 reserveSpaceForIcon: false
                 highlighted: false
             }
         }
         section.criteria: ViewSection.FullString
         section.labelPositioning: ViewSection.CurrentLabelAtStart | ViewSection.InlineLabels
     }
 }