diff --git a/src/main/java/NTNU/IDATT1002/controllers/CreateAlbumController.java b/src/main/java/NTNU/IDATT1002/controllers/CreateAlbum.java
similarity index 97%
rename from src/main/java/NTNU/IDATT1002/controllers/CreateAlbumController.java
rename to src/main/java/NTNU/IDATT1002/controllers/CreateAlbum.java
index 3d9ceec880b5c8fa99819627cf412a9d0e6d1fe5..30cd514944e1b1beab7d965d728dfa52ff2160c5 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/CreateAlbumController.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/CreateAlbum.java
@@ -12,7 +12,7 @@ import javafx.scene.layout.Pane;
 
 import java.io.IOException;
 
-public class CreateAlbumController {
+public class CreateAlbum {
     public TextField tbar_search;
     public ImageView tbar_logo;
     public Button tbar_explore;
diff --git a/src/main/java/NTNU/IDATT1002/controllers/ExploreAlbumsController.java b/src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java
similarity index 96%
rename from src/main/java/NTNU/IDATT1002/controllers/ExploreAlbumsController.java
rename to src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java
index f78704832bcf6e959e2ca0dbb21078e0343b3055..ca6784e93ddfb1e2916e6ab8dfd3080bd79c1b45 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/ExploreAlbumsController.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java
@@ -12,7 +12,7 @@ import javafx.scene.text.Text;
 
 import java.io.IOException;
 
-public class ExploreAlbumsController {
+public class ExploreAlbums {
     public ImageView tbar_logo;
     public TextField tbar_search;
     public Button tbar_map;
@@ -77,7 +77,7 @@ public class ExploreAlbumsController {
     }
 
     public void switchToCreateAlbum(ActionEvent actionEvent) throws IOException {
-        App.setRoot("create_album_page");
+        App.setRoot("create_album");
     }
 
     public void switchToExplore(ActionEvent actionEvent) throws IOException {
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Upload.java b/src/main/java/NTNU/IDATT1002/controllers/Upload.java
index edefc1c93bca542e6b8f6e2052d16f0abcac1b09..38bbe9bf71a538aba886c2799acefcaa6696ffda 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/Upload.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/Upload.java
@@ -84,6 +84,20 @@ public class Upload {
         App.setRoot("upload");
     }
 
+    public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore_albums");
+    }
+
+    private void switchToUploadedSingle() throws IOException {
+        App.setRoot("uploaded_single");
+    }
+
+    private void switchToUploadedMultiple() throws IOException {
+        App.setRoot("uploaded_multiple");
+    }
+
+
+
 
     /**
      * Method that opens file browser with an image filter
@@ -100,10 +114,10 @@ public class Upload {
         if(!list.isEmpty()){
             App.ex.setUploadedFiles(list);
             if (list.size() == 1){
-                switchToUploadedPhoto();
+                switchToUploadedSingle();
             }
             else {
-                switchToUploadedAlbum();
+                switchToUploadedMultiple();
             }
         }
     }
@@ -158,31 +172,11 @@ public class Upload {
         if(!list.isEmpty()){
             App.ex.setUploadedFiles(list);
             if (list.size() == 1){
-                switchToUploadedPhoto();
+                switchToUploadedSingle();
             }
             else {
-                switchToUploadedAlbum();
+                switchToUploadedMultiple();
             }
         }
     }
-
-    /**
-     * 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");
-    }
-
-    public void switchToAlbums(ActionEvent actionEvent) throws IOException {
-        App.setRoot("explore_albums");
-    }
 }
diff --git a/src/main/java/NTNU/IDATT1002/controllers/UploadedAlbum.java b/src/main/java/NTNU/IDATT1002/controllers/UploadedMultiple.java
similarity index 98%
rename from src/main/java/NTNU/IDATT1002/controllers/UploadedAlbum.java
rename to src/main/java/NTNU/IDATT1002/controllers/UploadedMultiple.java
index b6dc348699aff261082a11bf294ff71b58743164..d485a5373145a29f095820e4de6b8369b6a216e9 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/UploadedAlbum.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/UploadedMultiple.java
@@ -10,7 +10,7 @@ import javafx.scene.input.MouseEvent;
 
 import java.io.IOException;
 
-public class UploadedAlbum {
+public class UploadedMultiple {
 
 
     public ImageView tbar_logo;
diff --git a/src/main/java/NTNU/IDATT1002/controllers/UploadedPhoto.java b/src/main/java/NTNU/IDATT1002/controllers/UploadedSingle.java
similarity index 98%
rename from src/main/java/NTNU/IDATT1002/controllers/UploadedPhoto.java
rename to src/main/java/NTNU/IDATT1002/controllers/UploadedSingle.java
index a82af2e29a4977054aed6c37952531a8ce2cd102..b53a764811628f607acfb84cb905c75921d037ce 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/UploadedPhoto.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/UploadedSingle.java
@@ -14,7 +14,7 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.ResourceBundle;
 
-public class UploadedPhoto implements Initializable {
+public class UploadedSingle implements Initializable {
 
 
     public ImageView tbar_logo;
diff --git a/src/main/java/NTNU/IDATT1002/controllers/ViewAlbumController.java b/src/main/java/NTNU/IDATT1002/controllers/ViewAlbum.java
similarity index 94%
rename from src/main/java/NTNU/IDATT1002/controllers/ViewAlbumController.java
rename to src/main/java/NTNU/IDATT1002/controllers/ViewAlbum.java
index 0942aea87a525b7f6be14ffbe5a3dd14cdb07878..17d82f7f0f626377055ba6334364203e33a68e90 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/ViewAlbumController.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/ViewAlbum.java
@@ -12,7 +12,7 @@ import javafx.scene.text.Text;
 
 import java.io.IOException;
 
-public class ViewAlbumController {
+public class ViewAlbum {
     public TextField tbar_search;
     public ImageView tbar_logo;
     public Button tbar_explore;
@@ -38,19 +38,19 @@ public class ViewAlbumController {
     public Button tbar_albums;
 
     public void switchToSearch(ActionEvent actionEvent) throws IOException {
-        App.setRoot("search_page");
+        App.setRoot("search");
     }
 
     public void switchToUpload(ActionEvent actionEvent) throws IOException {
-        App.setRoot("upload_page");
+        App.setRoot("upload");
     }
 
     public void switchToMap(ActionEvent actionEvent) throws IOException {
-        App.setRoot("map_page");
+        App.setRoot("map");
     }
 
     public void switchToExplore(ActionEvent actionEvent) throws IOException {
-        App.setRoot("explore_page");
+        App.setRoot("explore");
     }
 
     public void openPopUpPicture(MouseEvent mouseEvent) {
diff --git a/src/main/resources/NTNU/IDATT1002/create_album_page.fxml b/src/main/resources/NTNU/IDATT1002/create_album.fxml
similarity index 99%
rename from src/main/resources/NTNU/IDATT1002/create_album_page.fxml
rename to src/main/resources/NTNU/IDATT1002/create_album.fxml
index 650c545f3c0d39a68c5369258826fe187cd7c627..faae6ab4b32d19e2afcaa4798bde11530ccea37d 100644
--- a/src/main/resources/NTNU/IDATT1002/create_album_page.fxml
+++ b/src/main/resources/NTNU/IDATT1002/create_album.fxml
@@ -15,7 +15,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.CreateAlbumController">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.CreateAlbum">
     <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>
diff --git a/src/main/resources/NTNU/IDATT1002/explore_albums.fxml b/src/main/resources/NTNU/IDATT1002/explore_albums.fxml
index 8dd54dda2015a1583bf37530e53890e2c2f709d9..1d3d27d89ec2509b108c7c5fdce8a7fee057d8bd 100644
--- a/src/main/resources/NTNU/IDATT1002/explore_albums.fxml
+++ b/src/main/resources/NTNU/IDATT1002/explore_albums.fxml
@@ -18,7 +18,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<AnchorPane maxHeight="2148.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.ExploreAlbumsController">
+<AnchorPane maxHeight="2148.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.ExploreAlbums">
     <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">
          <children>
diff --git a/src/main/resources/NTNU/IDATT1002/uploaded_album.fxml b/src/main/resources/NTNU/IDATT1002/uploaded_multiple.fxml
similarity index 99%
rename from src/main/resources/NTNU/IDATT1002/uploaded_album.fxml
rename to src/main/resources/NTNU/IDATT1002/uploaded_multiple.fxml
index a82078b32f4a17f86af6e54ab194e0a48f65136b..2559e256e9a095674dfe5d8fd50c06891c2082c2 100644
--- a/src/main/resources/NTNU/IDATT1002/uploaded_album.fxml
+++ b/src/main/resources/NTNU/IDATT1002/uploaded_multiple.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.UploadedAlbum">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.UploadedMultiple">
     <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>
diff --git a/src/main/resources/NTNU/IDATT1002/uploaded_photo.fxml b/src/main/resources/NTNU/IDATT1002/uploaded_single.fxml
similarity index 99%
rename from src/main/resources/NTNU/IDATT1002/uploaded_photo.fxml
rename to src/main/resources/NTNU/IDATT1002/uploaded_single.fxml
index abcd3d16c54db701b0e66190462cdaecf4a138ef..91ecf4a832baa13ea125d04718c2cf2ca2dcfa1b 100644
--- a/src/main/resources/NTNU/IDATT1002/uploaded_photo.fxml
+++ b/src/main/resources/NTNU/IDATT1002/uploaded_single.fxml
@@ -12,7 +12,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.UploadedPhoto">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.UploadedSingle">
     <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>
diff --git a/src/main/resources/NTNU/IDATT1002/view_album.fxml b/src/main/resources/NTNU/IDATT1002/view_album.fxml
index 13b7c298e64dadc408f1736e6ed3474d915a3e9e..8b5e6311230fe01a0b2470fe624c8bdf41da0cde 100644
--- a/src/main/resources/NTNU/IDATT1002/view_album.fxml
+++ b/src/main/resources/NTNU/IDATT1002/view_album.fxml
@@ -11,7 +11,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.ViewAlbumController">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.ViewAlbum">
     <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>