diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/AddExpenseController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/AddExpenseController.java
index 71f58648c674127abd8648e0fa7c17d5e618c253..273c819f69be6ba096a2cc745c92c0aca2d7986e 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/AddExpenseController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/AddExpenseController.java
@@ -1,30 +1,17 @@
 package no.ntnu.idatt1002.demo.controller;
 
-import java.io.IOException;
 import java.text.NumberFormat;
-import java.util.Optional;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.SimpleDoubleProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
-import javafx.scene.control.ButtonType;
 import javafx.scene.control.ComboBox;
-import javafx.scene.control.Dialog;
-import javafx.scene.control.DialogPane;
 import javafx.scene.control.TextField;
 import javafx.stage.Stage;
 import no.ntnu.idatt1002.demo.data.Economics.Expense;
 import no.ntnu.idatt1002.demo.data.Economics.ExpenseCategory;
-import no.ntnu.idatt1002.demo.view.ExpenseRepository;
-
 public class AddExpenseController {
   Expense newExpense = null; //the expense that is chosen when editing or the expense that is created when adding
 
@@ -70,7 +57,7 @@ public class AddExpenseController {
   }
 
   public boolean isRecurring() {
-    return recurringBox.getValue().equals("Yes");
+    return recurringBox.getValue();//.equals("Yes");
   }
 
   public void setExpense(Expense expense) { //TODO NEED CANCEL BUTTON TO REMOVE THE CHANGES IF CANCEL IS PRESSED
@@ -80,6 +67,8 @@ public class AddExpenseController {
     //categoryBox.valueProperty().bindBidirectional(expense.getCategory());
     recurringBox.valueProperty().bindBidirectional(expense.recurringProperty());
   }
+
+  @FXML
   public void pressOkBtn(ActionEvent event) {
     String date = dateField.getText();
     double amount = Double.parseDouble(amountField.getText());
@@ -93,6 +82,7 @@ public class AddExpenseController {
     ((Stage) source.getScene().getWindow()).close();
   }
 
+  @FXML
   public void pressCancelBtn(ActionEvent event) {
     final Node source = (Node) event.getSource();
     final Stage stage = (Stage) source.getScene().getWindow();