diff --git a/screenshots/gpxlist_landscape.png b/screenshots/gpxlist_landscape.png
new file mode 100644
index 0000000000..3dc19a123e
Binary files /dev/null and b/screenshots/gpxlist_landscape.png differ
diff --git a/screenshots/gpxlist_landscape_inverted.png b/screenshots/gpxlist_landscape_inverted.png
new file mode 100644
index 0000000000..205440b7bf
Binary files /dev/null and b/screenshots/gpxlist_landscape_inverted.png differ
diff --git a/screenshots/gpxlist_portrait.png b/screenshots/gpxlist_portrait.png
new file mode 100644
index 0000000000..f10435f074
Binary files /dev/null and b/screenshots/gpxlist_portrait.png differ
diff --git a/screenshots/gpxlist_portrait_inverted.png b/screenshots/gpxlist_portrait_inverted.png
new file mode 100644
index 0000000000..560d995af6
Binary files /dev/null and b/screenshots/gpxlist_portrait_inverted.png differ
diff --git a/screenshots/trainlist_landscape.png b/screenshots/trainlist_landscape.png
new file mode 100644
index 0000000000..865ec2f704
Binary files /dev/null and b/screenshots/trainlist_landscape.png differ
diff --git a/screenshots/trainlist_landscape_original.png b/screenshots/trainlist_landscape_original.png
new file mode 100644
index 0000000000..a4b9291aeb
Binary files /dev/null and b/screenshots/trainlist_landscape_original.png differ
diff --git a/src/GPXList.qml b/src/GPXList.qml
index da9bd6afdb..1fee86701f 100644
--- a/src/GPXList.qml
+++ b/src/GPXList.qml
@@ -44,13 +44,12 @@ ColumnLayout {
 
     RowLayout{
         spacing: 2
-        anchors.top: parent.top
-        anchors.fill: parent
+        Layout.fillWidth: true
+        Layout.fillHeight: true
 
         ColumnLayout {
             spacing: 0
-            anchors.top: parent.top
-            anchors.fill: parent
+            Layout.fillHeight: true
 
             Row
             {
@@ -88,9 +87,8 @@ ColumnLayout {
                 Layout.fillWidth: true
                 Layout.minimumWidth: 50
                 Layout.preferredWidth: 100
-                Layout.maximumWidth: row.left
                 Layout.minimumHeight: 150
-                Layout.preferredHeight: parent.height
+                Layout.fillHeight: true
                 ScrollBar.vertical: ScrollBar {}
                 id: list
                 FolderListModel {
@@ -186,12 +184,9 @@ ColumnLayout {
         }
 
         ScrollView {
-            anchors.top: parent.top
             ScrollBar.vertical.policy: ScrollBar.AlwaysOn
-            //contentHeight: map.height
-            Layout.preferredHeight: parent.height
-            Layout.fillWidth: true
             Layout.fillHeight: true
+            Layout.fillWidth: true
             Layout.minimumWidth: 100
             Layout.preferredWidth: 200
 
@@ -267,17 +262,12 @@ ColumnLayout {
 
     Button {
         id: searchButton
-        height: 50
-        width: parent.width
+        Layout.fillWidth: true
+        Layout.preferredHeight: 50
         text: "Other folders"
-        Layout.alignment: Qt.AlignCenter | Qt.AlignVCenter
         onClicked: {
             console.log("folder is " + rootItem.getWritableAppDir() + 'gpx')
-            // Create a fresh FileDialog instance
             fileDialogLoader.active = true
         }
-        anchors {
-            bottom: parent.bottom
-        }
     }
 }
diff --git a/src/TrainingProgramsList.qml b/src/TrainingProgramsList.qml
index 1ce79e7647..7e15c7580b 100644
--- a/src/TrainingProgramsList.qml
+++ b/src/TrainingProgramsList.qml
@@ -7,54 +7,54 @@ import QtQuick.Dialogs 1.0
 import QtCharts 2.2
 import Qt.labs.settings 1.0
 
-ColumnLayout {
-    signal trainprogram_open_clicked(url name)
-    signal trainprogram_open_other_folder(url name)
-    signal trainprogram_preview(url name)
-    signal trainprogram_autostart_requested()
-    property url selectedWorkoutUrl: ""
-    property url initialWorkoutUrl: ""
-
-    function openWorkoutPreview(fileUrl) {
-        if (!fileUrl || fileUrl.toString() === "") {
-            return
-        }
-        selectedWorkoutUrl = fileUrl
-        trainprogram_preview(fileUrl)
-        powerSeries.clear();
-        for(var i=0;i<rootItem.preview_workout_points;i+=10)
-        {
-            powerSeries.append(i * 1000, rootItem.preview_workout_watt[i]);
-        }
-        rootItem.update_chart_power(powerChart);
-    }
-
-    Component.onCompleted: {
-        Qt.callLater(function() {
-            openWorkoutPreview(initialWorkoutUrl)
-        })
-    }
-
-    MessageDialog {
-        id: deleteDialog
-        text: "Delete workout?"
-        informativeText: "This cannot be undone."
-        buttons: (MessageDialog.Yes | MessageDialog.No)
-        onYesClicked: {
-            if (rootItem.deleteTrainingProgramFile(selectedWorkoutUrl)) {
-                selectedWorkoutUrl = ""
-                var currentFolder = folderModel.folder
-                folderModel.folder = ""
-                folderModel.folder = currentFolder
-            }
-            visible = false
-        }
-        onNoClicked: visible = false
-    }
-
-    Loader {
-        id: fileDialogLoader
-        active: false
+ColumnLayout {
+    signal trainprogram_open_clicked(url name)
+    signal trainprogram_open_other_folder(url name)
+    signal trainprogram_preview(url name)
+    signal trainprogram_autostart_requested()
+    property url selectedWorkoutUrl: ""
+    property url initialWorkoutUrl: ""
+
+    function openWorkoutPreview(fileUrl) {
+        if (!fileUrl || fileUrl.toString() === "") {
+            return
+        }
+        selectedWorkoutUrl = fileUrl
+        trainprogram_preview(fileUrl)
+        powerSeries.clear();
+        for(var i=0;i<rootItem.preview_workout_points;i+=10)
+        {
+            powerSeries.append(i * 1000, rootItem.preview_workout_watt[i]);
+        }
+        rootItem.update_chart_power(powerChart);
+    }
+
+    Component.onCompleted: {
+        Qt.callLater(function() {
+            openWorkoutPreview(initialWorkoutUrl)
+        })
+    }
+
+    MessageDialog {
+        id: deleteDialog
+        text: "Delete workout?"
+        informativeText: "This cannot be undone."
+        buttons: (MessageDialog.Yes | MessageDialog.No)
+        onYesClicked: {
+            if (rootItem.deleteTrainingProgramFile(selectedWorkoutUrl)) {
+                selectedWorkoutUrl = ""
+                var currentFolder = folderModel.folder
+                folderModel.folder = ""
+                folderModel.folder = currentFolder
+            }
+            visible = false
+        }
+        onNoClicked: visible = false
+    }
+
+    Loader {
+        id: fileDialogLoader
+        active: false
         sourceComponent: Component {
             FileDialog {
                 title: "Please choose a file"
@@ -83,13 +83,12 @@ ColumnLayout {
 
     RowLayout{
         spacing: 2
-        anchors.top: parent.top
-        anchors.fill: parent
+        Layout.fillWidth: true
+        Layout.fillHeight: true
 
         ColumnLayout {
             spacing: 0
-            anchors.top: parent.top
-            anchors.fill: parent
+            Layout.fillHeight: true
 
             Row
             {
@@ -127,9 +126,8 @@ ColumnLayout {
                 Layout.fillWidth: true
                 Layout.minimumWidth: 50
                 Layout.preferredWidth: 100
-                Layout.maximumWidth: row.left
                 Layout.minimumHeight: 150
-                Layout.preferredHeight: parent.height
+                Layout.fillHeight: true
                 ScrollBar.vertical: ScrollBar {}
                 id: list
                 FolderListModel {
@@ -215,25 +213,25 @@ ColumnLayout {
                     }*/
                 }
                 focus: true
-                onCurrentItemChanged: {
-                    let fileUrl = folderModel.get(list.currentIndex, 'fileUrl') || folderModel.get(list.currentIndex, 'fileURL');
-                    if (fileUrl && !folderModel.isFolder(list.currentIndex)) {
-                        selectedWorkoutUrl = fileUrl
-                        list.currentItem.textColor = Material.color(Material.Yellow)
-                        console.log(fileUrl + ' selected');
-                        trainprogram_preview(fileUrl)
+                onCurrentItemChanged: {
+                    let fileUrl = folderModel.get(list.currentIndex, 'fileUrl') || folderModel.get(list.currentIndex, 'fileURL');
+                    if (fileUrl && !folderModel.isFolder(list.currentIndex)) {
+                        selectedWorkoutUrl = fileUrl
+                        list.currentItem.textColor = Material.color(Material.Yellow)
+                        console.log(fileUrl + ' selected');
+                        trainprogram_preview(fileUrl)
                         powerSeries.clear();
                         for(var i=0;i<rootItem.preview_workout_points;i+=10)
                         {
                             powerSeries.append(i * 1000, rootItem.preview_workout_watt[i]);
                         }
                         rootItem.update_chart_power(powerChart);
-                        //trainprogram_open_clicked(fileUrl);
-                        //popup.open()
-                    } else {
-                        selectedWorkoutUrl = ""
-                    }
-                }
+                        //trainprogram_open_clicked(fileUrl);
+                        //popup.open()
+                    } else {
+                        selectedWorkoutUrl = ""
+                    }
+                }
                 Component.onCompleted: {
 
                 }
@@ -241,10 +239,9 @@ ColumnLayout {
         }
 
         ScrollView {
-            anchors.top: parent.top
             ScrollBar.vertical.policy: ScrollBar.AlwaysOn
             contentHeight: date.height + description.height + powerChart.height
-            Layout.preferredHeight: parent.height
+            Layout.fillHeight: true
             Layout.fillWidth: true
             Layout.minimumWidth: 100
             Layout.preferredWidth: 200
@@ -342,41 +339,36 @@ ColumnLayout {
         }
     }
 
-    RowLayout {
-        height: 50
-        width: parent.width
-        Layout.alignment: Qt.AlignCenter | Qt.AlignVCenter
-
-        Button {
-            Layout.fillWidth: true
-            text: "Start Workout"
-            visible: selectedWorkoutUrl != ""
-            onClicked: {
-                trainprogram_open_clicked(selectedWorkoutUrl)
-                trainprogram_autostart_requested()
-            }
-        }
-
-        Button {
-            id: deleteButton
-            Layout.fillWidth: true
-            text: "Delete"
-            visible: selectedWorkoutUrl != ""
-            onClicked: deleteDialog.visible = true
-        }
-
-        Button {
-            id: searchButton
-            Layout.fillWidth: true
-            text: "Other folders"
-            onClicked: {
-                console.log("folder is " + rootItem.getWritableAppDir() + 'training')
-                // Create a fresh FileDialog instance
-                fileDialogLoader.active = true
-            }
-        }
-        anchors {
-            bottom: parent.bottom
+    RowLayout {
+        Layout.fillWidth: true
+        Layout.preferredHeight: 50
+
+        Button {
+            Layout.fillWidth: true
+            text: "Start Workout"
+            visible: selectedWorkoutUrl != ""
+            onClicked: {
+                trainprogram_open_clicked(selectedWorkoutUrl)
+                trainprogram_autostart_requested()
+            }
+        }
+
+        Button {
+            id: deleteButton
+            Layout.fillWidth: true
+            text: "Delete"
+            visible: selectedWorkoutUrl != ""
+            onClicked: deleteDialog.visible = true
+        }
+
+        Button {
+            id: searchButton
+            Layout.fillWidth: true
+            text: "Other folders"
+            onClicked: {
+                console.log("folder is " + rootItem.getWritableAppDir() + 'training')
+                fileDialogLoader.active = true
+            }
         }
     }
 }