diff --git a/src/app/TimelinePage.qml b/src/app/TimelinePage.qml
index c511530..a97e47f 100644
--- a/src/app/TimelinePage.qml
+++ b/src/app/TimelinePage.qml
@@ -1,143 +1,138 @@
 /*
     Copyright (C) 2018 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 <http://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.itinerary 1.0
 import "." as App
 
 Kirigami.ScrollablePage {
     id: root
 
     title: qsTr("My Itinerary")
     // context drawer content
     actions {
         contextualActions: [
             Kirigami.Action {
                 text: qsTr("Today")
                 iconName: "view-calendar-day"
                 onTriggered: listView.positionViewAtIndex(_timelineModel.todayRow, ListView.Beginning);
             }
         ]
     }
 
     // page content
     Component {
         id: flightDelegate
         App.FlightDelegate {
             reservation: modelData.reservation
             passId: modelData.passId
             pass: modelData.pass
             rangeType: modelData.rangeType
         }
     }
     Component {
         id: hotelDelegate
         App.HotelDelegate {
             reservation: modelData.reservation
             passId: modelData.passId
             pass: modelData.pass
             rangeType: modelData.rangeType
         }
     }
     Component {
         id: trainDelegate
         App.TrainDelegate {
             reservation: modelData.reservation
             passId: modelData.passId
             pass: modelData.pass
             rangeType: modelData.rangeType
         }
     }
     Component {
         id: busDelegate
         App.BusDelegate {
             reservation: modelData.reservation
             passId: modelData.passId
             pass: modelData.pass
             rangeType: modelData.rangeType
         }
     }
     Component {
         id: restaurantDelegate
         App.RestaurantDelegate {
             reservation: modelData.reservation
             passId: modelData.passId
             pass: modelData.pass
             rangeType: modelData.rangeType
         }
     }
     Component {
         id: todayDelegate
         Item {
             implicitHeight: visible ? label.implicitHeight : 0
+            visible: modelData.isTodayEmpty
             QQC2.Label {
                 id: label
                 anchors.fill: parent
                 text: qsTr("Nothing on the itinerary for today.");
                 color: Kirigami.Theme.textColor
                 horizontalAlignment: Qt.AlignHCenter
             }
         }
     }
 
     Kirigami.CardsListView {
         id: listView
         model: _timelineModel
 
         delegate: Loader {
             property var modelData: model
             height: item ? item.implicitHeight : 0
             sourceComponent: {
                 if (!modelData)
                     return;
                 switch (modelData.type) {
                     case TimelineModel.Flight: return flightDelegate;
                     case TimelineModel.Hotel: return hotelDelegate;
                     case TimelineModel.TrainTrip: return trainDelegate;
                     case TimelineModel.BusTrip: return busDelegate;
                     case TimelineModel.Restaurant: return restaurantDelegate;
                     case TimelineModel.TodayMarker: return todayDelegate;
                 }
             }
-
-            onLoaded: {
-                if (modelData.type == TimelineModel.TodayMarker) {
-                    item.visible = modelData.isTodayEmpty;
-                }
-            }
         }
 
         section.property: "sectionHeader"
         section.delegate: Item {
             implicitHeight: headerItem.implicitHeight + Kirigami.Units.largeSpacing*2
             implicitWidth: ListView.view.width
             Kirigami.BasicListItem {
                 id: headerItem
                 label: section
                 backgroundColor: Kirigami.Theme.backgroundColor
                 icon: "view-calendar-day"
             }
         }
         section.criteria: ViewSection.FullString
         section.labelPositioning: ViewSection.CurrentLabelAtStart | ViewSection.InlineLabels
     }
 
     Component.onCompleted: listView.positionViewAtIndex(_timelineModel.todayRow, ListView.Beginning);
 }