diff --git a/javadoc/NTNU/IDATT1002/controllers/ExploreController.html b/javadoc/NTNU/IDATT1002/controllers/ExploreController.html
index 6ce530c48e1914b846ecdbb49c1d72bd1898227f..c0abd3ce8b1d15dba3ecc32898ddb67fbd1e9f3e 100644
--- a/javadoc/NTNU/IDATT1002/controllers/ExploreController.html
+++ b/javadoc/NTNU/IDATT1002/controllers/ExploreController.html
@@ -124,7 +124,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>NTNU.IDATT1002.controllers.ExploreController</li>
+<li>NTNU.IDATT1002.controllers.Explore</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/NTNU/IDATT1002/controllers/LoggedInController.html b/javadoc/NTNU/IDATT1002/controllers/LoggedInController.html
index 195b2e81c30dfc58ae8e90ddffb77b2af1b7f152..9be724a54ec170a5e16f06c313e678e2a6faaf76 100644
--- a/javadoc/NTNU/IDATT1002/controllers/LoggedInController.html
+++ b/javadoc/NTNU/IDATT1002/controllers/LoggedInController.html
@@ -124,7 +124,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>NTNU.IDATT1002.controllers.LoggedInController</li>
+<li>NTNU.IDATT1002.controllers.Main</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/NTNU/IDATT1002/controllers/LoginController.html b/javadoc/NTNU/IDATT1002/controllers/LoginController.html
index 9e33576f0739ca133ce7debe6792f1552736ac61..18b4da4fb010175fd87e0b257b0e678ef019b9d1 100644
--- a/javadoc/NTNU/IDATT1002/controllers/LoginController.html
+++ b/javadoc/NTNU/IDATT1002/controllers/LoginController.html
@@ -124,7 +124,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>NTNU.IDATT1002.controllers.LoginController</li>
+<li>NTNU.IDATT1002.controllers.Login</li>
 </ul>
 </li>
 </ul>
diff --git a/javadoc/NTNU/IDATT1002/controllers/SignUpController.html b/javadoc/NTNU/IDATT1002/controllers/SignUpController.html
index 1bbc4c12def22b60d4544f3dae7ae29e51f9df94..62b0c419bb72d987bf12c69ded9c650e2b0a1ff2 100644
--- a/javadoc/NTNU/IDATT1002/controllers/SignUpController.html
+++ b/javadoc/NTNU/IDATT1002/controllers/SignUpController.html
@@ -124,7 +124,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>NTNU.IDATT1002.controllers.SignUpController</li>
+<li>NTNU.IDATT1002.controllers.SignUp</li>
 </ul>
 </li>
 </ul>
diff --git a/src/main/java/NTNU/IDATT1002/App.java b/src/main/java/NTNU/IDATT1002/App.java
index 3ea184e7f38b066750bc21a1e5c06a86e00600ac..7ab7324377bc9362cbc05e14b00b6293a6d125e1 100644
--- a/src/main/java/NTNU/IDATT1002/App.java
+++ b/src/main/java/NTNU/IDATT1002/App.java
@@ -1,5 +1,6 @@
 package NTNU.IDATT1002;
 
+import NTNU.IDATT1002.controllers.DataExchange;
 import NTNU.IDATT1002.repository.LoginRepository;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
@@ -16,12 +17,14 @@ import java.io.IOException;
 
 public class App extends Application {
 
+    public static DataExchange ex;
     private static Scene scene;
 
     private static Logger log;
 
     @Override
     public void start(Stage stage) throws IOException {
+        ex = new DataExchange();
         scene = new Scene(loadFXML("login"));
         stage.setScene(scene);
         stage.show();
diff --git a/src/main/java/NTNU/IDATT1002/controllers/DataExchange.java b/src/main/java/NTNU/IDATT1002/controllers/DataExchange.java
new file mode 100644
index 0000000000000000000000000000000000000000..c9d445206582c024f423ed1375134f16bf2a2987
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/DataExchange.java
@@ -0,0 +1,28 @@
+package NTNU.IDATT1002.controllers;
+
+import java.io.File;
+import java.util.List;
+
+public class DataExchange {
+    private String searchField;
+    private List<File> uploadedFiles;
+
+    public DataExchange(){
+        searchField = "";
+    }
+    public List<File> getUploadedFiles() {
+        return uploadedFiles;
+    }
+
+    public String getSearchField() {
+        return searchField;
+    }
+
+    public void setUploadedFiles(List<File> uploadedFiles) {
+        this.uploadedFiles = uploadedFiles;
+    }
+
+    public void setSearchField(String searchField) {
+        this.searchField = searchField;
+    }
+}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Explore.java b/src/main/java/NTNU/IDATT1002/controllers/Explore.java
new file mode 100644
index 0000000000000000000000000000000000000000..7e0f351a8e3abfc86e616c166561bcbbb8b2cbd2
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/Explore.java
@@ -0,0 +1,91 @@
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import javafx.event.ActionEvent;
+import javafx.scene.control.Button;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+
+import java.io.IOException;
+
+public class Explore {
+
+    public ImageView tbar_logo;
+    public TextField tbar_search;
+    public Button tbar_searchBtn;
+    public Button tbar_explore;
+    public Button tbar_map;
+    public Button tbar_upload;
+    public ScrollPane scrollPane;
+    public Button footer_previousBtn;
+    public Button footer_nextBtn;
+
+    /**
+     * Method that changes stage to Main page
+     * @param mouseEvent
+     * @throws IOException
+     */
+    public void switchToMain(MouseEvent mouseEvent) throws IOException {
+        App.setRoot("main");
+    }
+
+    /**
+     * Method that changes stage to Explore page
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToExplore(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore");
+    }
+
+    /**
+     * Method for switching to Map page
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToMap(ActionEvent actionEvent) throws IOException {
+        App.setRoot("map");
+    }
+
+    /**
+     * Method for switching to Search page. It reads the value of the search
+     * field and if not empty it is passed to dataexchange
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToSearch(ActionEvent actionEvent) throws IOException {
+        if (!tbar_search.getText().isEmpty()){
+            App.ex.setSearchField(tbar_search.getText());
+        }
+        App.setRoot("search");
+    }
+
+    /**
+     * Method for switching to Upload page
+     * @param actionEvent the mouse has done something
+     * @throws IOException this page does not exist
+     */
+    public void switchToUpload(ActionEvent actionEvent) throws IOException {
+        App.setRoot("upload");
+    }
+
+    /**
+     * Method that updates content to previous "page"
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToPrevious(ActionEvent actionEvent) throws IOException {
+        //TODO: Make method that updates content to previous "page"
+    }
+
+    /**
+     * Method that updates content to next "page"
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToNext(ActionEvent actionEvent) throws IOException {
+        //TODO: Make method that updates content to next "page"
+    }
+}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/ExploreController.java b/src/main/java/NTNU/IDATT1002/controllers/ExploreController.java
deleted file mode 100644
index 28dae0df85c2970efdecb2fdc09bacd4d2c30a65..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/controllers/ExploreController.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package NTNU.IDATT1002.controllers;
-
-import NTNU.IDATT1002.App;
-import javafx.event.ActionEvent;
-import javafx.scene.control.Button;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.TextField;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseEvent;
-
-import java.io.IOException;
-
-public class ExploreController {
-    public ImageView tbar_logo;
-    public TextField tbar_search;
-    public Button tbar_map;
-    public Button tbar_upload;
-    public ScrollPane scrollpane;
-    public Button footer_previous_page;
-    public Button footer_next_page;
-
-    public void switchToMain(MouseEvent mouseEvent) throws IOException {
-        App.setRoot("logged-in");
-    }
-
-    public void switchToSearch(ActionEvent actionEvent) throws IOException{
-        App.setRoot("search_page");
-    }
-
-    public void switchToMap(ActionEvent actionEvent) throws IOException{
-        App.setRoot("map_page");
-    }
-
-    public void switchToUpload(ActionEvent actionEvent) throws IOException{
-        App.setRoot("upload_page");
-    }
-
-    public void switchToPrevious(ActionEvent actionEvent) {
-
-    }
-
-    public void switchToNext(ActionEvent actionEvent) {
-
-    }
-}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/LoggedInController.java b/src/main/java/NTNU/IDATT1002/controllers/LoggedInController.java
deleted file mode 100644
index f3568912db9b0e2fb2400cba7137c9a2655ea5f0..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/controllers/LoggedInController.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package NTNU.IDATT1002.controllers;
-
-import NTNU.IDATT1002.App;
-import javafx.event.ActionEvent;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextField;
-import javafx.scene.image.ImageView;
-
-import java.io.IOException;
-
-public class LoggedInController {
-    public TextField tbar_search;
-    public ImageView tbar_logo;
-    public Button tbar_explore;
-    public Button tbar_map;
-    public Button tbar_upload;
-    public Button main_upload;
-    public Button tbar_searchButton;
-
-    public void switchToSearch(ActionEvent actionEvent) throws IOException {
-        App.setRoot("search_page");
-    }
-
-    public void switchToExplore(ActionEvent actionEvent) throws IOException {
-        App.setRoot("explore_page");
-    }
-
-    public void switchToMap(ActionEvent actionEvent) throws IOException {
-        App.setRoot("map_page");
-    }
-
-    public void switchToUpload(ActionEvent actionEvent) {
-
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Login.java b/src/main/java/NTNU/IDATT1002/controllers/Login.java
new file mode 100644
index 0000000000000000000000000000000000000000..4f9f87176143969f19454da9910feca226286767
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/Login.java
@@ -0,0 +1,31 @@
+package NTNU.IDATT1002.controllers;
+
+import java.io.IOException;
+
+import NTNU.IDATT1002.App;
+import javafx.event.ActionEvent;
+import javafx.scene.control.Button;
+
+public class Login {
+
+    public Button signup;
+    public Button login;
+
+    /**
+     * Method that switches to sign up page
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToSignup(ActionEvent actionEvent) throws IOException {
+        App.setRoot("signup");
+    }
+
+    /**
+     * Method that switches to main page
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToMain(ActionEvent actionEvent) throws IOException {
+        App.setRoot("main");
+    }
+}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/LoginController.java b/src/main/java/NTNU/IDATT1002/controllers/LoginController.java
deleted file mode 100644
index 1fd4db9edd06cc5c15e1a591111c0053c91f2ad5..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/controllers/LoginController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package NTNU.IDATT1002.controllers;
-
-import java.io.IOException;
-
-import NTNU.IDATT1002.App;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-
-public class LoginController {
-
-    @FXML
-    public void switchToSecondary() throws IOException {
-        App.setRoot("signup");
-    }
-
-
-    public void switchToLoggedIn(ActionEvent actionEvent) throws IOException {
-        App.setRoot("logged-in");
-    }
-}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Main.java b/src/main/java/NTNU/IDATT1002/controllers/Main.java
new file mode 100644
index 0000000000000000000000000000000000000000..e55a25abaa0b9c09df0b7adb5f685774c6512603
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/Main.java
@@ -0,0 +1,71 @@
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import javafx.event.ActionEvent;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextField;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+
+import java.io.IOException;
+
+public class Main {
+
+    public ImageView tbar_logo;
+    public TextField tbar_search;
+    public Button tbar_searchBtn;
+    public Button tbar_explore;
+    public Button tbar_map;
+    public Button tbar_upload;
+
+    public Button uploadBtn;
+
+    /**
+     * Method that changes stage to Main page
+     * @param mouseEvent
+     * @throws IOException
+     */
+    public void switchToMain(MouseEvent mouseEvent) throws IOException {
+        App.setRoot("main");
+    }
+
+    /**
+     * Method that changes stage to Explore page
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToExplore(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore");
+    }
+
+    /**
+     * Method for switching to Map page
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToMap(ActionEvent actionEvent) throws IOException {
+        App.setRoot("map");
+    }
+
+    /**
+     * Method for switching to Search page. It reads the value of the search
+     * field and if not empty it is passed to dataexchange
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToSearch(ActionEvent actionEvent) throws IOException {
+        if (!tbar_search.getText().isEmpty()){
+            App.ex.setSearchField(tbar_search.getText());
+        }
+        App.setRoot("search");
+    }
+
+    /**
+     * Method for switching to Upload page
+     * @param actionEvent the mouse has done something
+     * @throws IOException this page does not exist
+     */
+    public void switchToUpload(ActionEvent actionEvent) throws IOException {
+        App.setRoot("upload");
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Map.java b/src/main/java/NTNU/IDATT1002/controllers/Map.java
new file mode 100644
index 0000000000000000000000000000000000000000..78acd3b316c6f22f8879ca0d1e9f4e070a178680
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/Map.java
@@ -0,0 +1,80 @@
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import javafx.event.ActionEvent;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextField;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+
+import java.io.IOException;
+
+public class Map {
+    public ImageView tbar_logo;
+    public TextField tbar_search;
+    public Button tbar_searchBtn;
+    public Button tbar_explore;
+    public Button tbar_map;
+    public Button tbar_upload;
+
+    public TextField search;
+    public Button searchBtn;
+
+    /**
+     * Method that changes stage to Main page
+     * @param mouseEvent
+     * @throws IOException
+     */
+    public void switchToMain(MouseEvent mouseEvent) throws IOException {
+        App.setRoot("main");
+    }
+
+    /**
+     * Method that changes stage to Explore page
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToExplore(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore");
+    }
+
+    /**
+     * Method for switching to Map page
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToMap(ActionEvent actionEvent) throws IOException {
+        App.setRoot("map");
+    }
+
+    /**
+     * Method for switching to Search page. It reads the value of the search
+     * field and if not empty it is passed to dataexchange
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToSearch(ActionEvent actionEvent) throws IOException {
+        if (!tbar_search.getText().isEmpty()){
+            App.ex.setSearchField(tbar_search.getText());
+        }
+        App.setRoot("search");
+    }
+
+    /**
+     * Method for switching to Upload page
+     * @param actionEvent the mouse has done something
+     * @throws IOException this page does not exist
+     */
+    public void switchToUpload(ActionEvent actionEvent) throws IOException {
+        App.setRoot("upload");
+    }
+
+    /**
+     * Method that searches for images on a specific place
+     * @param actionEvent
+     */
+    public void MapSearch(ActionEvent actionEvent) {
+        //TODO: Make method
+    }
+}
+
diff --git a/src/main/java/NTNU/IDATT1002/controllers/MapPageController.java b/src/main/java/NTNU/IDATT1002/controllers/MapPageController.java
deleted file mode 100644
index 536ab603089b9de5ad8e3900d737067b005d7695..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/controllers/MapPageController.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package NTNU.IDATT1002.controllers;
-
-import NTNU.IDATT1002.App;
-import javafx.event.ActionEvent;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextArea;
-import javafx.scene.control.TextField;
-import javafx.scene.image.ImageView;
-
-import java.io.IOException;
-
-public class MapPageController {
-    public TextField tbar_search;
-    public ImageView tbar_logo;
-    public Button tbar_explore;
-    public Button tbar_map;
-    public Button tbar_upload;
-    public Button map_search_button;
-    public TextField map_search_field;
-
-    public void switchToSearch(ActionEvent actionEvent) throws IOException {
-        App.setRoot("search_page");
-    }
-
-    public void switchToUpload(ActionEvent actionEvent) throws IOException {
-        App.setRoot("upload_page");
-    }
-
-    public void switchToMap(ActionEvent actionEvent) throws IOException {
-        App.setRoot("map_page");
-    }
-
-    public void switchToExplore(ActionEvent actionEvent) throws IOException {
-        App.setRoot("explore_page");
-    }
-
-    public void MapSearch(ActionEvent actionEvent) {
-
-    }
-}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Search.java b/src/main/java/NTNU/IDATT1002/controllers/Search.java
new file mode 100644
index 0000000000000000000000000000000000000000..f75a62a77eb3cea6f2fe6d14f532f4510f20775b
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/Search.java
@@ -0,0 +1,113 @@
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import javafx.event.ActionEvent;
+import javafx.fxml.Initializable;
+import javafx.scene.control.Button;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.text.Text;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.ResourceBundle;
+
+public class Search implements Initializable {
+
+    public ImageView tbar_logo;
+    public TextField tbar_search;
+    public Button tbar_searchBtn;
+    public Button tbar_explore;
+    public Button tbar_map;
+    public Button tbar_upload;
+
+    public Text search_result;
+    public ScrollPane scrollpane;
+    public ChoiceBox sorted_by_choicebox;
+
+    public Button footer_previousBtn;
+    public Button footer_nextBtn;
+
+
+    /**
+     * Method that writes the word that is searched for
+     * @param location
+     * @param resources
+     */
+    public void initialize(URL location, ResourceBundle resources) {
+    if (!App.ex.getSearchField().isEmpty()){
+            search_result.setText(App.ex.getSearchField());
+        }
+    }
+
+    /**
+     * Method that changes stage to Main page
+     * @param mouseEvent
+     * @throws IOException
+     */
+    public void switchToMain(MouseEvent mouseEvent) throws IOException {
+        App.setRoot("main");
+    }
+
+    /**
+     * Method that changes stage to Explore page
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToExplore(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore");
+    }
+
+    /**
+     * Method for switching to Map page
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToMap(ActionEvent actionEvent) throws IOException {
+        App.setRoot("map");
+    }
+
+    /**
+     * Method for switching to Search page. It reads the value of the search
+     * field and if not empty it is passed to dataexchange
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToSearch(ActionEvent actionEvent) throws IOException {
+        if (!tbar_search.getText().isEmpty()){
+            App.ex.setSearchField(tbar_search.getText());
+        }
+        App.setRoot("search");
+    }
+
+    /**
+     * Method for switching to Upload page
+     * @param actionEvent the mouse has done something
+     * @throws IOException this page does not exist
+     */
+    public void switchToUpload(ActionEvent actionEvent) throws IOException {
+        App.setRoot("upload");
+    }
+
+    /**
+     * Method that updates content to previous "page"
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToPrevious(ActionEvent actionEvent) throws IOException {
+        //TODO: Make method that updates content to previous "page"
+    }
+
+    /**
+     * Method that updates content to next "page"
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToNext(ActionEvent actionEvent) throws IOException {
+        //TODO: Make method that updates content to next "page"
+    }
+}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/SearchPageController.java b/src/main/java/NTNU/IDATT1002/controllers/SearchPageController.java
deleted file mode 100644
index c6c0f5b78dad357fc08a902976ed4e26236aaee8..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/controllers/SearchPageController.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package NTNU.IDATT1002.controllers;
-
-import NTNU.IDATT1002.App;
-import javafx.event.ActionEvent;
-import javafx.scene.control.Button;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.TextField;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseEvent;
-
-import java.io.IOException;
-
-public class SearchPageController {
-    public ImageView tbar_logo;
-    public TextField tbar_search;
-    public Button tbar_map;
-    public Button tbar_upload;
-    public ScrollPane scrollpane;
-    public Button footer_previous_page;
-    public Button footer_next_page;
-    public ImageView tbar_logo1;
-    public TextField tbar_search1;
-    public Button tbar_map1;
-    public Button tbar_upload1;
-
-    public void switchToSearch(ActionEvent actionEvent) {
-
-    }
-
-    public void switchToMain(MouseEvent mouseEvent) {
-
-    }
-
-    public void switchToMap(ActionEvent actionEvent) throws IOException {
-        App.setRoot("map_page");
-    }
-
-    public void switchToUpload(ActionEvent actionEvent) {
-
-    }
-
-    public void switchToPrevious(ActionEvent actionEvent) {
-
-    }
-
-    public void switchToNext(ActionEvent actionEvent) throws IOException {
-        App.setRoot("search_page_2");
-    }
-}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/SignUp.java b/src/main/java/NTNU/IDATT1002/controllers/SignUp.java
new file mode 100644
index 0000000000000000000000000000000000000000..39792ecd96b1f8761adf4ac77926b637a4374fb4
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/SignUp.java
@@ -0,0 +1,21 @@
+package NTNU.IDATT1002.controllers;
+
+import java.io.IOException;
+
+import NTNU.IDATT1002.App;
+import javafx.event.ActionEvent;
+import javafx.scene.control.Button;
+
+public class SignUp {
+
+    public Button signup;
+
+    /**
+     * Method that switches to login page
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToLogin(ActionEvent actionEvent) throws IOException {
+        App.setRoot("login");
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/NTNU/IDATT1002/controllers/SignUpController.java b/src/main/java/NTNU/IDATT1002/controllers/SignUpController.java
deleted file mode 100644
index 29be8feeee66493b2712950a230d29d97eada3b5..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/controllers/SignUpController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package NTNU.IDATT1002.controllers;
-
-import java.io.IOException;
-
-import NTNU.IDATT1002.App;
-import javafx.fxml.FXML;
-
-public class SignUpController {
-
-    @FXML
-    public void switchToPrimary() throws IOException {
-        App.setRoot("login");
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Upload.java b/src/main/java/NTNU/IDATT1002/controllers/Upload.java
new file mode 100644
index 0000000000000000000000000000000000000000..baeed8c2edb3dc9e284db4e246a796418d2ede1c
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/Upload.java
@@ -0,0 +1,183 @@
+/**
+ * Controls the buttons and changable elements on upload page
+ * @version 1.0 17.03.2020
+ * @author Simon Jensen
+ */
+
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import javafx.event.ActionEvent;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextField;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.DragEvent;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.input.TransferMode;
+import javafx.scene.layout.Pane;
+import javafx.stage.FileChooser;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class Upload {
+    public ImageView tbar_logo;
+    public TextField tbar_search;
+    public Button tbar_searchBtn;
+    public Button tbar_explore;
+    public Button tbar_map;
+    public Button tbar_upload;
+
+    public Button uploadBtn;
+    public Pane drag_drop;
+
+    /**
+     * Method that changes stage to Main page
+     * @param mouseEvent
+     * @throws IOException
+     */
+    public void switchToMain(MouseEvent mouseEvent) throws IOException {
+        App.setRoot("main");
+    }
+
+    /**
+     * Method that changes stage to Explore page
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToExplore(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore");
+    }
+
+    /**
+     * Method for switching to Map page
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToMap(ActionEvent actionEvent) throws IOException {
+        App.setRoot("map");
+    }
+
+    /**
+     * Method for switching to Search page. It reads the value of the search
+     * field and if not empty it is passed to dataexchange
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToSearch(ActionEvent actionEvent) throws IOException {
+        if (!tbar_searchBtn.getText().isEmpty()){
+            App.ex.setSearchField(tbar_search.getText());
+        }
+        App.setRoot("search");
+    }
+
+    /**
+     * Method for switching to Upload page
+     * @param actionEvent the mouse has done something
+     * @throws IOException this page does not exist
+     */
+    public void switchToUpload(ActionEvent actionEvent) throws IOException {
+        App.setRoot("upload");
+    }
+
+
+    /**
+     * Method that opens file browser with an image filter
+     * The user chooses what files to upload
+     * @throws IOException
+     */
+    public void chooseFile() throws IOException {
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Choose files to upload");
+        fileChooser.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("Image Files", "*.png","*.jpg", "*.jpeg"));
+        // Show save file dialog
+        List<File> list = fileChooser.showOpenMultipleDialog(uploadBtn.getScene().getWindow());
+
+        if(!list.isEmpty()){
+            App.ex.setUploadedFiles(list);
+            if (list.size() == 1){
+                switchToUploadedPhoto();
+            }
+            else {
+                switchToUploadedAlbum();
+            }
+        }
+    }
+
+    /**
+     * Method that finds the extension/ file type
+     * @param fileName the name of the file (img.jpg, img2.png ect.)
+     * @return file extension (jpg, png ect.)
+     */
+    public String getExtension(String fileName){
+        String extension = "";
+
+        int i = fileName.lastIndexOf('.');
+        //if the name is not empty
+        if (i > 0 && i < fileName.length() - 1){
+            return fileName.substring(i + 1).toLowerCase();
+        }
+        return extension;
+    }
+
+    /**
+     * Method that decides if something hoovered over the pane is acceptable
+     * Called when something is hoovered over the pane
+     * @param event something is dragged over the container
+     */
+    public void acceptDrop(DragEvent event) {
+        //TODO: Choose valid file types
+        List<String> validExtensions = Arrays.asList("jpg", "png", "jpeg");
+        //Checks if the event contains files
+        if(event.getDragboard().hasFiles()){
+            //If not all files hoovered is in validExtension
+            if (!validExtensions.containsAll(
+                    event.getDragboard().getFiles().stream()
+                            .map(file -> getExtension(file.getName()))
+                            .collect(Collectors.toList()))) {
+
+                event.consume();
+                return;
+            }
+            //Makes it possible to transfer/drop the files
+            event.acceptTransferModes(TransferMode.ANY);
+        }
+    }
+
+    /**
+     * Method that stores the dropped files
+     * @param event something is dropped into the container
+     * @throws IOException
+     */
+    public void droppedFiles(DragEvent event) throws IOException {
+        List<File> list = event.getDragboard().getFiles();
+        if(!list.isEmpty()){
+            App.ex.setUploadedFiles(list);
+            if (list.size() == 1){
+                switchToUploadedPhoto();
+            }
+            else {
+                switchToUploadedAlbum();
+            }
+        }
+    }
+
+    /**
+     * Method that switches to Uploaded Photo page
+     * @throws IOException
+     */
+    public void switchToUploadedPhoto() throws IOException {
+        App.setRoot("uploaded_photo");
+    }
+
+    /**
+     * Method that switches to Uploaded Album page
+     * @throws IOException
+     */
+    private void switchToUploadedAlbum() throws IOException {
+        App.setRoot("uploaded_album");
+    }
+}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/UploadController.java b/src/main/java/NTNU/IDATT1002/controllers/UploadController.java
deleted file mode 100644
index 27998d535eb00db737ed82530d374eecd12cd514..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/controllers/UploadController.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * Controls the buttons and changable elements on upload page
- * @version 1.0 17.03.2020
- * @author Simon Jensen
- */
-
-package NTNU.IDATT1002.controllers;
-
-import NTNU.IDATT1002.App;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextField;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.DragEvent;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.input.TransferMode;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.VBox;
-import javafx.stage.FileChooser;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class UploadController {
-    public Button uploadBtn;
-    public VBox thumbnailsField;
-    public Pane dragDropField;
-    public TextField searchField;
-
-    /**
-     * Method that changes stage to Explore page
-     * @throws IOException
-     */
-    public void switchToExplore() throws IOException {
-        App.setRoot("explore");
-    }
-
-    /**
-     * Method that changes stage to Album page
-     * @throws IOException
-     */
-    public void switchToAlbum() throws IOException {
-        App.setRoot("album");
-    }
-
-    /**
-     * Method that changes stage to Map page
-     * @throws IOException
-     */
-    public void switchToMap() throws IOException {
-        App.setRoot("map");
-    }
-
-    /**
-     * Method for searching by tags, ect.
-     * @param keyEvent
-     */
-    public void search(KeyEvent keyEvent) {
-        //TODO: Make search method
-    }
-
-    /**
-     * Method that opens filebrowser with an image filter.
-     * The user chooses what files to upload
-     * @throws MalformedURLException
-     */
-    public void chooseFile() throws MalformedURLException {
-        FileChooser fileChooser = new FileChooser();
-        fileChooser.setTitle("Choose image files");
-        fileChooser.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("Image Files", "*.png","*.jpg", "*.jpeg"));
-        // Show save file dialog
-        List<File> list = fileChooser.showOpenMultipleDialog(uploadBtn.getScene().getWindow());
-
-        if (list != null){
-            for (File file : list){
-                //Made a method to confirm that the images was uploaded correctly
-                addThumbnail(file);
-            }
-        }
-    }
-
-    /**
-     * Method that finds the extension/filetype
-     * @param fileName the name of the file (img.jpg ect.)
-     * @return file extension (jpg, png ect.)
-     */
-    public String getExtension(String fileName){
-        String extension = "";
-
-        int i = fileName.lastIndexOf('.');
-        //if the name is not empty
-        if (i > 0 && i < fileName.length() - 1){
-            return fileName.substring(i + 1).toLowerCase();
-        }
-        return extension;
-    }
-
-    /**
-     * Method that decides whenever the file hoovered over the pane is valid or not.
-     * Called when something is hoovered over the pane.
-     * @param event something is dragged over the container
-     */
-    public void acceptDrop(DragEvent event) {
-        // Extensions that are valid to be drag-n-dropped
-        //TODO: Choose valid file types
-        List<String> validExtensions = Arrays.asList("jpg", "png", "jpeg");
-        //Checks if the event contains files
-        if(event.getDragboard().hasFiles()){
-            if (!validExtensions.containsAll(
-                    //Makes a list out of the events file extensions
-                    event.getDragboard().getFiles().stream()
-                            .map(file -> getExtension(file.getName()))
-                            .collect(Collectors.toList()))) {
-
-                event.consume();
-                return;
-            }
-            //Makes it possible to transfer the files
-            event.acceptTransferModes(TransferMode.ANY);
-        }
-    }
-
-    /**
-     * Method that stores the dropped files. It is not possible to transfer files
-     * without them already being accepted in acceptDrop() method.
-     * @param event something is dropped into the container
-     * @throws MalformedURLException
-     */
-    public void droppedFiles(DragEvent event) throws MalformedURLException {
-        List<File> list = event.getDragboard().getFiles();
-        for (File file : list){
-            addThumbnail(file);
-        }
-    }
-
-    /**
-     * Test-method to confirm that the image drop went well
-     * @param file an image file
-     * @throws MalformedURLException
-     */
-    //TODO: Remove method?
-    public void addThumbnail(File file) throws MalformedURLException {
-        Image image = new Image(file.toURI().toURL().toString());
-        ImageView view = new ImageView();
-        view.setImage(image);
-
-        //setting the fit height and width of the image view
-        view.setFitHeight(30);
-        view.setFitWidth(30);
-
-        thumbnailsField.getChildren().add(view);
-    }
-}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/UploadedAlbum.java b/src/main/java/NTNU/IDATT1002/controllers/UploadedAlbum.java
new file mode 100644
index 0000000000000000000000000000000000000000..ff5959237dfe6960d4eff05d9f75cf787831e7d7
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/UploadedAlbum.java
@@ -0,0 +1,104 @@
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import javafx.event.ActionEvent;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+
+import java.io.IOException;
+
+public class UploadedAlbum {
+
+
+    public ImageView tbar_logo;
+    public TextField tbar_search;
+    public Button tbar_searchBtn;
+    public Button tbar_explore;
+    public Button tbar_map;
+    public Button tbar_upload;
+
+    public TextField photo_title;
+    public TextField photo_tag;
+    public TextArea photo_desc;
+    public ImageView photo_image;
+
+    public TextField photo_title2;
+    public TextField photo_tag2;
+    public TextArea photo_desc2;
+    public ImageView photo_image2;
+
+    public TextField photo_title3;
+    public TextField photo_tag3;
+    public TextArea photo_desc3;
+    public ImageView photo_image3;
+
+    public TextField photo_title4;
+    public TextField photo_tag4;
+    public TextArea photo_desc4;
+    public ImageView photo_image4;
+
+    public Button acceptBtn;
+
+    /**
+     * Method that changes stage to Main page
+     * @param mouseEvent
+     * @throws IOException
+     */
+    public void switchToMain(MouseEvent mouseEvent) throws IOException {
+        App.setRoot("main");
+    }
+
+    /**
+     * Method that changes stage to Explore page
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToExplore(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore");
+    }
+
+    /**
+     * Method for switching to Map page
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToMap(ActionEvent actionEvent) throws IOException {
+        App.setRoot("map");
+    }
+
+    /**
+     * Method for switching to Search page. It reads the value of the search
+     * field and if not empty it is passed to dataexchange
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToSearch(ActionEvent actionEvent) throws IOException {
+        if (!tbar_search.getText().isEmpty()){
+            App.ex.setSearchField(tbar_search.getText());
+        }
+        App.setRoot("search");
+    }
+
+    /**
+     * Method for switching to Upload page.
+     * @param actionEvent the mouse has done something
+     * @throws IOException this page does not exist
+     */
+    public void switchToUpload(ActionEvent actionEvent) throws IOException {
+        App.setRoot("upload");
+    }
+
+    /**
+     * Method for uploading image with title, tags and description to database
+     * Image itself is not stored but Url is
+     * @param actionEvent the mouse has done something
+     * @throws IOException this page does not exist
+     */
+    public void uploadAlbum(ActionEvent actionEvent) throws IOException {
+        //TODO: write method to accept and upload the photo with chosen settings, titles etc and then setRoot to main page
+        App.setRoot("main");
+    }
+}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/UploadedAlbumController.java b/src/main/java/NTNU/IDATT1002/controllers/UploadedAlbumController.java
deleted file mode 100644
index 588a14a63f41bd7a770f400935ebe011a05589c0..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/controllers/UploadedAlbumController.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package NTNU.IDATT1002.controllers;
-
-import NTNU.IDATT1002.App;
-import javafx.event.ActionEvent;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextArea;
-import javafx.scene.control.TextField;
-import javafx.scene.image.ImageView;
-
-import java.io.IOException;
-
-public class UploadedAlbumController {
-    public TextField tbar_search;
-    public ImageView tbar_logo;
-    public Button tbar_explore;
-    public Button tbar_map;
-    public Button tbar_upload;
-    public Button accept_button;
-    public TextField title_field;
-    public TextField tag_field;
-    public TextArea desc_field;
-    public ImageView uploaded_image;
-
-    public void switchToSearch(ActionEvent actionEvent) {
-
-    }
-
-    public void switchToUpload(ActionEvent actionEvent) {
-
-    }
-
-    public void switchToMap(ActionEvent actionEvent) throws IOException {
-        App.setRoot("map_page");
-    }
-
-    public void switchToExplore(ActionEvent actionEvent) {
-
-    }
-
-    public void uploadAlbum(ActionEvent actionEvent) throws IOException {
-        //write method to accept and upload the photo with chosen settings, titles etc and then setRoot to logged-in page
-        App.setRoot("logged-in");
-    }
-}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/UploadedPhoto.java b/src/main/java/NTNU/IDATT1002/controllers/UploadedPhoto.java
new file mode 100644
index 0000000000000000000000000000000000000000..10959e0afad678b88e892a4ad3a1a654141bce25
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/UploadedPhoto.java
@@ -0,0 +1,104 @@
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import javafx.event.ActionEvent;
+import javafx.fxml.Initializable;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.ResourceBundle;
+
+public class UploadedPhoto implements Initializable {
+
+
+    public ImageView tbar_logo;
+    public TextField tbar_search;
+    public Button tbar_searchBtn;
+    public Button tbar_explore;
+    public Button tbar_map;
+    public Button tbar_upload;
+
+    public TextField photo_title;
+    public TextField photo_tag;
+    public TextArea photo_desc;
+    public ImageView photo_image;
+
+    public Button acceptBtn;
+
+
+    /**
+     * Method that runs when the controller is loaded
+     * Sets the image url on the page to be the uploaded images url
+     * @param location
+     * @param resources
+     */
+    public void initialize(URL location, ResourceBundle resources) {
+        photo_image.setImage(new Image(App.ex.getUploadedFiles().get(0).toURI().toString()));
+    }
+
+    /**
+     * Method that changes stage to Main page
+     * @param mouseEvent
+     * @throws IOException
+     */
+    public void switchToMain(MouseEvent mouseEvent) throws IOException {
+        App.setRoot("main");
+    }
+
+    /**
+     * Method that changes stage to Explore page
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToExplore(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore");
+    }
+
+    /**
+     * Method for switching to Map page
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToMap(ActionEvent actionEvent) throws IOException {
+        App.setRoot("map");
+    }
+
+    /**
+     * Method for switching to Search page. It reads the value of the search
+     * field and if not empty it is passed to dataexchange
+     * @param actionEvent
+     * @throws IOException
+     */
+    public void switchToSearch(ActionEvent actionEvent) throws IOException {
+        if (!tbar_search.getText().isEmpty()){
+            App.ex.setSearchField(tbar_search.getText());
+        }
+        App.setRoot("search");
+    }
+
+    /**
+     * Method for switching to Upload page
+     * @param actionEvent the mouse has done something
+     * @throws IOException this page does not exist
+     */
+    public void switchToUpload(ActionEvent actionEvent) throws IOException {
+        App.setRoot("upload");
+    }
+
+    /**
+     * Method for uploading image with title, tags and description to database
+     * Image itself is not stored but Url is
+     * @param actionEvent the mouse has done something
+     * @throws IOException this page does not exist
+     */
+    public void uploadPhoto(ActionEvent actionEvent) throws IOException {
+        //TODO: write method to accept and upload the photo with chosen settings, titles etc and then setRoot to logged-in page
+        App.setRoot("main");
+    }
+}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/UploadedPhotoController.java b/src/main/java/NTNU/IDATT1002/controllers/UploadedPhotoController.java
deleted file mode 100644
index eefd427057ae2fe3e78c8f548dee93dcd9c57748..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/controllers/UploadedPhotoController.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package NTNU.IDATT1002.controllers;
-
-import NTNU.IDATT1002.App;
-import javafx.event.ActionEvent;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextArea;
-import javafx.scene.control.TextField;
-import javafx.scene.image.ImageView;
-
-import java.io.IOException;
-
-public class UploadedPhotoController {
-    public TextField tbar_search;
-    public ImageView tbar_logo;
-    public Button tbar_explore;
-    public Button tbar_map;
-    public Button tbar_upload;
-    public TextField title_field;
-    public TextField tag_field;
-    public TextArea desc_field;
-    public Button accept_button;
-    public ImageView uploaded_image;
-
-    public void switchToSearch(ActionEvent actionEvent) throws IOException {
-        App.setRoot("search_page");
-    }
-
-    public void switchToUpload(ActionEvent actionEvent) throws IOException {
-        App.setRoot("upload_page");
-    }
-
-    public void switchToMap(ActionEvent actionEvent) throws IOException {
-        App.setRoot("map_page");
-    }
-
-    public void switchToExplore(ActionEvent actionEvent) throws IOException {
-        App.setRoot("explore_page");
-    }
-
-    public void uploadPhoto(ActionEvent actionEvent) throws IOException {
-        //write method to accept and upload the photo with chosen settings, titles etc and then setRoot to logged-in page
-        App.setRoot("logged-in");
-    }
-}
diff --git a/src/main/resources/NTNU/IDATT1002/explore_page.fxml b/src/main/resources/NTNU/IDATT1002/explore.fxml
similarity index 91%
rename from src/main/resources/NTNU/IDATT1002/explore_page.fxml
rename to src/main/resources/NTNU/IDATT1002/explore.fxml
index 73ffebaed3b9711b4c26da4331f1a8bfa2d391d3..45d8e8f17774c61ea9dcdf188e6d10deb29652ac 100644
--- a/src/main/resources/NTNU/IDATT1002/explore_page.fxml
+++ b/src/main/resources/NTNU/IDATT1002/explore.fxml
@@ -13,23 +13,25 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<AnchorPane maxHeight="1080.0" maxWidth="1920.0" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.ExploreController">
+<AnchorPane maxHeight="1080.0" maxWidth="1920.0" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.Explore">
    <children>
       <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
-            <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+            <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
                <image>
                   <Image url="@../../Images/PlaceholderLogo.png" />
                </image>
             </ImageView>
             <Pane prefHeight="100.0" prefWidth="343.0" />
-            <TextField fx:id="tbar_search" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
-            <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+            <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+            <Button fx:id="tbar_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
+            <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
+            <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
             <Pane prefHeight="100.0" prefWidth="174.0" />
-            <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+            <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
          </children>
       </HBox>
-      <ScrollPane fx:id="scrollpane" hbarPolicy="NEVER" layoutY="100.0" prefHeight="980.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="100.0">
+      <ScrollPane fx:id="scrollPane" hbarPolicy="NEVER" layoutY="100.0" prefHeight="980.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="100.0">
          <content>
             <AnchorPane maxHeight="1920.0" minHeight="0.0" minWidth="0.0" prefHeight="2000.0" prefWidth="1920.0">
                <children>
@@ -151,8 +153,8 @@
                            <children>
                               <HBox alignment="CENTER" layoutY="-2.0" prefHeight="84.0" prefWidth="1920.0" spacing="20.0">
                                  <children>
-                                    <Button fx:id="footer_previous_page" mnemonicParsing="false" onAction="#switchToPrevious" text="PREVIOUS" />
-                                    <Button fx:id="footer_next_page" layoutX="944.0" layoutY="48.0" mnemonicParsing="false" onAction="#switchToNext" text="NEXT" />
+                                    <Button fx:id="footer_previousBtn" onAction="#switchToPrevious" mnemonicParsing="false" text="PREVIOUS" />
+                                    <Button fx:id="footer_nextBtn" onAction="#switchToNext" layoutX="944.0" layoutY="48.0" mnemonicParsing="false" text="NEXT" />
                                  </children>
                               </HBox>
                            </children></Pane>
diff --git a/src/main/resources/NTNU/IDATT1002/login.fxml b/src/main/resources/NTNU/IDATT1002/login.fxml
index 93175963fe8fb52f92363440ceca60870ed5195a..9070e4a353bd0f7f91032230c13f4059869a6420 100644
--- a/src/main/resources/NTNU/IDATT1002/login.fxml
+++ b/src/main/resources/NTNU/IDATT1002/login.fxml
@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Text?>
 
-<VBox alignment="CENTER" prefHeight="1080.0" prefWidth="1920.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.LoginController">
+<VBox alignment="CENTER" prefHeight="1080.0" prefWidth="1920.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.Login">
    <children>
       <Label text="Login Page" />
       <GridPane hgap="10.0" maxWidth="300.0" prefHeight="90.0" prefWidth="200.0" vgap="10.0">
@@ -29,8 +29,8 @@
             <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Password:" GridPane.halignment="RIGHT" GridPane.rowIndex="1" />
             <TextField GridPane.columnIndex="1" />
             <PasswordField GridPane.columnIndex="1" GridPane.rowIndex="1" />
-            <Button fx:id="primaryButton" onAction="#switchToSecondary" text="Sign Up" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="2" />
-            <Button fx:id="primaryButton1" layoutX="171.0" layoutY="74.0" onAction="#switchToLoggedIn" text="Log In" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowIndex="2" />
+            <Button fx:id="signup" onAction="#switchToSignup" text="Sign Up" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="2" />
+            <Button fx:id="login" onAction="#switchToMain" layoutX="171.0" layoutY="74.0" text="Log In" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowIndex="2" />
          </children>
          <padding>
             <Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
diff --git a/src/main/resources/NTNU/IDATT1002/logged-in.fxml b/src/main/resources/NTNU/IDATT1002/main.fxml
similarity index 58%
rename from src/main/resources/NTNU/IDATT1002/logged-in.fxml
rename to src/main/resources/NTNU/IDATT1002/main.fxml
index c6d85c728fa1531738310645f286383249108e85..10aae0d442b44e7f7fc513acdae7c3213df6335d 100644
--- a/src/main/resources/NTNU/IDATT1002/logged-in.fxml
+++ b/src/main/resources/NTNU/IDATT1002/main.fxml
@@ -10,29 +10,29 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.LoggedInController">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.Main">
    <children>
       <VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
-            <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="200.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+            <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                <children>
-                  <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
+                  <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
                      <image>
                         <Image url="@../../Images/PlaceholderLogo.png" />
                      </image>
                   </ImageView>
                   <Pane prefHeight="100.0" prefWidth="343.0" />
-                  <TextField fx:id="tbar_search" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
-                  <Button fx:id="tbar_searchButton" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
-                  <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
-                  <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+                  <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+                  <Button fx:id="tbar_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
+                  <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
+                  <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
                   <Pane prefHeight="100.0" prefWidth="174.0" />
-                  <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+                  <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
                </children>
             </HBox>
             <HBox alignment="CENTER" prefHeight="982.0" prefWidth="1920.0">
                <children>
-                  <Button fx:id="main_upload" mnemonicParsing="false" text="UPLOAD">
+                  <Button fx:id="uploadBtn" onAction="#switchToUpload" mnemonicParsing="false" text="UPLOAD">
                      <font>
                         <Font size="60.0" />
                      </font>
diff --git a/src/main/resources/NTNU/IDATT1002/map.fxml b/src/main/resources/NTNU/IDATT1002/map.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..5a32ad6630add5e93c1d0dff644e3b3bceb1ce0f
--- /dev/null
+++ b/src/main/resources/NTNU/IDATT1002/map.fxml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+<?import javafx.scene.web.WebView?>
+
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.Map">
+    <children>
+        <VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+            <children>
+                <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                    <children>
+                        <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
+                            <image>
+                                <Image url="@../../Images/PlaceholderLogo.png" />
+                            </image>
+                        </ImageView>
+                        <Pane prefHeight="100.0" prefWidth="343.0" />
+                        <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+                        <Button fx:id="tbar_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
+                        <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
+                        <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
+                        <Pane prefHeight="100.0" prefWidth="174.0" />
+                        <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+                    </children>
+                </HBox>
+                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="183.0" prefWidth="1918.0" style="-fx-background-color: #888888;">
+                    <children>
+                        <TextField fx:id="search" layoutX="626.0" layoutY="70.0" prefHeight="44.0" prefWidth="664.0" promptText="Search for your location">
+                            <font>
+                                <Font size="18.0" />
+                            </font>
+                        </TextField>
+                        <Text layoutX="508.0" layoutY="100.0" strokeType="OUTSIDE" strokeWidth="0.0" text="SEARCH:">
+                            <font>
+                                <Font name="System Bold" size="24.0" />
+                            </font>
+                        </Text>
+                        <Button fx:id="searchBtn" onAction="#MapSearch" layoutX="1314.0" layoutY="70.0" mnemonicParsing="false" prefHeight="44.0" prefWidth="99.0" text="SEARCH">
+                            <font>
+                                <Font size="18.0" />
+                            </font>
+                        </Button>
+                    </children>
+                </AnchorPane>
+                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="797.0" prefWidth="1920.0" style="-fx-background-color: #888888;">
+                    <children>
+                        <WebView prefHeight="717.0" prefWidth="1920.0" />
+                        <Text layoutX="597.0" layoutY="402.0" strokeType="OUTSIDE" strokeWidth="0.0" text="MAP WILL BE INTEGRATED LATER.">
+                            <font>
+                                <Font size="48.0" />
+                            </font>
+                        </Text>
+                    </children>
+                </AnchorPane>
+            </children>
+        </VBox>
+    </children>
+</AnchorPane>
diff --git a/src/main/resources/NTNU/IDATT1002/map_page.fxml b/src/main/resources/NTNU/IDATT1002/map_page.fxml
deleted file mode 100644
index 9d50cf6e0593cb61e75fc0ec8b2f4041c08b1bdb..0000000000000000000000000000000000000000
--- a/src/main/resources/NTNU/IDATT1002/map_page.fxml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
-<?import javafx.scene.web.WebView?>
-
-<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.MapPageController">
-    <children>
-        <VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-            <children>
-                <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="200.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
-                    <children>
-                        <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
-                            <image>
-                                <Image url="@../../Images/PlaceholderLogo.png" />
-                            </image>
-                        </ImageView>
-                        <Pane prefHeight="100.0" prefWidth="343.0" />
-                        <TextField fx:id="tbar_search" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
-                        <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
-                        <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
-                        <Pane prefHeight="100.0" prefWidth="174.0" />
-                        <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
-                    </children>
-                </HBox>
-          <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="183.0" prefWidth="1918.0" style="-fx-background-color: #888888;">
-               <children>
-                  <TextField fx:id="map_search_field" layoutX="626.0" layoutY="70.0" prefHeight="44.0" prefWidth="664.0" promptText="Search for your location">
-                     <font>
-                        <Font size="18.0" />
-                     </font>
-                  </TextField>
-                  <Text layoutX="508.0" layoutY="100.0" strokeType="OUTSIDE" strokeWidth="0.0" text="SEARCH:">
-                     <font>
-                        <Font name="System Bold" size="24.0" />
-                     </font>
-                  </Text>
-                  <Button fx:id="map_search_button" layoutX="1314.0" layoutY="70.0" mnemonicParsing="false" onAction="#MapSearch" prefHeight="44.0" prefWidth="99.0" text="SEARCH">
-                     <font>
-                        <Font size="18.0" />
-                     </font>
-                  </Button>
-               </children>
-            </AnchorPane>
-          <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="797.0" prefWidth="1920.0" style="-fx-background-color: #888888;">
-               <children>
-                  <WebView prefHeight="717.0" prefWidth="1920.0" />
-                  <Text layoutX="597.0" layoutY="402.0" strokeType="OUTSIDE" strokeWidth="0.0" text="MAP WILL BE INTEGRATED LATER.">
-                     <font>
-                        <Font size="48.0" />
-                     </font>
-                  </Text>
-               </children>
-            </AnchorPane>
-            </children>
-        </VBox>
-    </children>
-</AnchorPane>
diff --git a/src/main/resources/NTNU/IDATT1002/search_page.fxml b/src/main/resources/NTNU/IDATT1002/search.fxml
similarity index 86%
rename from src/main/resources/NTNU/IDATT1002/search_page.fxml
rename to src/main/resources/NTNU/IDATT1002/search.fxml
index 0ee98bc93d1d1d0de35c6534f223aed8f6801bed..dfe471ec58adf00e677320a5ee04584017fd19e5 100644
--- a/src/main/resources/NTNU/IDATT1002/search_page.fxml
+++ b/src/main/resources/NTNU/IDATT1002/search.fxml
@@ -1,39 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.String?>
-<?import javafx.collections.FXCollections?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ChoiceBox?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
+<?import java.lang.*?>
+<?import javafx.collections.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
 
-<AnchorPane maxHeight="1080.0" maxWidth="1920.0" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.SearchPageController">
+<AnchorPane maxHeight="1080.0" maxWidth="1920.0" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.Search">
     <children>
-      <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
-         <children>
-            <ImageView fx:id="tbar_logo1" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
-               <image>
-                  <Image url="@../../Images/PlaceholderLogo.png" />
-               </image>
-            </ImageView>
-            <Pane prefHeight="100.0" prefWidth="561.0" />
-            <TextField fx:id="tbar_search1" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
-            <Button fx:id="tbar_map1" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
-            <Pane prefHeight="100.0" prefWidth="174.0" />
-            <Button fx:id="tbar_upload1" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="40.0" prefWidth="114.0" text="UPLOAD" />
-         </children>
-      </HBox>
+       <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+          <children>
+             <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
+                <image>
+                   <Image url="@../../Images/PlaceholderLogo.png" />
+                </image>
+             </ImageView>
+             <Pane prefHeight="100.0" prefWidth="343.0" />
+             <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+             <Button fx:id="tbar_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
+             <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
+             <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
+             <Pane prefHeight="100.0" prefWidth="174.0" />
+             <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+          </children>
+       </HBox>
         <ScrollPane fx:id="scrollpane" hbarPolicy="NEVER" layoutY="100.0" prefHeight="980.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="100.0">
             <content>
                 <AnchorPane maxHeight="1920.0" minHeight="0.0" minWidth="0.0" prefHeight="2000.0" prefWidth="1920.0">
@@ -42,22 +33,22 @@
                             <top>
                                 <Pane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER">
                            <children>
-                              <Text fill="WHITE" layoutX="337.0" layoutY="113.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Found">
+                              <Text fill="WHITE" layoutX="282.0" layoutY="115.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Found">
                                  <font>
                                     <Font size="36.0" />
                                  </font>
                               </Text>
-                              <Text fill="WHITE" layoutX="465.0" layoutY="113.0" strokeType="OUTSIDE" strokeWidth="0.0" text="X">
+                              <Text fill="WHITE" layoutX="398.0" layoutY="114.0" strokeType="OUTSIDE" strokeWidth="0.0" text="X">
                                  <font>
                                     <Font name="System Bold Italic" size="36.0" />
                                  </font>
                               </Text>
-                              <Text fill="WHITE" layoutX="513.0" layoutY="113.0" strokeType="OUTSIDE" strokeWidth="0.0" text="results for your search, sorted by:">
+                              <Text fill="WHITE" layoutX="439.0" layoutY="113.0" strokeType="OUTSIDE" strokeWidth="0.0" text="results for your search" wrappingWidth="350.982421875">
                                  <font>
                                     <Font size="36.0" />
                                  </font>
                               </Text>
-                              <ChoiceBox layoutX="1063.0" layoutY="78.0" prefHeight="40.0" prefWidth="166.0" value="Most Popular">
+                              <ChoiceBox fx:id="sorted_by_choicebox" layoutX="1189.0" layoutY="80.0" prefHeight="40.0" prefWidth="166.0" value="Most Popular">
                                   <items>
                                       <FXCollections fx:factory="observableArrayList">
                                           <String fx:value="Most Popular" />
@@ -66,6 +57,16 @@
                                       </FXCollections>
                                   </items>
                               </ChoiceBox>
+                              <Text fx:id="search_result" fill="WHITE" layoutX="799.0" layoutY="114.0" strokeType="OUTSIDE" strokeWidth="0.0" text="result" wrappingWidth="166.9999771118164">
+                                 <font>
+                                    <Font size="36.0" />
+                                 </font>
+                              </Text>
+                              <Text fill="WHITE" layoutX="972.0" layoutY="114.0" strokeType="OUTSIDE" strokeWidth="0.0" text=", sorted by:" wrappingWidth="184.341796875">
+                                 <font>
+                                    <Font size="36.0" />
+                                 </font>
+                              </Text>
                            </children></Pane>
                             </top>
                             <left>
@@ -290,8 +291,8 @@
                                     <children>
                                         <HBox alignment="CENTER" layoutY="-2.0" prefHeight="84.0" prefWidth="1920.0" spacing="20.0">
                                             <children>
-                                                <Button fx:id="footer_previous_page" mnemonicParsing="false" onAction="#switchToPrevious" text="PREVIOUS" />
-                                                <Button fx:id="footer_next_page" layoutX="944.0" layoutY="48.0" mnemonicParsing="false" onAction="#switchToNext" text="NEXT" />
+                                                <Button fx:id="footer_previousBtn" mnemonicParsing="false" onAction="#switchToPrevious" text="PREVIOUS" />
+                                                <Button fx:id="footer_nextBtn" layoutX="944.0" layoutY="48.0" mnemonicParsing="false" onAction="#switchToNext" text="NEXT" />
                                             </children>
                                         </HBox>
                                     </children></Pane>
diff --git a/src/main/resources/NTNU/IDATT1002/search_page_2.fxml b/src/main/resources/NTNU/IDATT1002/search_page_2.fxml
deleted file mode 100644
index e0dbb5c21bc76906897b31295d8ec735128a3460..0000000000000000000000000000000000000000
--- a/src/main/resources/NTNU/IDATT1002/search_page_2.fxml
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.String?>
-<?import javafx.collections.FXCollections?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ChoiceBox?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
-
-<AnchorPane maxHeight="1080.0" maxWidth="1920.0" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.SearchPageController">
-    <children>
-      <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
-         <children>
-            <ImageView fx:id="tbar_logo1" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
-               <image>
-                  <Image url="@../../Images/PlaceholderLogo.png" />
-               </image>
-            </ImageView>
-            <Pane prefHeight="100.0" prefWidth="561.0" />
-            <TextField fx:id="tbar_search1" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
-            <Button fx:id="tbar_map1" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
-            <Pane prefHeight="100.0" prefWidth="174.0" />
-            <Button fx:id="tbar_upload1" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="40.0" prefWidth="114.0" text="UPLOAD" />
-         </children>
-      </HBox>
-        <ScrollPane fx:id="scrollpane" hbarPolicy="NEVER" layoutY="100.0" prefHeight="980.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="100.0">
-            <content>
-                <AnchorPane maxHeight="1920.0" minHeight="0.0" minWidth="0.0" prefHeight="2000.0" prefWidth="1920.0">
-                    <children>
-                        <BorderPane prefHeight="2000.0" prefWidth="1920.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                            <top>
-                                <Pane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER">
-                           <children>
-                              <Text fill="WHITE" layoutX="337.0" layoutY="113.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Found">
-                                 <font>
-                                    <Font size="36.0" />
-                                 </font>
-                              </Text>
-                              <Text fill="WHITE" layoutX="465.0" layoutY="113.0" strokeType="OUTSIDE" strokeWidth="0.0" text="X">
-                                 <font>
-                                    <Font name="System Bold Italic" size="36.0" />
-                                 </font>
-                              </Text>
-                              <Text fill="WHITE" layoutX="513.0" layoutY="113.0" strokeType="OUTSIDE" strokeWidth="0.0" text="results for your search, sorted by:">
-                                 <font>
-                                    <Font size="36.0" />
-                                 </font>
-                              </Text>
-                              <ChoiceBox layoutX="1063.0" layoutY="78.0" prefHeight="40.0" prefWidth="166.0" value="Most Popular">
-                                  <items>
-                                      <FXCollections fx:factory="observableArrayList">
-                                          <String fx:value="Most Popular" />
-                                          <String fx:value="Newest First" />
-                                          <String fx:value="Oldest First" />
-                                      </FXCollections>
-                                  </items>
-                              </ChoiceBox>
-                           </children></Pane>
-                            </top>
-                            <left>
-                                <Pane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER" />
-                            </left>
-                            <right>
-                                <Pane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER" />
-                            </right>
-                            <center>
-                                <GridPane alignment="CENTER" BorderPane.alignment="CENTER">
-                                    <columnConstraints>
-                                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                    </columnConstraints>
-                                    <rowConstraints>
-                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                    </rowConstraints>
-                           <children>
-                              <Pane prefHeight="200.0" prefWidth="200.0">
-                                 <children>
-                                    <ImageView fitHeight="307.0" fitWidth="516.0" layoutX="-2.0" layoutY="-1.0" pickOnBounds="true" preserveRatio="true">
-                                       <image>
-                                          <Image url="@../../Images/party.jpg" />
-                                       </image>
-                                    </ImageView>
-                                    <Text layoutX="545.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TITLE:" wrappingWidth="153.0">
-                                       <font>
-                                          <Font name="System Bold" size="48.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="551.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TAGS:" wrappingWidth="70.0">
-                                       <font>
-                                          <Font name="System Bold" size="24.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="551.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:" wrappingWidth="129.0">
-                                       <font>
-                                          <Font name="System Bold" size="18.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="707.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="&quot;test &quot;" wrappingWidth="700.0">
-                                       <font>
-                                          <Font name="System Bold" size="24.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="707.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="&quot;&quot;" wrappingWidth="153.0">
-                                       <font>
-                                          <Font name="System Bold" size="48.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="707.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="&quot;&quot;" wrappingWidth="129.0">
-                                       <font>
-                                          <Font name="System Bold" size="18.0" />
-                                       </font>
-                                    </Text>
-                                 </children>
-                              </Pane>
-                              <Pane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="2">
-                                 <children>
-                                    <ImageView fitHeight="307.0" fitWidth="516.0" layoutX="-2.0" layoutY="-1.0" pickOnBounds="true" preserveRatio="true">
-                                       <image>
-                                          <Image url="@../../Images/party.jpg" />
-                                       </image>
-                                    </ImageView>
-                                    <Text layoutX="545.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TITLE:" wrappingWidth="153.0">
-                                       <font>
-                                          <Font name="System Bold" size="48.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="551.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TAGS:" wrappingWidth="70.0">
-                                       <font>
-                                          <Font name="System Bold" size="24.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="551.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:" wrappingWidth="129.0">
-                                       <font>
-                                          <Font name="System Bold" size="18.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="707.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="&quot;&quot;" wrappingWidth="70.0">
-                                       <font>
-                                          <Font name="System Bold" size="24.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="707.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="&quot;&quot;" wrappingWidth="153.0">
-                                       <font>
-                                          <Font name="System Bold" size="48.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="707.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="&quot;&quot;" wrappingWidth="129.0">
-                                       <font>
-                                          <Font name="System Bold" size="18.0" />
-                                       </font>
-                                    </Text>
-                                 </children>
-                              </Pane>
-                              <Pane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1">
-                                 <children>
-                                    <ImageView fitHeight="307.0" fitWidth="516.0" layoutX="-2.0" layoutY="-1.0" pickOnBounds="true" preserveRatio="true">
-                                       <image>
-                                          <Image url="@../../Images/party.jpg" />
-                                       </image>
-                                    </ImageView>
-                                    <Text layoutX="545.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TITLE:" wrappingWidth="153.0">
-                                       <font>
-                                          <Font name="System Bold" size="48.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="551.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TAGS:" wrappingWidth="70.0">
-                                       <font>
-                                          <Font name="System Bold" size="24.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="551.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:" wrappingWidth="129.0">
-                                       <font>
-                                          <Font name="System Bold" size="18.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="707.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="&quot;&quot;" wrappingWidth="70.0">
-                                       <font>
-                                          <Font name="System Bold" size="24.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="707.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="&quot;&quot;" wrappingWidth="153.0">
-                                       <font>
-                                          <Font name="System Bold" size="48.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="707.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="&quot;&quot;" wrappingWidth="129.0">
-                                       <font>
-                                          <Font name="System Bold" size="18.0" />
-                                       </font>
-                                    </Text>
-                                 </children>
-                              </Pane>
-                              <Pane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="3">
-                                 <children>
-                                    <ImageView fitHeight="307.0" fitWidth="516.0" layoutX="-2.0" layoutY="-1.0" pickOnBounds="true" preserveRatio="true">
-                                       <image>
-                                          <Image url="@../../Images/party.jpg" />
-                                       </image>
-                                    </ImageView>
-                                    <Text layoutX="545.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TITLE:" wrappingWidth="153.0">
-                                       <font>
-                                          <Font name="System Bold" size="48.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="551.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TAGS:" wrappingWidth="70.0">
-                                       <font>
-                                          <Font name="System Bold" size="24.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="551.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:" wrappingWidth="129.0">
-                                       <font>
-                                          <Font name="System Bold" size="18.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="707.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="&quot;&quot;" wrappingWidth="70.0">
-                                       <font>
-                                          <Font name="System Bold" size="24.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="707.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="&quot;&quot;" wrappingWidth="153.0">
-                                       <font>
-                                          <Font name="System Bold" size="48.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="707.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="&quot;&quot;" wrappingWidth="129.0">
-                                       <font>
-                                          <Font name="System Bold" size="18.0" />
-                                       </font>
-                                    </Text>
-                                 </children>
-                              </Pane>
-                              <Pane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="4">
-                                 <children>
-                                    <ImageView fitHeight="307.0" fitWidth="516.0" layoutX="-2.0" layoutY="-1.0" pickOnBounds="true" preserveRatio="true">
-                                       <image>
-                                          <Image url="@../../Images/party.jpg" />
-                                       </image>
-                                    </ImageView>
-                                    <Text layoutX="545.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TITLE:" wrappingWidth="153.0">
-                                       <font>
-                                          <Font name="System Bold" size="48.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="551.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TAGS:" wrappingWidth="70.0">
-                                       <font>
-                                          <Font name="System Bold" size="24.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="551.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:" wrappingWidth="129.0">
-                                       <font>
-                                          <Font name="System Bold" size="18.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="707.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="&quot;&quot;" wrappingWidth="70.0">
-                                       <font>
-                                          <Font name="System Bold" size="24.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="707.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="&quot;&quot;" wrappingWidth="153.0">
-                                       <font>
-                                          <Font name="System Bold" size="48.0" />
-                                       </font>
-                                    </Text>
-                                    <Text layoutX="707.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="&quot;&quot;" wrappingWidth="129.0">
-                                       <font>
-                                          <Font name="System Bold" size="18.0" />
-                                       </font>
-                                    </Text>
-                                 </children>
-                              </Pane>
-                           </children>
-                                </GridPane>
-                            </center>
-                            <bottom>
-                                <Pane prefHeight="150.0" prefWidth="1920.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER">
-                                    <children>
-                                        <HBox alignment="CENTER" layoutY="-2.0" prefHeight="84.0" prefWidth="1920.0" spacing="20.0">
-                                            <children>
-                                                <Button fx:id="footer_previous_page" mnemonicParsing="false" onAction="#switchToPrevious" text="PREVIOUS" />
-                                                <Button fx:id="footer_next_page" layoutX="944.0" layoutY="48.0" mnemonicParsing="false" onAction="#switchToNext" text="NEXT" />
-                                            </children>
-                                        </HBox>
-                                    </children></Pane>
-                            </bottom>
-                        </BorderPane>
-                    </children></AnchorPane>
-            </content>
-        </ScrollPane>
-    </children>
-</AnchorPane>
diff --git a/src/main/resources/NTNU/IDATT1002/signup.fxml b/src/main/resources/NTNU/IDATT1002/signup.fxml
index 7ec82d8e8f4cfb9e69d7abf421748ff1aebccf66..6017c685aa0ec1892e4f9f4c3a8ca67367b55a97 100644
--- a/src/main/resources/NTNU/IDATT1002/signup.fxml
+++ b/src/main/resources/NTNU/IDATT1002/signup.fxml
@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Text?>
 
-<VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/" fx:controller="NTNU.IDATT1002.controllers.SignUpController">
+<VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/" fx:controller="NTNU.IDATT1002.controllers.SignUp">
     <children>
         <Label text="Sign Up page" />
       <GridPane hgap="10.0" maxWidth="-Infinity" prefHeight="110.0" prefWidth="300.0" vgap="10.0">
@@ -36,7 +36,7 @@
             <Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
          </padding>
       </GridPane>
-        <Button fx:id="secondaryButton" onAction="#switchToPrimary" text="Sign up" />
+        <Button fx:id="signup" onAction="#switchToLogin" text="Sign up" />
     </children>
     <padding>
         <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
diff --git a/src/main/resources/NTNU/IDATT1002/upload.fxml b/src/main/resources/NTNU/IDATT1002/upload.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..c39f3fe3ea5098ed69132d6e5488e604de959667
--- /dev/null
+++ b/src/main/resources/NTNU/IDATT1002/upload.fxml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<?import javafx.scene.text.Text?>
+<?import javafx.scene.Cursor?>
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.Upload">
+<children>
+    <VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+        <children>
+            <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                <children>
+                    <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
+                        <image>
+                            <Image url="@../../Images/PlaceholderLogo.png" />
+                        </image>
+                    </ImageView>
+                    <Pane prefHeight="100.0" prefWidth="343.0" />
+                    <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+                    <Button fx:id="tbar_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
+                    <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
+                    <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
+                    <Pane prefHeight="100.0" prefWidth="174.0" />
+                    <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+                </children>
+            </HBox>
+            <HBox alignment="CENTER" prefHeight="883.0" prefWidth="1791.0">
+                <children>
+                    <VBox alignment="CENTER" prefHeight="883.0" prefWidth="641.0">
+                        <children>
+                            <Pane fx:id="drag_drop" maxHeight="-Infinity" maxWidth="-Infinity" onDragDropped="#droppedFiles" onDragOver="#acceptDrop" prefHeight="190.0" prefWidth="397.0" style="-fx-background-color: lightgrey; -fx-border-color: grey;">
+                                <children>
+                                    <Text layoutX="94.0" layoutY="104.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Drag and drop files" wrappingWidth="209.3367156982422">
+                                        <font>
+                                            <Font size="24.0" />
+                                        </font>
+                                    </Text>
+                                </children>
+                            </Pane>
+                            <Button fx:id="uploadBtn" alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false" onMouseClicked="#chooseFile" prefHeight="30.0" prefWidth="187.0" text="Choose files">
+                                <font>
+                                    <Font size="18.0" />
+                                </font></Button>
+                        </children>
+                    </VBox>
+                </children>
+            </HBox>
+        </children>
+    </VBox>
+</children>
+</AnchorPane>
diff --git a/src/main/resources/NTNU/IDATT1002/upload_page.fxml b/src/main/resources/NTNU/IDATT1002/upload_page.fxml
deleted file mode 100644
index 835a3037e2c9ffa30cf7be03d1eb54e19958e66c..0000000000000000000000000000000000000000
--- a/src/main/resources/NTNU/IDATT1002/upload_page.fxml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
-
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.UploadController">
-<top>
-    <HBox prefHeight="71.0" prefWidth="600.0" style="-fx-background-color: #7b7b7b;" BorderPane.alignment="CENTER">
-        <children>
-            <HBox alignment="CENTER" prefHeight="135.0" prefWidth="404.0">
-                <children>
-                    <Pane onMouseClicked="#switchToExplore" prefHeight="71.0" prefWidth="100.0">
-                        <children>
-                            <Text layoutX="21.0" layoutY="42.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Explore">
-                                <font>
-                                    <Font size="18.0" />
-                                </font>
-                            </Text>
-                        </children>
-                    </Pane>
-                    <Pane onMouseClicked="#switchToAlbum" prefHeight="71.0" prefWidth="100.0">
-                        <children>
-                            <Text layoutX="24.0" layoutY="42.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Album">
-                                <font>
-                                    <Font size="18.0" />
-                                </font>
-                            </Text>
-                        </children>
-                    </Pane>
-                    <Pane onMouseClicked="#switchToMap" prefHeight="71.0" prefWidth="100.0">
-                        <children>
-                            <Text layoutX="32.0" layoutY="42.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Map">
-                                <font>
-                                    <Font size="18.0" />
-                                </font>
-                            </Text>
-                        </children>
-                    </Pane>
-                    <Pane prefHeight="71.0" prefWidth="100.0" style="-fx-background-color: #d6d6d6;">
-                        <children>
-                            <Text layoutX="18.0" layoutY="43.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Upload" wrappingWidth="63.408203125">
-                                <font>
-                                    <Font size="18.0" />
-                                </font>
-                            </Text>
-                        </children>
-                    </Pane>
-                </children>
-            </HBox>
-            <HBox alignment="CENTER" prefHeight="74.0" prefWidth="200.0">
-                <children>
-                    <TextField fx:id="searchField" focusTraversable="false" onKeyTyped="#search" prefHeight="26.0" prefWidth="133.0" promptText="Search" />
-                </children>
-            </HBox>
-        </children>
-        <BorderPane.margin>
-            <Insets />
-        </BorderPane.margin>
-    </HBox>
-</top>
-<left>
-    <Pane prefHeight="282.0" prefWidth="71.0" style="-fx-background-color: #b8b8b8;" BorderPane.alignment="CENTER" />
-</left>
-<center>
-    <Pane prefHeight="212.0" prefWidth="338.0" snapToPixel="false" style="-fx-background-color: #d6d6d6;" BorderPane.alignment="BOTTOM_RIGHT">
-        <children>
-            <Button fx:id="uploadBtn" alignment="CENTER" contentDisplay="CENTER" layoutX="159.0" layoutY="181.0" mnemonicParsing="false" onMouseClicked="#chooseFile" prefHeight="25.0" prefWidth="152.0" text="Choose files" />
-            <Pane fx:id="dragDropField" layoutX="111.0" layoutY="58.0" onDragDropped="#droppedFiles" onDragOver="#acceptDrop" prefHeight="106.0" prefWidth="248.0" style="-fx-background-color: lightgrey; -fx-border-color: grey;">
-                <children>
-                    <Text layoutX="61.0" layoutY="58.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Drag and drop files" wrappingWidth="125.33671569824219">
-                        <font>
-                            <Font size="14.0" />
-                        </font>
-                    </Text>
-                </children>
-                <cursor>
-                    <Cursor fx:constant="DEFAULT" />
-                </cursor>
-            </Pane>
-        </children>
-    </Pane>
-</center>
-<right>
-    <Pane prefHeight="282.0" prefWidth="58.0" style="-fx-background-color: #a5a5a5;" BorderPane.alignment="CENTER">
-        <children>
-            <VBox fx:id="thumbnailsField" layoutX="1.0" layoutY="14.0" prefHeight="200.0" prefWidth="58.0" />
-        </children></Pane>
-</right>
-<bottom>
-    <Pane prefHeight="47.0" prefWidth="600.0" style="-fx-background-color: #727272;" BorderPane.alignment="CENTER" />
-</bottom>
-</BorderPane>
-
diff --git a/src/main/resources/NTNU/IDATT1002/uploaded_album.fxml b/src/main/resources/NTNU/IDATT1002/uploaded_album.fxml
index e328a87532c5d6b3c8987da90fe9f30434d3f3ea..2c45808cf7ed1e5b8acea6c80aadb7c6bd2cc0d8 100644
--- a/src/main/resources/NTNU/IDATT1002/uploaded_album.fxml
+++ b/src/main/resources/NTNU/IDATT1002/uploaded_album.fxml
@@ -13,23 +13,24 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.UploadedAlbumController">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.UploadedAlbum">
     <children>
         <VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
             <children>
-                <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="200.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+                <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                     <children>
-                        <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
+                        <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
                             <image>
                                 <Image url="@../../Images/PlaceholderLogo.png" />
                             </image>
                         </ImageView>
                         <Pane prefHeight="100.0" prefWidth="343.0" />
-                        <TextField fx:id="tbar_search" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
-                        <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
-                        <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+                        <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+                        <Button fx:id="tbar_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
+                        <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
+                        <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
                         <Pane prefHeight="100.0" prefWidth="174.0" />
-                        <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+                        <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
                     </children>
                 </HBox>
                 <HBox alignment="CENTER" prefHeight="982.0" prefWidth="1920.0">
@@ -45,19 +46,19 @@
                                                     <Font name="System Bold" size="36.0" />
                                                 </font>
                                             </Text>
-                                            <TextField fx:id="album_title_field" layoutX="486.0" layoutY="110.0" prefHeight="40.0" prefWidth="488.0" promptText="Insert title here" />
+                                            <TextField layoutX="486.0" layoutY="110.0" prefHeight="40.0" prefWidth="488.0" promptText="Insert title here" />
                                             <Text layoutX="238.0" layoutY="182.0" strokeType="OUTSIDE" strokeWidth="0.0" text="ALBUMTAGS:">
                                                 <font>
                                                     <Font name="System Bold" size="24.0" />
                                                 </font>
                                             </Text>
-                                            <TextField fx:id="album_tag_field" layoutX="411.0" layoutY="157.0" prefHeight="32.0" prefWidth="564.0" promptText="#Blue, #water, #summer, etc..." />
+                                            <TextField layoutX="411.0" layoutY="157.0" prefHeight="32.0" prefWidth="564.0" promptText="#Blue, #water, #summer, etc..." />
                                             <Text layoutX="239.0" layoutY="224.0" strokeType="OUTSIDE" strokeWidth="0.0" text="ALBUMDESCRIPTION:">
                                                 <font>
                                                     <Font name="System Bold" size="24.0" />
                                                 </font>
                                             </Text>
-                                            <TextArea fx:id="album_desc_field" layoutX="238.0" layoutY="239.0" prefHeight="140.0" prefWidth="739.0" promptText="Insert description here" />
+                                            <TextArea layoutX="238.0" layoutY="239.0" prefHeight="140.0" prefWidth="739.0" promptText="Insert description here" />
                                             <Text layoutX="1002.0" layoutY="138.0" strokeType="OUTSIDE" strokeWidth="0.0" text="INCLUDED METADATA:">
                                                 <font>
                                                     <Font name="System Bold" size="24.0" />
@@ -84,10 +85,10 @@
                                                     <Font name="System Bold" size="24.0" />
                                                 </font>
                                             </Text>
-                                            <TextField fx:id="title_field" layoutX="1002.0" layoutY="552.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
-                                            <TextField fx:id="tag_field" layoutX="963.0" layoutY="630.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
-                                            <TextArea fx:id="desc_field" layoutX="872.0" layoutY="734.0" prefHeight="140.0" prefWidth="822.0" promptText="Insert description here" />
-                                            <ImageView fx:id="uploaded_image" fitHeight="325.0" fitWidth="608.0" layoutX="238.0" layoutY="549.0" pickOnBounds="true" preserveRatio="true">
+                                            <TextField fx:id="photo_title" layoutX="1002.0" layoutY="552.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
+                                            <TextField fx:id="photo_tag" layoutX="963.0" layoutY="630.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
+                                            <TextArea fx:id="photo_desc" layoutX="872.0" layoutY="734.0" prefHeight="140.0" prefWidth="822.0" promptText="Insert description here" />
+                                            <ImageView fx:id="photo_image" fitHeight="325.0" fitWidth="608.0" layoutX="238.0" layoutY="549.0" pickOnBounds="true" preserveRatio="true">
                                                 <image>
                                                     <Image url="@../../Images/placeholder-1920x1080.png" /> <!-- This is the URL to the image in question, needs to change in accordance with the current uploaded picture-->
                                                 </image>
@@ -108,10 +109,10 @@
                                           <Font name="System Bold" size="24.0" />
                                        </font>
                                     </Text>
-                                    <TextField fx:id="title_field2" layoutX="1002.0" layoutY="914.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
-                                    <TextField fx:id="tag_field2" layoutX="963.0" layoutY="992.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
-                                    <TextArea fx:id="desc_field2" layoutX="872.0" layoutY="1096.0" prefHeight="140.0" prefWidth="822.0" promptText="Insert description here" />
-                                    <ImageView fx:id="uploaded_image1" fitHeight="325.0" fitWidth="608.0" layoutX="238.0" layoutY="911.0" pickOnBounds="true" preserveRatio="true">
+                                    <TextField fx:id="photo_title2" layoutX="1002.0" layoutY="914.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
+                                    <TextField fx:id="photo_tag2" layoutX="963.0" layoutY="992.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
+                                    <TextArea fx:id="photo_desc2" layoutX="872.0" layoutY="1096.0" prefHeight="140.0" prefWidth="822.0" promptText="Insert description here" />
+                                    <ImageView fx:id="photo_image2" fitHeight="325.0" fitWidth="608.0" layoutX="238.0" layoutY="911.0" pickOnBounds="true" preserveRatio="true">
                                        <image>
                                           <Image url="@../../Images/placeholder-1920x1080.png" />
                                        </image>
@@ -132,10 +133,10 @@
                                                     <Font name="System Bold" size="24.0" />
                                                 </font>
                                             </Text>
-                                            <TextField fx:id="title_field3" layoutX="1002.0" layoutY="1276.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
-                                            <TextField fx:id="tag_field3" layoutX="963.0" layoutY="1354.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
-                                            <TextArea fx:id="desc_field3" layoutX="872.0" layoutY="1458.0" prefHeight="140.0" prefWidth="822.0" promptText="Insert description here" />
-                                            <ImageView fx:id="uploaded_image2" fitHeight="325.0" fitWidth="608.0" layoutX="238.0" layoutY="1273.0" pickOnBounds="true" preserveRatio="true">
+                                            <TextField fx:id="photo_title3" layoutX="1002.0" layoutY="1276.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
+                                            <TextField fx:id="photo_tag3" layoutX="963.0" layoutY="1354.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
+                                            <TextArea fx:id="photo_desc3" layoutX="872.0" layoutY="1458.0" prefHeight="140.0" prefWidth="822.0" promptText="Insert description here" />
+                                            <ImageView fx:id="photo_image3" fitHeight="325.0" fitWidth="608.0" layoutX="238.0" layoutY="1273.0" pickOnBounds="true" preserveRatio="true">
                                                 <image>
                                                     <Image url="@../../Images/placeholder-1920x1080.png" /> <!-- This is the URL to the image in question, needs to change in accordance with the current uploaded picture-->
                                                 </image>
@@ -156,15 +157,15 @@
                                                     <Font name="System Bold" size="24.0" />
                                                 </font>
                                             </Text>
-                                            <TextField fx:id="title_field4" layoutX="1002.0" layoutY="1638.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
-                                            <TextField fx:id="tag_field4" layoutX="963.0" layoutY="1716.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
-                                            <TextArea fx:id="desc_field4" layoutX="872.0" layoutY="1820.0" prefHeight="140.0" prefWidth="822.0" promptText="Insert description here" />
-                                            <ImageView fx:id="uploaded_image3" fitHeight="325.0" fitWidth="608.0" layoutX="238.0" layoutY="1635.0" pickOnBounds="true" preserveRatio="true">
+                                            <TextField fx:id="photo_title4" layoutX="1002.0" layoutY="1638.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
+                                            <TextField fx:id="photo_tag4" layoutX="963.0" layoutY="1716.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
+                                            <TextArea fx:id="photo_desc4" layoutX="872.0" layoutY="1820.0" prefHeight="140.0" prefWidth="822.0" promptText="Insert description here" />
+                                            <ImageView fx:id="photo_image4" fitHeight="325.0" fitWidth="608.0" layoutX="238.0" layoutY="1635.0" pickOnBounds="true" preserveRatio="true">
                                                 <image>
                                                     <Image url="@../../Images/placeholder-1920x1080.png" />
                                                 </image>
                                             </ImageView>
-                                    <Button fx:id="accept_button" layoutX="880.0" layoutY="2000.0" mnemonicParsing="false" onAction="#uploadAlbum" text="ACCEPT">
+                                    <Button fx:id="acceptBtn" layoutX="880.0" layoutY="2000.0" mnemonicParsing="false" onAction="#uploadAlbum" text="ACCEPT">
                                        <font>
                                           <Font name="System Bold" size="24.0" />
                                        </font>
diff --git a/src/main/resources/NTNU/IDATT1002/uploaded_photo.fxml b/src/main/resources/NTNU/IDATT1002/uploaded_photo.fxml
index 84aef0b67789691ee94220211f5bf38921f3aae4..bfcdbad5c5af1bc2c89d0aecd0f33c349e3ea516 100644
--- a/src/main/resources/NTNU/IDATT1002/uploaded_photo.fxml
+++ b/src/main/resources/NTNU/IDATT1002/uploaded_photo.fxml
@@ -12,30 +12,31 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.UploadedPhotoController">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.UploadedPhoto">
     <children>
         <VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
             <children>
-                <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="200.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+                <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                     <children>
-                        <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
+                        <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
                             <image>
                                 <Image url="@../../Images/PlaceholderLogo.png" />
                             </image>
                         </ImageView>
                         <Pane prefHeight="100.0" prefWidth="343.0" />
-                        <TextField fx:id="tbar_search" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
-                        <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
-                        <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+                        <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+                        <Button fx:id="tbar_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
+                        <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
+                        <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
                         <Pane prefHeight="100.0" prefWidth="174.0" />
-                        <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+                        <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
                     </children>
                 </HBox>
                 <HBox alignment="CENTER" prefHeight="982.0" prefWidth="1920.0">
                <children>
                   <Pane prefHeight="981.0" prefWidth="851.0" style="-fx-background-color: #777777;">
                      <children>
-                        <ImageView fx:id="uploaded_image" fitHeight="455.0" fitWidth="952.0" layoutX="19.0" layoutY="263.0" pickOnBounds="true" preserveRatio="true">
+                        <ImageView fx:id="photo_image" fitHeight="455.0" fitWidth="952.0" layoutX="19.0" layoutY="263.0" pickOnBounds="true" preserveRatio="true">
                            <image>
                               <Image url="@../../Images/placeholder-1920x1080.png" /> <!-- This is the URL to the image in question, needs to change in accordance with the current uploaded picture-->
                            </image>
@@ -64,9 +65,9 @@
                               <Font name="System Bold" size="24.0" />
                            </font>
                         </Text>
-                        <TextField fx:id="title_field" layoutX="256.0" layoutY="83.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
-                        <TextField fx:id="tag_field" layoutX="217.0" layoutY="161.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
-                        <TextArea fx:id="desc_field" layoutX="126.0" layoutY="265.0" prefHeight="147.0" prefWidth="822.0" promptText="Insert description here" />
+                        <TextField fx:id="photo_title" layoutX="256.0" layoutY="83.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
+                        <TextField fx:id="photo_tag" layoutX="217.0" layoutY="161.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
+                        <TextArea fx:id="photo_desc" layoutX="126.0" layoutY="265.0" prefHeight="147.0" prefWidth="822.0" promptText="Insert description here" />
                         <Pane layoutX="125.0" layoutY="470.0" prefHeight="364.0" prefWidth="822.0" style="-fx-background-color: #ffffff;">
                            <children>
                               <Text layoutX="218.0" layoutY="196.0" strokeType="OUTSIDE" strokeWidth="0.0" text="NOT YET IMPLEMENTED">
@@ -76,7 +77,7 @@
                               </Text>
                            </children>
                         </Pane>
-                        <Button fx:id="accept_button" layoutX="493.0" layoutY="870.0" mnemonicParsing="false" onAction="#uploadPhoto" text="ACCEPT">
+                        <Button fx:id="acceptBtn" onAction="#uploadPhoto" layoutX="493.0" layoutY="870.0" mnemonicParsing="false" text="ACCEPT">
                            <font>
                               <Font size="18.0" />
                            </font>