diff --git a/src/main/java/com/application/DB/Constants.java b/src/main/java/com/application/DB/Constants.java
index 0f20451d45a5d26cae76f50eea137175808c79bb..66067d33df20d0b866b3a6b35496d1fad24fdbd5 100644
--- a/src/main/java/com/application/DB/Constants.java
+++ b/src/main/java/com/application/DB/Constants.java
@@ -2,26 +2,33 @@ package com.application.DB;
 
 public class Constants {
 
+    // Key name file for the database access
     public static String KEY_FILE_NAME = "sf-drying-optimization-8a2e1b7ffc14.json";
 
-    // Start- & end time
+    // Time related constants
     public static String START_TIME = "";
     public static String STOP_TIME = "";
+    public static String CURRENT_DATE = "";
+    public static String TIME_LEFT = "";
+
     // Boolean variable to tell if the drying process is finished
     public static boolean IS_FINISHED = false;
+    // Boolean variable to tell if the data is finished loading
     public static boolean LOADED_DATA = false;
+
     // User inputs
     public static String TREE_SPECIES = "";
     public static String DIMENSIONS = "";
     public static String SAWSET = "";
     public static String MOISTURE_GOAL = "";
+
     // Number of manual moisture checks
     public static int NUMBER_OF_CHECKS = 1;
+
+    // Max number of input characters for sql injection prevention
     public static int MAX_USER_INPUT_CHARACTERS = 10;
-    // Today's date
-    public static String CURRENT_DATE = "";
-    public static String TIME_LEFT = "";
 
+    // Boolean constants to toggle default launch selected or not for checkboxes for showing graphs
     public static boolean DEFAULT_IS_SELECTED_LIVE_DATA = true;
     public static boolean DEFAULT_IS_SELECTED_REGRESSION = true;
     public static boolean DEFAULT_IS_SELECTED_REGRESSION_SHADOW = false;
diff --git a/src/main/java/com/application/GUI/LineChartFunctionality.java b/src/main/java/com/application/GUI/LineChartFunctionality.java
index 2f13614eaabdfd1a336f6be7a5911d7f68471443..60551dbe3830942e65a0fb56b388f3eec12523e9 100644
--- a/src/main/java/com/application/GUI/LineChartFunctionality.java
+++ b/src/main/java/com/application/GUI/LineChartFunctionality.java
@@ -2,6 +2,7 @@ package com.application.GUI;
 
 import com.application.DB.Constants;
 import com.application.DB.Settings;
+import com.application.GUI.PopUpWindows.NotificationPopUp;
 import com.application.Main;
 import javafx.scene.chart.CategoryAxis;
 import javafx.scene.chart.LineChart;
@@ -497,7 +498,8 @@ public class LineChartFunctionality {
         if(minutes > 60){
             hours = minutes/60;
             Main.setTimeLeftText(hours + " h");
-            if(hours == 3){NotificationPopUp.displayNotificationWindow("3 Hours Left!");}
+            if(hours == 3){
+                NotificationPopUp.displayNotificationWindow("3 Hours Left!");}
         } else {
             if(minutes == 60){NotificationPopUp.displayNotificationWindow("1 Hours Left!");}
             Main.setTimeLeftText(minutes + " min");
diff --git a/src/main/java/com/application/GUI/Panes/MenuBar.java b/src/main/java/com/application/GUI/Panes/MenuBar.java
index 77550ca4e30f12affd285b75b6ec402b2729df60..c784df066a49c1720c596ad43d5b6b074f6253a8 100644
--- a/src/main/java/com/application/GUI/Panes/MenuBar.java
+++ b/src/main/java/com/application/GUI/Panes/MenuBar.java
@@ -2,6 +2,7 @@ package com.application.GUI.Panes;
 
 import com.application.DB.Constants;
 import com.application.GUI.LineChartFunctionality;
+import com.application.GUI.PopUpWindows.NotificationPopUp;
 import com.application.Main;
 import javafx.scene.control.CheckMenuItem;
 import javafx.scene.control.Menu;
@@ -81,7 +82,9 @@ public class MenuBar {
         });
 
         MenuItem aboutUs = new MenuItem("About Us");
+        aboutUs.setOnAction(event -> getAboutUs());
         MenuItem help = new MenuItem("Help");
+        help.setOnAction(event -> getHelp());
 
 
         menuFile.getItems().addAll(menuFileExit);
@@ -94,4 +97,15 @@ public class MenuBar {
         // Returns the menubar
         return menuBar;
     }
+
+    private static void getAboutUs(){
+        String message = "Hei! Dette er en veldig lang string som sikkert går utenfor window! Dette er About us section!";
+        NotificationPopUp.displayNotificationWindow(message);
+    }
+
+    private static void getHelp(){
+        String message = "Hei! Dette er en veldig lang string som sikkert går utenfor window! Dette er Help section!";
+        NotificationPopUp.displayNotificationWindow(message);
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/application/GUI/Panes/SideBar.java b/src/main/java/com/application/GUI/Panes/SideBar.java
index ac1de60476abae06046578f9a397a5e33c861a74..99838521013939f1da686c0c2079d768db560038 100644
--- a/src/main/java/com/application/GUI/Panes/SideBar.java
+++ b/src/main/java/com/application/GUI/Panes/SideBar.java
@@ -1,11 +1,8 @@
 package com.application.GUI.Panes;
 
 import com.application.DB.Constants;
-import com.application.DB.HelpingFunctions;
-import com.application.DB.Settings;
-import com.application.GUI.InputPopUpWindow;
-import com.application.GUI.LineChartFunctionality;
-import com.application.GUI.OutputPopUpWindow;
+import com.application.GUI.PopUpWindows.InputPopUpWindow;
+import com.application.GUI.PopUpWindows.OutputPopUpWindow;
 import com.application.GUI.ProgressBar.RingProgressIndicator;
 import com.application.Main;
 import javafx.application.Platform;
@@ -15,7 +12,6 @@ import javafx.scene.control.TextField;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
 
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import static com.application.DB.HelpingFunctions.isLoadedData;
diff --git a/src/main/java/com/application/GUI/InputPopUpWindow.java b/src/main/java/com/application/GUI/PopUpWindows/InputPopUpWindow.java
similarity index 99%
rename from src/main/java/com/application/GUI/InputPopUpWindow.java
rename to src/main/java/com/application/GUI/PopUpWindows/InputPopUpWindow.java
index a93361d7874382b70e7753b0035d80ef428217ac..1fa2d6957e8a215be23eb6e96dfbc96b25d5504a 100644
--- a/src/main/java/com/application/GUI/InputPopUpWindow.java
+++ b/src/main/java/com/application/GUI/PopUpWindows/InputPopUpWindow.java
@@ -1,4 +1,4 @@
-package com.application.GUI;
+package com.application.GUI.PopUpWindows;
 
 import com.application.DB.Constants;
 import javafx.application.Platform;
diff --git a/src/main/java/com/application/GUI/NotificationPopUp.java b/src/main/java/com/application/GUI/PopUpWindows/NotificationPopUp.java
similarity index 81%
rename from src/main/java/com/application/GUI/NotificationPopUp.java
rename to src/main/java/com/application/GUI/PopUpWindows/NotificationPopUp.java
index 7359602fe9f91010895655f3f9edce2136ddd71f..a94dbde51ac1ccaab7759ac1295a0f22eed060b3 100644
--- a/src/main/java/com/application/GUI/NotificationPopUp.java
+++ b/src/main/java/com/application/GUI/PopUpWindows/NotificationPopUp.java
@@ -1,10 +1,12 @@
-package com.application.GUI;
+package com.application.GUI.PopUpWindows;
 
+import com.application.GUI.PopUpWindows.InputPopUpWindow;
 import javafx.geometry.Pos;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.layout.VBox;
+import javafx.scene.text.TextAlignment;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
@@ -18,6 +20,8 @@ public class NotificationPopUp {
 
         Label messageLabel = new Label();
         messageLabel.setText(message);
+        messageLabel.setWrapText(true);
+        messageLabel.setTextAlignment(TextAlignment.CENTER);
 
         Button close = new Button("Close");
         close.setOnAction(event -> window.close());
diff --git a/src/main/java/com/application/GUI/OutputPopUpWindow.java b/src/main/java/com/application/GUI/PopUpWindows/OutputPopUpWindow.java
similarity index 96%
rename from src/main/java/com/application/GUI/OutputPopUpWindow.java
rename to src/main/java/com/application/GUI/PopUpWindows/OutputPopUpWindow.java
index fc44749b0a412c3fae803dc32e7bb063aa9baf46..c94a729cf5ce7a04d599b8f40b6d06d09b620b49 100644
--- a/src/main/java/com/application/GUI/OutputPopUpWindow.java
+++ b/src/main/java/com/application/GUI/PopUpWindows/OutputPopUpWindow.java
@@ -1,7 +1,9 @@
-package com.application.GUI;
+package com.application.GUI.PopUpWindows;
 
 import com.application.DB.Constants;
 import com.application.DB.DB;
+import com.application.GUI.PopUpWindows.InputPopUpWindow;
+import com.application.GUI.PopUpWindows.NotificationPopUp;
 import javafx.geometry.Pos;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java
index 761e4f516f6d52ae9373243fc6f4ddebb19d2e8e..aa0a52bea7b4baeab300b106f60eec5353820658 100644
--- a/src/main/java/com/application/Main.java
+++ b/src/main/java/com/application/Main.java
@@ -1,6 +1,6 @@
 package com.application;
 
-import com.application.GUI.InputPopUpWindow;
+import com.application.GUI.PopUpWindows.InputPopUpWindow;
 import com.application.GUI.Panes.BottomBar;
 import com.application.GUI.Panes.LogoBar;
 import com.application.GUI.Panes.SideBar;
@@ -14,7 +14,6 @@ import javafx.scene.layout.*;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 
 /**
@@ -100,7 +99,6 @@ public class Main extends Application {
         this.sideBar = sideBar1.createSideBar();
         this.logoBar = logoBar1.createLogoBar();
 
-
         LineChart<String, Number> lineChart = LineChartFunctionality.getLineChart();
 
         //Set id's to connect to css stylesheet
@@ -112,7 +110,6 @@ public class Main extends Application {
         this.bottomBar.setId("bottomBar");
         lineChart.setId("lineChart");
 
-
         // Sett the menubar in a vbox inorder to stretch over the whole screen
         VBox vBox = new VBox(this.menuBar);
 
diff --git a/target/classes/com/application/DB/Constants.class b/target/classes/com/application/DB/Constants.class
index 26210281ae400661b01ed5042905c7a853142fb2..4887ecccb0aecb7419aabd5a5d4c362b1a9c75e9 100644
Binary files a/target/classes/com/application/DB/Constants.class and b/target/classes/com/application/DB/Constants.class differ
diff --git a/target/classes/com/application/GUI/LineChartFunctionality.class b/target/classes/com/application/GUI/LineChartFunctionality.class
index 0767f763e7e9e84f6a730a6a8f12c261a0f1f02d..30bd0f2183c54ab6bccf4cc5eda99118dc7ac9f9 100644
Binary files a/target/classes/com/application/GUI/LineChartFunctionality.class and b/target/classes/com/application/GUI/LineChartFunctionality.class differ
diff --git a/target/classes/com/application/GUI/NotificationPopUp.class b/target/classes/com/application/GUI/NotificationPopUp.class
deleted file mode 100644
index a641aa4f3a2fbca07b4a00092023747f9151dd14..0000000000000000000000000000000000000000
Binary files a/target/classes/com/application/GUI/NotificationPopUp.class and /dev/null differ
diff --git a/target/classes/com/application/GUI/Panes/MenuBar.class b/target/classes/com/application/GUI/Panes/MenuBar.class
index f0739d79edee37306f75f45a673629ca1af4f02c..eb12162b61fb84ddc3e69ec508f7df592b17a1c6 100644
Binary files a/target/classes/com/application/GUI/Panes/MenuBar.class and b/target/classes/com/application/GUI/Panes/MenuBar.class differ
diff --git a/target/classes/com/application/GUI/Panes/SideBar$1WorkerThread.class b/target/classes/com/application/GUI/Panes/SideBar$1WorkerThread.class
index 450d307b1d6f8b2a24b00f5799befaf2063a31bd..bb54f0a22c4bec363dc81cddb6023fda37586d64 100644
Binary files a/target/classes/com/application/GUI/Panes/SideBar$1WorkerThread.class and b/target/classes/com/application/GUI/Panes/SideBar$1WorkerThread.class differ
diff --git a/target/classes/com/application/GUI/Panes/SideBar.class b/target/classes/com/application/GUI/Panes/SideBar.class
index f7ae4740731e37590f720ae00bef3fe68a0ffe60..33a2c4007598228d0ac1b13f37e5e234c21dd9e3 100644
Binary files a/target/classes/com/application/GUI/Panes/SideBar.class and b/target/classes/com/application/GUI/Panes/SideBar.class differ
diff --git a/target/classes/com/application/GUI/InputPopUpWindow.class b/target/classes/com/application/GUI/PopUpWindows/InputPopUpWindow.class
similarity index 85%
rename from target/classes/com/application/GUI/InputPopUpWindow.class
rename to target/classes/com/application/GUI/PopUpWindows/InputPopUpWindow.class
index 898b41a6d36e1fabd6cc47311f9b5f763ec5ba18..14172f83b8ac618bcbfec3aee8ee6ad8ab29040a 100644
Binary files a/target/classes/com/application/GUI/InputPopUpWindow.class and b/target/classes/com/application/GUI/PopUpWindows/InputPopUpWindow.class differ
diff --git a/target/classes/com/application/GUI/PopUpWindows/NotificationPopUp.class b/target/classes/com/application/GUI/PopUpWindows/NotificationPopUp.class
new file mode 100644
index 0000000000000000000000000000000000000000..848042985ce87564a882d2c011ae62fa5c50009e
Binary files /dev/null and b/target/classes/com/application/GUI/PopUpWindows/NotificationPopUp.class differ
diff --git a/target/classes/com/application/GUI/OutputPopUpWindow.class b/target/classes/com/application/GUI/PopUpWindows/OutputPopUpWindow.class
similarity index 56%
rename from target/classes/com/application/GUI/OutputPopUpWindow.class
rename to target/classes/com/application/GUI/PopUpWindows/OutputPopUpWindow.class
index 39f4796e632a139bc7a29d96281a03e3f290eb7f..5e2edd7365e0dfb11635952c63d89c5d844ff898 100644
Binary files a/target/classes/com/application/GUI/OutputPopUpWindow.class and b/target/classes/com/application/GUI/PopUpWindows/OutputPopUpWindow.class differ
diff --git a/target/classes/com/application/Main.class b/target/classes/com/application/Main.class
index ee3d701f0d6550698d1ac30cfa88421ea7d442ce..712fcdba727b41cb3bd273f43ab62a276c275282 100644
Binary files a/target/classes/com/application/Main.class and b/target/classes/com/application/Main.class differ