diff --git a/src/qml/Main.qml b/src/qml/Main.qml
index 8be973e..606654f 100644
--- a/src/qml/Main.qml
+++ b/src/qml/Main.qml
@@ -16,8 +16,7 @@ Window {
     height: 480
     visible: true
     title: qsTr("Hello World")
-
-	
+	property bool isPhone: root.width < root.height
 
 	property string selectedView: "list"
 
@@ -99,13 +98,13 @@ Window {
     }
 
 	function setFittingLayout() {
-		if (width > height) {
-			desktopLayout.visible = true
-			phoneLayout.visible = false
-		} else {
+		if (root.isPhone) {
 			desktopLayout.visible = false
 			phoneLayout.visible = true
-			phoneLayout.setCurrentIndex(1)
+			phoneLayout.setCurrentIndex(1)		
+		} else {
+			desktopLayout.visible = true
+			phoneLayout.visible = false
 		}
 	}
 	onWidthChanged: setFittingLayout()
diff --git a/src/qml/components/Calendar.qml b/src/qml/components/Calendar.qml
index 5209ef7..695c96a 100644
--- a/src/qml/components/Calendar.qml
+++ b/src/qml/components/Calendar.qml
@@ -10,6 +10,7 @@ import QtQuick.Layouts
 import Mirai
 
 ColumnLayout {
+	property int numberOfDaysPerPage: 7
 	id: control
 	spacing: 32
 	QtObject {
@@ -33,7 +34,7 @@ ColumnLayout {
 		AppButton {
 			text: "<"
 		  	onClicked: {
-				internal.weekStartDate.setDate(internal.weekStartDate.getDate() - 7)
+				internal.weekStartDate.setDate(internal.weekStartDate.getDate() - control.numberOfDaysPerPage)
 		  	}
 		}
 
@@ -47,7 +48,7 @@ ColumnLayout {
 		AppButton {
 			text: ">"
 			onClicked: {
-				internal.weekStartDate.setDate(internal.weekStartDate.getDate() + 7)
+				internal.weekStartDate.setDate(internal.weekStartDate.getDate() + control.numberOfDaysPerPage)
 		  	}
 		}
 	}
@@ -79,7 +80,7 @@ ColumnLayout {
 		}
 
 		Repeater {
-			model: 7
+			model: control.numberOfDaysPerPage
 
 		   	Rectangle {
 				Layout.fillWidth: true
diff --git a/src/qml/views/CalendarView.qml b/src/qml/views/CalendarView.qml
index 4c3f586..8e7fc1c 100644
--- a/src/qml/views/CalendarView.qml
+++ b/src/qml/views/CalendarView.qml
@@ -18,6 +18,7 @@ ColumnLayout {
 		Calendar {
 			width: parent.width
 			height: parent.height
+			numberOfDaysPerPage: root.isPhone ? 1 : 7
 		}
 	}
 }