diff --git a/CalculatorGameOverPage.qml b/CalculatorGameOverPage.qml
index 89e1942..395006d 100644
--- a/CalculatorGameOverPage.qml
+++ b/CalculatorGameOverPage.qml
@@ -79,8 +79,7 @@ Page {
             width: height
             text: "home"
             onClicked: {
-                game.state = "starting"
-                calculator.reset()
+                game.start()
             }
         }
 
diff --git a/StartPage.qml b/StartPage.qml
index 6b6a249..d8da026 100644
--- a/StartPage.qml
+++ b/StartPage.qml
@@ -20,7 +20,7 @@ Page {
         }
 
         onClicked: {
-            game.state = "calender"
+            game.calender()
         }
     }
 
@@ -38,7 +38,7 @@ Page {
         }
 
         onClicked: {
-            game.state = "calculator"
+            game.calculator()
         }
     }
 }
diff --git a/main.qml b/main.qml
index 3296c17..3f6f08a 100644
--- a/main.qml
+++ b/main.qml
@@ -92,5 +92,14 @@ Window {
                 }
             }
         }
+        function start() {
+            game.state = "starting"
+        }
+        function calender() {
+            game.state = "calender"
+        }
+        function calculator() {
+            game.state = "calculator"
+        }
     }
 }