diff --git a/mmkurssit/src/fxMMKurssit/MMKurssitGUIController.java b/mmkurssit/src/fxMMKurssit/MMKurssitGUIController.java
index 669220bb2d2992dcf90d5b85748ffec48113bc92..a8e19757625c0e4e8e6f087e734aa85ae5badcd5 100644
--- a/mmkurssit/src/fxMMKurssit/MMKurssitGUIController.java
+++ b/mmkurssit/src/fxMMKurssit/MMKurssitGUIController.java
@@ -3,6 +3,7 @@ package fxMMKurssit;
 import fi.jyu.mit.fxgui.ModalController;
 import fi.jyu.mit.fxgui.CheckBoxChooser;
 import fi.jyu.mit.fxgui.ListChooser;
+import javafx.application.Platform;
 //import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
@@ -59,7 +60,7 @@ public class MMKurssitGUIController {
 
     @FXML  void addMeeting() {
         
-        ModalController.showModal(KurssinlisaysGUIController.class.getResource("LisaaTapaaminenGUIView.fxml"), 
+        ModalController.showModal(LisaaTapaaminenGUIController.class.getResource("LisaaTapaaminenGUIView.fxml"), 
                 "Missä ja Milloin Kurssi", null, "");
       }
     
@@ -77,6 +78,37 @@ public class MMKurssitGUIController {
         }
     }
         
+    
+    @FXML    void addCourse() {
+        ModalController.showModal(KurssinlisaysGUIController.class.getResource("KurssinlisaysGUIView.fxml"), 
+                "Missä ja Milloin Kurssi", null, "");
+    }
+    
+    
+    @FXML   void openCourseList() {
+        //
+    }
+    
+    
+    /**
+     * Uncheck all the selected courses
+     */
+    @FXML    void resetSelected() {
+        //
+    }
+    
+    
+    /**
+     * If a user check this checkbox, show only the upcoming meetings on the list
+     */
+    @FXML    void showUpcomingMeetingsOnly() {
+        //
+    }
+    
+    
+    @FXML    void closeProgram() {
+        Platform.exit();
+    }
 //===================================================================================
         
     
diff --git a/mmkurssit/src/fxMMKurssit/MMKurssitGUIView.fxml b/mmkurssit/src/fxMMKurssit/MMKurssitGUIView.fxml
index b784eec85d98a0dda1cd5365b0fd0728fd67e9ba..314be13d9ca0b5be003fd2686f3469cacada7ff0 100644
--- a/mmkurssit/src/fxMMKurssit/MMKurssitGUIView.fxml
+++ b/mmkurssit/src/fxMMKurssit/MMKurssitGUIView.fxml
@@ -22,21 +22,21 @@
         <menus>
           <Menu mnemonicParsing="false" text="Edit">
             <items>
-                  <MenuItem mnemonicParsing="false" text="Add new course">
+                  <MenuItem fx:id="menuAddCourse" mnemonicParsing="false" onAction="#addCourse" text="Add new course">
                      <accelerator>
                         <KeyCodeCombination alt="UP" code="C" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
                      </accelerator>
                   </MenuItem>
-                  <MenuItem mnemonicParsing="false" text="Add new meeting">
+                  <MenuItem mnemonicParsing="false" onAction="#addMeeting" text="Add new meeting">
                      <accelerator>
                         <KeyCodeCombination alt="UP" code="M" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
                      </accelerator></MenuItem>
-                  <MenuItem mnemonicParsing="false" text="Open the list of the courses">
+                  <MenuItem mnemonicParsing="false" onAction="#openCourseList" text="Open the list of the courses">
                      <accelerator>
                         <KeyCodeCombination alt="UP" code="O" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
                      </accelerator></MenuItem>
-                  <MenuItem mnemonicParsing="false" text="Reset your courses" />
-              <MenuItem mnemonicParsing="false" text="Close" />
+                  <MenuItem mnemonicParsing="false" onAction="#resetSelected" text="Reset your courses" />
+              <MenuItem mnemonicParsing="false" onAction="#closeProgram" text="Quit" />
             </items>
           </Menu>
           <Menu mnemonicParsing="false" text="Help">
@@ -50,7 +50,7 @@
    <center>
       <BorderPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
          <bottom>
-            <CheckBox fx:id="onlyUpcoming" alignment="BOTTOM_CENTER" contentDisplay="CENTER" mnemonicParsing="false" text="Show only upcoming meetings" BorderPane.alignment="TOP_CENTER">
+            <CheckBox fx:id="onlyUpcoming" alignment="BOTTOM_CENTER" contentDisplay="CENTER" mnemonicParsing="false" onAction="#showUpcomingMeetingsOnly" text="Show only upcoming meetings" BorderPane.alignment="TOP_CENTER">
                <BorderPane.margin>
                   <Insets bottom="10.0" left="5.0" right="5.0" />
                </BorderPane.margin></CheckBox>