diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewController.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewController.java
index 61fb506..3284e51 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewController.java
@@ -3,6 +3,7 @@
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventData;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventManager;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventPublisher;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventType;
 
 /**
  * Handles logic and event publishing for {@link ViewElement} objects.
@@ -18,7 +19,7 @@
  * @see EventManager
  *
  */
-public abstract class ViewController<T1 extends ViewElement<?>>
+public abstract class ViewController<T1 extends ViewElement<?, ?>>
         implements EventPublisher {
 
   /**
@@ -26,6 +27,7 @@ public abstract class ViewController<T1 extends ViewElement<?>>
    *
    */
   private final T1 viewElement;
+
   /**
    * The {@link EventManager} object to send events to.
    *
@@ -84,4 +86,15 @@ public final <T> void invoke(final EventData<T> data,
                                final EventManager eventManager) {
     eventManager.invokeEvent(data);
   }
+
+  /**
+   * Basic method for invoking an event to change to a specific view.
+   *
+   * @param viewName the view to set to.
+   * */
+  protected void changeScene(final ViewEnum viewName) {
+    ViewData viewData = new ViewData(viewName);
+    EventData<ViewData> eventData = new EventData<ViewData>(EventType.SCENE_CHANGE, viewData);
+    invoke(eventData, eventManager);
+  }
 }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewData.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewData.java
index 33fca3c..5f66e88 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewData.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewData.java
@@ -17,7 +17,7 @@ public class ViewData {
    * Name of the scene.
    *
    */
-  private final String sceneName;
+  private final ViewEnum sceneName;
 
   /**
    * Constructor.
@@ -26,8 +26,8 @@ public class ViewData {
    *
    * @throws IllegalArgumentException if sceneName is empty or null.
    */
-  public ViewData(final String sceneName) throws IllegalArgumentException {
-    if (Validator.NOT_EMPTY.isValid(sceneName)) {
+  public ViewData(final ViewEnum sceneName) throws IllegalArgumentException {
+    if (Validator.NOT_EMPTY.isValid(sceneName.toString())) {
       this.sceneName = sceneName;
     } else {
       throw new IllegalArgumentException(Validator.NOT_EMPTY.getErrorMessage());
@@ -40,7 +40,7 @@ public ViewData(final String sceneName) throws IllegalArgumentException {
    * @return scene name.
    *
    */
-  public String getSceneName() {
+  public ViewEnum getSceneName() {
     return sceneName;
   }
 }
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewElement.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewElement.java
index aa0f941..a0b0f1c 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewElement.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewElement.java
@@ -1,7 +1,8 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view;
 
 import edu.ntnu.idi.idatt2003.g40.mappe.utils.Validator;
-import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.Map;
 import javafx.scene.control.Button;
 import javafx.scene.layout.Pane;
 
@@ -12,15 +13,16 @@
  * <p>Extends {@link Pane}</p>
  *
  * @param <T> the type of pane this view element represents.
+ * @param <A> an enum representing all interactable actions found in the view.
  *
  */
-public abstract class ViewElement<T extends Pane> {
+public abstract class ViewElement<T extends Pane, A extends Enum<A>> {
 
   /**
    * List of buttons in this view.
    *
    */
-  private final ArrayList<Button> buttons = new ArrayList<>();
+  private final Map<A, Button> buttonMap;
 
   /**
    * The {@link Pane} element the view element has as a root.
@@ -36,18 +38,18 @@ public abstract class ViewElement<T extends Pane> {
    * <p>Used as identification by the {@link ViewManager}.</p>
    *
    */
-  private String viewName;
+  private ViewEnum viewName;
 
   /**
    * Constructor with a name.
    *
    * @param rootPane an instance of type T (defined in the class).
-   * @param viewName The name of the view.
+   * @param viewName The name of the view as an {@link ViewEnum}.
    *
    */
-  protected ViewElement(final T rootPane, final String viewName) {
-    this(rootPane);
-    if (Validator.NOT_EMPTY.isValid(viewName)) {
+  protected ViewElement(final T rootPane, final ViewEnum viewName, final Class<A> actionEnum) {
+    this(rootPane, actionEnum);
+    if (Validator.NOT_EMPTY.isValid(viewName.name())) {
       this.viewName = viewName;
     } else {
       throw new IllegalArgumentException(Validator.NOT_EMPTY.getErrorMessage());
@@ -60,9 +62,10 @@ protected ViewElement(final T rootPane, final String viewName) {
    * @param rootPane the root of this view.
    *
    */
-  protected ViewElement(final T rootPane) {
+  protected ViewElement(final T rootPane, final Class<A> actionEnum) {
     if (rootPane != null) {
       setRootPane(rootPane);
+      this.buttonMap = new EnumMap<>(actionEnum);
       initLayout();
       initStyling();
     } else {
@@ -76,7 +79,7 @@ protected ViewElement(final T rootPane) {
    * @return the name of this view.
    *
    */
-  public String getViewName() {
+  public ViewEnum getViewName() {
     return viewName;
   }
 
@@ -86,7 +89,7 @@ public String getViewName() {
    * @param name the new name to set this view element to.
    *
    */
-  protected void setViewName(final String name) {
+  protected void setViewName(final ViewEnum name) {
     viewName = name;
   }
 
@@ -116,12 +119,12 @@ protected void setRootPane(final T pane) {
    * <p>Gotten by the associated {@link ViewController} object that hooks
    * the buttons to functionality.</p>
    *
-   * @return {@link ArrayList<Button>} object containing all buttons
+   * @return {@link Map<Enum, Button>} object containing all buttons
    *         in this view element.
    *
    */
-  public ArrayList<Button> getButtons() {
-    return buttons;
+  public Map<A, Button> getButtons() {
+    return buttonMap;
   }
 
   /**
@@ -136,6 +139,35 @@ public ArrayList<Button> getButtons() {
    */
   protected abstract void initStyling();
 
+  /**
+   * Connects an action to a button.
+   *
+   * @param action the enum of type A to put the button to.
+   * @param button the button to assign the action to.
+   *
+   * */
+  protected void registerButton(final A action, final Button button) {
+    buttonMap.put(action, button);
+  }
+
+  /**
+   * Method for assigning logic to a button by referencing the action.
+   *
+   * @param action the action to assign logic to.
+   * @param logic the {@link Runnable} code defining the logic.
+   *
+   * @throws IllegalArgumentException if Action is not in map.
+   * */
+  public void setOnAction(final A action, final Runnable logic)
+          throws IllegalArgumentException {
+    Button btn = buttonMap.get(action);
+    if (btn == null) {
+      throw new IllegalArgumentException("Invalid button");
+    } else {
+      btn.setOnAction(e -> logic.run());
+    }
+  }
+
   /**
    * Method that defines how view elements set data.
    *
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewEnum.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewEnum.java
new file mode 100644
index 0000000..b411d57
--- /dev/null
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewEnum.java
@@ -0,0 +1,26 @@
+package edu.ntnu.idi.idatt2003.g40.mappe.view;
+
+/**
+ * Enum representing different views in the system.
+ * */
+public enum ViewEnum {
+  /**
+   * {@link edu.ntnu.idi.idatt2003.g40.mappe.view.mainmenu.MainMenuView}.
+   * */
+  MAIN_MENU,
+
+  /**
+   * {@link edu.ntnu.idi.idatt2003.g40.mappe.view.settings.SettingsView}.
+   * */
+  SETTINGS,
+
+  /**
+   * {@link edu.ntnu.idi.idatt2003.g40.mappe.view.playgame.PlayGameView}.
+   * */
+  PLAY_GAME,
+
+  /**
+   * {@link edu.ntnu.idi.idatt2003.g40.mappe.view.ingame.InGameView}.
+   * */
+  IN_GAME;
+}
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewManager.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewManager.java
index d7a3711..183fb64 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewManager.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewManager.java
@@ -26,7 +26,7 @@ public final class ViewManager implements EventSubscriber {
    * A map with String keys and {@link ViewElement} objects as values.
    *
    */
-  private final Map<String, ViewElement<?>> viewMap;
+  private final Map<ViewEnum, ViewElement<?, ?>> viewMap;
 
   /**
    * The main stage of the application.
@@ -38,7 +38,7 @@ public final class ViewManager implements EventSubscriber {
    * Current view. Used for testing and debugging purposes.
    *
    */
-  private ViewElement<?> currentView;
+  private ViewElement<?, ?> currentView;
 
   /**
    * Constructor.
@@ -68,7 +68,7 @@ public ViewManager(final Stage stage, final EventManager eventManager)
    * @throws IllegalArgumentException if view is already in map, or if
    *         view does not have view name (widget).
    */
-  public void addView(final ViewElement<?> view)
+  public void addView(final ViewElement<?, ?> view)
           throws IllegalArgumentException {
     if (view.getViewName() == null) {
       throw new IllegalArgumentException("Cannot add widget"
@@ -91,7 +91,7 @@ public void addView(final ViewElement<?> view)
    *
    * @throws IllegalArgumentException if view is not in view map.
    */
-  public void setScene(final ViewElement<?> viewElement)
+  public void setScene(final ViewElement<?, ?> viewElement)
           throws IllegalArgumentException {
     if (viewElement == null
             || !viewMap.containsKey(viewElement.getViewName())) {
@@ -129,7 +129,7 @@ public void setScene(final ViewData data) throws IllegalArgumentException {
     if (data == null) {
       throw new IllegalArgumentException("Data is null!");
     } else {
-      ViewElement<?> viewElement = viewMap.get(data.getSceneName());
+      ViewElement<?, ?> viewElement = viewMap.get(data.getSceneName());
       viewElement.setData(data);
       setScene(viewElement);
       currentView = viewElement;
@@ -144,7 +144,7 @@ public void setScene(final ViewData data) throws IllegalArgumentException {
    * @return the view element currently active.
    *
    */
-  public ViewElement<?> getCurrentView() {
+  public ViewElement<?, ?> getCurrentView() {
     return currentView;
   }
 
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/mainmenu/MainMenuActions.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/mainmenu/MainMenuActions.java
new file mode 100644
index 0000000..37ad15c
--- /dev/null
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/mainmenu/MainMenuActions.java
@@ -0,0 +1,7 @@
+package edu.ntnu.idi.idatt2003.g40.mappe.view.mainmenu;
+
+public enum MainMenuActions {
+  START_GAME,
+  SETTINGS,
+  EXIT;
+}
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/mainmenu/MainMenuController.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/mainmenu/MainMenuController.java
index bf2f1c5..a9343a1 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/mainmenu/MainMenuController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/mainmenu/MainMenuController.java
@@ -5,14 +5,13 @@
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventType;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewController;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewData;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewEnum;
 import javafx.application.Platform;
 
 /**
  * Controller for the {@link MainMenuView}.
  *
- * <p>
- * Extends {@link ViewController}
- * </p>
+ * <p>Extends {@link ViewController} </p>
  */
 public class MainMenuController extends ViewController<MainMenuView> {
 
@@ -31,24 +30,20 @@ public MainMenuController(final MainMenuView view,
   /**
    * {@inheritDoc}
    *
-   * <p>
-   * Sets play game, settings, and exit button functionality.
-   * </p>
+   * <p>Sets play game, settings, and exit button functionality.</p>
    */
   @Override
   protected void initInteractions() {
-    getViewElement().getToGameButton().setOnAction(e -> {
-      ViewData viewData = new ViewData("PlayGameView");
-      EventData<ViewData> eventData = new EventData<>(EventType.SCENE_CHANGE, viewData);
-      invoke(eventData, getEventManager());
+
+    getViewElement().setOnAction(MainMenuActions.START_GAME, () -> {
+      changeScene(ViewEnum.PLAY_GAME);
     });
 
-    getViewElement().getSettingsButton().setOnAction(e -> {
-      ViewData viewData = new ViewData("SettingsView");
-      EventData<ViewData> eventData = new EventData<>(EventType.SCENE_CHANGE, viewData);
-      getEventManager().invokeEvent(eventData);
+    getViewElement().setOnAction(MainMenuActions.SETTINGS, () -> {
+      changeScene(ViewEnum.SETTINGS);
     });
 
-    getViewElement().getExitButton().setOnAction(e -> Platform.exit());
+    getViewElement().setOnAction(MainMenuActions.EXIT, Platform::exit);
+
   }
 }
\ No newline at end of file
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/mainmenu/MainMenuView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/mainmenu/MainMenuView.java
index 2ab0584..c2fd089 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/mainmenu/MainMenuView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/mainmenu/MainMenuView.java
@@ -1,6 +1,7 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.mainmenu;
 
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewElement;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewEnum;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.layout.StackPane;
@@ -13,7 +14,7 @@
  * <p>Extends {@link ViewElement},
  * with a root pane of {@link StackPane}</p>
  * */
-public class MainMenuView extends ViewElement<StackPane> {
+public class MainMenuView extends ViewElement<StackPane, MainMenuActions> {
 
   /**
    * Game title.
@@ -46,34 +47,7 @@ public class MainMenuView extends ViewElement<StackPane> {
    * <p>Constructs with name "MainMenu"</p>
    * */
   public MainMenuView() {
-    super(new StackPane(), "MainMenu");
-  }
-
-  /**
-   * Getter method for "Play" button.
-   *
-   * @return Play game button.
-   * */
-  public Button getToGameButton() {
-    return toGameButton;
-  }
-
-  /**
-   * Getter method for "Settings" button.
-   *
-   * @return Settings button.
-   * */
-  public Button getSettingsButton() {
-    return settingsButton;
-  }
-
-  /**
-   * Getter method for "Exit" button.
-   *
-   * @return Exit button.
-   * */
-  public Button getExitButton() {
-    return exitButton;
+    super(new StackPane(), ViewEnum.MAIN_MENU, MainMenuActions.class);
   }
 
   /**
@@ -102,6 +76,9 @@ protected void initLayout() {
     );
     getRootPane().getChildren().add(buttonContainer);
     StackPane.setAlignment(buttonContainer, Pos.CENTER);
+    registerButton(MainMenuActions.START_GAME, toGameButton);
+    registerButton(MainMenuActions.SETTINGS, settingsButton);
+    registerButton(MainMenuActions.EXIT, exitButton);
   }
 
   /**
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/playgame/PlayGameActions.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/playgame/PlayGameActions.java
new file mode 100644
index 0000000..03053e3
--- /dev/null
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/playgame/PlayGameActions.java
@@ -0,0 +1,6 @@
+package edu.ntnu.idi.idatt2003.g40.mappe.view.playgame;
+
+public enum PlayGameActions {
+  NEW_GAME,
+  BACK,
+}
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/playgame/PlayGameController.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/playgame/PlayGameController.java
index 0f8472c..22d9db4 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/playgame/PlayGameController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/playgame/PlayGameController.java
@@ -1,57 +1,42 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.playgame;
 
-import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventData;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventManager;
-import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventType;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewController;
-import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewData;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewEnum;
 
 /**
  * Controller for the {@link PlayGameView}.
  *
- * <p>
- * Extends {@link ViewController}
- * </p>
+ * <p>Extends {@link ViewController}</p>
  */
 public class PlayGameController extends ViewController<PlayGameView> {
 
-    /**
-     * Constructor.
-     *
-     * @param view         The {@link PlayGameView} object to attach this controller
-     *                     to.
-     * @param eventManager the active {@link EventManager}.
-     */
-    public PlayGameController(final PlayGameView view,
-            final EventManager eventManager) {
-        super(view, eventManager);
-    }
+  /**
+   * Constructor.
+   *
+   * @param view         The {@link PlayGameView} object to attach
+   *                     this controller to.
+   * @param eventManager the active {@link EventManager}.
+   */
+  public PlayGameController(final PlayGameView view,
+                            final EventManager eventManager) {
+    super(view, eventManager);
+  }
 
-    /**
-     * {@inheritDoc}
-     *
-     * <p>
-     * Sets create new game, back, and save-row click functionality.
-     * </p>
-     */
-    @Override
-    protected void initInteractions() {
-        getViewElement().getCreateNewGameButton().setOnAction(e -> {
-            ViewData viewData = new ViewData("InGameView");
-            EventData<ViewData> eventData = new EventData<>(EventType.SCENE_CHANGE, viewData);
-            getEventManager().invokeEvent(eventData);
-        });
+  /**
+   * {@inheritDoc}-
+   *
+   * <p>Sets create new game, back, and save-row click functionality. </p>
+   */
+  @Override
+  protected void initInteractions() {
+    getViewElement().setOnAction(PlayGameActions.NEW_GAME, () ->
+            changeScene(ViewEnum.IN_GAME));
 
-        getViewElement().getBackButton().setOnAction(e -> {
-            ViewData viewData = new ViewData("MainMenu");
-            EventData<ViewData> eventData = new EventData<>(EventType.SCENE_CHANGE, viewData);
-            getEventManager().invokeEvent(eventData);
-        });
+    getViewElement().setOnAction(PlayGameActions.BACK, () ->
+            changeScene(ViewEnum.MAIN_MENU));
 
-        getViewElement().setOnSaveSelected(save -> {
-            ViewData viewData = new ViewData("InGameView");
-            EventData<ViewData> eventData = new EventData<>(EventType.SCENE_CHANGE, viewData);
-            getEventManager().invokeEvent(eventData);
-        });
-    }
+    getViewElement().setOnSaveSelected(save ->
+            changeScene(ViewEnum.IN_GAME));
+  }
 }
\ No newline at end of file
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/playgame/PlayGameView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/playgame/PlayGameView.java
index ca8459b..f4f5691 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/playgame/PlayGameView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/playgame/PlayGameView.java
@@ -2,6 +2,7 @@
 
 import edu.ntnu.idi.idatt2003.g40.mappe.model.SaveGame;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewElement;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewEnum;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Cursor;
@@ -35,7 +36,7 @@
  * background image can sit behind the central panel.
  * </p>
  */
-public class PlayGameView extends ViewElement<StackPane> {
+public class PlayGameView extends ViewElement<StackPane, PlayGameActions> {
 
   /** "Create new game" button. */
   private Button createNewGameButton;
@@ -70,15 +71,7 @@ public class PlayGameView extends ViewElement<StackPane> {
    * </p>
    */
   public PlayGameView() {
-    super(new StackPane(), "PlayGameView");
-  }
-
-  public Button getCreateNewGameButton() {
-    return createNewGameButton;
-  }
-
-  public Button getBackButton() {
-    return backButton;
+    super(new StackPane(), ViewEnum.PLAY_GAME, PlayGameActions.class);
   }
 
   /**
@@ -128,6 +121,9 @@ protected void initLayout() {
     // Make the background fill the root pane.
     backgroundImage.fitWidthProperty().bind(getRootPane().widthProperty());
     backgroundImage.fitHeightProperty().bind(getRootPane().heightProperty());
+
+    registerButton(PlayGameActions.NEW_GAME, createNewGameButton);
+    registerButton(PlayGameActions.BACK, backButton);
   }
 
   /** {@inheritDoc} */
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/settings/SettingsActions.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/settings/SettingsActions.java
new file mode 100644
index 0000000..b319a02
--- /dev/null
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/settings/SettingsActions.java
@@ -0,0 +1,8 @@
+package edu.ntnu.idi.idatt2003.g40.mappe.view.settings;
+
+public enum SettingsActions {
+  AUDIO,
+  VIDEO,
+  HOTKEYS,
+  BACK;
+}
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/settings/SettingsController.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/settings/SettingsController.java
index c364624..12fde41 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/settings/SettingsController.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/settings/SettingsController.java
@@ -5,46 +5,33 @@
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventType;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewController;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewData;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewEnum;
 
 /**
  * Controller for {@link SettingsView}.
  *
- * <p>
- * Wires up the category buttons to switch the right-hand content,
- * and the Back button to return to the main menu.
- * </p>
+ * <p>Wires up the category buttons to switch the right-hand content,
+ * and the Back button to return to the main menu.</p>
  */
 public class SettingsController extends ViewController<SettingsView> {
 
-    /**
-     * Constructor.
-     *
-     * @param view         the {@link SettingsView} this controller is attached to.
-     * @param eventManager the active {@link EventManager}.
-     */
-    public SettingsController(final SettingsView view,
-            final EventManager eventManager) {
-        super(view, eventManager);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected void initInteractions() {
-        getViewElement().getAudioButton().setOnAction(e -> getViewElement().showAudioSection());
-
-        getViewElement().getVideoButton().setOnAction(e -> getViewElement().showVideoSection());
-
-        getViewElement().getHotKeysButton().setOnAction(e -> getViewElement().showHotKeysSection());
-
-        getViewElement().getBackButton().setOnAction(e -> changeScene("MainMenu"));
-    }
-
-    /**
-     * Helper that fires a SCENE_CHANGE event toward the given scene name.
-     */
-    private void changeScene(final String sceneName) {
-        ViewData viewData = new ViewData(sceneName);
-        EventData<ViewData> eventData = new EventData<>(EventType.SCENE_CHANGE, viewData);
-        getEventManager().invokeEvent(eventData);
-    }
+  /**
+   * Constructor.
+   *
+   * @param view         the {@link SettingsView} this controller is attached to.
+   * @param eventManager the active {@link EventManager}.
+   */
+  public SettingsController(final SettingsView view,
+          final EventManager eventManager) {
+    super(view, eventManager);
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  protected void initInteractions() {
+    getViewElement().setOnAction(SettingsActions.AUDIO, () -> getViewElement().showAudioSection());
+    getViewElement().setOnAction(SettingsActions.VIDEO, () -> getViewElement().showVideoSection());
+    getViewElement().setOnAction(SettingsActions.HOTKEYS, () -> getViewElement().showHotKeysSection());
+    getViewElement().setOnAction(SettingsActions.BACK, () -> changeScene(ViewEnum.MAIN_MENU));
+  }
 }
\ No newline at end of file
diff --git a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/settings/SettingsView.java b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/settings/SettingsView.java
index c5b2d21..beb310d 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/settings/SettingsView.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/settings/SettingsView.java
@@ -1,6 +1,7 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.settings;
 
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewElement;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewEnum;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
@@ -19,177 +20,162 @@
 /**
  * View shown when the player clicks "Settings" on the main menu.
  *
- * <p>
- * Layout: left sidebar with category buttons (audio, video, hot keys)
+ * <p>Layout: left sidebar with category buttons (audio, video, hot keys)
  * and a Back button at the bottom. Right pane shows the content for the
- * currently selected category.
- * </p>
+ * currently selected category. </p>
  */
-public class SettingsView extends ViewElement<StackPane> {
-
-    /** Category buttons on the left side. */
-    private Button audioButton;
-    private Button videoButton;
-    private Button hotKeysButton;
-
-    /** Bottom-left back button. */
-    private Button backButton;
-
-    /** The currently displayed content pane on the right side. */
-    private StackPane contentArea;
-
-    /** Master volume slider for the audio section. */
-    private Slider masterVolumeSlider;
-
-    /** Background image displayed behind the panel. */
-    private ImageView backgroundImage;
-
-    /** Main border layout containing the sidebar and content area. */
-    private BorderPane mainPanel;
-
-    /**
-     * Constructor.
-     *
-     * <p>
-     * Constructs with name "SettingsView"
-     * </p>
-     */
-    public SettingsView() {
-        super(new StackPane(), "SettingsView");
-    }
-
-    public Button getAudioButton() {
-        return audioButton;
-    }
-
-    public Button getVideoButton() {
-        return videoButton;
-    }
-
-    public Button getHotKeysButton() {
-        return hotKeysButton;
-    }
-
-    public Button getBackButton() {
-        return backButton;
-    }
-
-    public Slider getMasterVolumeSlider() {
-        return masterVolumeSlider;
-    }
-
-    /**
-     * Replaces the content area with the audio section (master volume).
-     */
-    public void showAudioSection() {
-        Label title = new Label("master volume");
-        title.getStyleClass().add("settings-title");
-
-        masterVolumeSlider = new Slider(0, 100, 50);
-        masterVolumeSlider.setMaxWidth(360);
-        masterVolumeSlider.getStyleClass().add("settings-slider");
-
-        VBox audioBox = new VBox(20, title, masterVolumeSlider);
-        audioBox.setAlignment(Pos.TOP_CENTER);
-        audioBox.setPadding(new Insets(30));
-
-        contentArea.getChildren().setAll(audioBox);
-    }
-
-    /**
-     * Replaces the content area with the video section placeholder.
-     */
-    public void showVideoSection() {
-        Label title = new Label("video");
-        title.getStyleClass().add("settings-title");
-        Label placeholder = new Label("(video settings coming soon)");
-        placeholder.getStyleClass().add("settings-placeholder");
-
-        VBox videoBox = new VBox(20, title, placeholder);
-        videoBox.setAlignment(Pos.TOP_CENTER);
-        videoBox.setPadding(new Insets(30));
-
-        contentArea.getChildren().setAll(videoBox);
-    }
-
-    /**
-     * Replaces the content area with the hot keys section placeholder.
-     */
-    public void showHotKeysSection() {
-        Label title = new Label("hot keys");
-        title.getStyleClass().add("settings-title");
-        Label placeholder = new Label("(hot key bindings coming soon)");
-        placeholder.getStyleClass().add("settings-placeholder");
-
-        VBox hotKeysBox = new VBox(20, title, placeholder);
-        hotKeysBox.setAlignment(Pos.TOP_CENTER);
-        hotKeysBox.setPadding(new Insets(30));
-
-        contentArea.getChildren().setAll(hotKeysBox);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected void initLayout() {
-        backgroundImage = new ImageView(new Image(Objects.requireNonNull(
-                getClass().getResourceAsStream("/millionsbackground.png"))));
-        backgroundImage.setPreserveRatio(false);
-
-        audioButton = new Button("audio");
-        videoButton = new Button("video");
-        hotKeysButton = new Button("hot keys");
-        backButton = new Button("Back");
-
-        // Spacer pushes the Back button to the bottom of the sidebar.
-        Region spacer = new Region();
-        VBox.setVgrow(spacer, javafx.scene.layout.Priority.ALWAYS);
-
-        VBox sidebar = new VBox(15,
-                audioButton, videoButton, hotKeysButton, spacer, backButton);
-        sidebar.setAlignment(Pos.TOP_LEFT);
-        sidebar.setPadding(new Insets(30));
-        sidebar.setPrefWidth(180);
-
-        contentArea = new StackPane();
-        contentArea.setPadding(new Insets(30));
-
-        mainPanel = new BorderPane();
-        mainPanel.setLeft(sidebar);
-        mainPanel.setCenter(contentArea);
-        mainPanel.setMaxWidth(800);
-        mainPanel.setMaxHeight(500);
-
-        // Center the BorderPane on top of the background.
-        HBox centerWrapper = new HBox(mainPanel);
-        centerWrapper.setAlignment(Pos.CENTER);
-
-        getRootPane().getChildren().addAll(backgroundImage, centerWrapper);
-
-        // Make the background fill the root pane.
-        backgroundImage.fitWidthProperty().bind(getRootPane().widthProperty());
-        backgroundImage.fitHeightProperty().bind(getRootPane().heightProperty());
-
-        // Default section shown when settings opens.
-        showAudioSection();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected void initStyling() {
-        getRootPane().getStyleClass().add("main-menu-bg");
-        mainPanel.getStyleClass().add("settings-panel");
-        audioButton.getStyleClass().add("settings-tab-button");
-        videoButton.getStyleClass().add("settings-tab-button");
-        hotKeysButton.getStyleClass().add("settings-tab-button");
-        backButton.getStyleClass().add("settings-tab-button");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void onUpdate() {
-        // Reset til audio-section hver gang viewet vises.
-        if (contentArea != null) {
-            showAudioSection();
-        }
+public class SettingsView extends ViewElement<StackPane, SettingsActions> {
+
+  /** Category buttons on the left side. */
+  private Button audioButton;
+  private Button videoButton;
+  private Button hotKeysButton;
+
+  /** Bottom-left back button. */
+  private Button backButton;
+
+  /** The currently displayed content pane on the right side. */
+  private StackPane contentArea;
+
+  /** Master volume slider for the audio section. */
+  private Slider masterVolumeSlider;
+
+  /** Background image displayed behind the panel. */
+  private ImageView backgroundImage;
+
+  /** Main border layout containing the sidebar and content area. */
+  private BorderPane mainPanel;
+
+  /**
+   * Constructor.
+   *
+   * <p>Constructs with name "SettingsView"</p>
+   */
+  public SettingsView() {
+    super(new StackPane(), ViewEnum.SETTINGS, SettingsActions.class);
+  }
+
+  public Slider getMasterVolumeSlider() {
+      return masterVolumeSlider;
+  }
+
+  /**
+   * Replaces the content area with the audio section (master volume).
+   */
+  public void showAudioSection() {
+    Label title = new Label("master volume");
+    title.getStyleClass().add("settings-title");
+
+    masterVolumeSlider = new Slider(0, 100, 50);
+    masterVolumeSlider.setMaxWidth(360);
+    masterVolumeSlider.getStyleClass().add("settings-slider");
+
+    VBox audioBox = new VBox(20, title, masterVolumeSlider);
+    audioBox.setAlignment(Pos.TOP_CENTER);
+    audioBox.setPadding(new Insets(30));
+
+    contentArea.getChildren().setAll(audioBox);
+  }
+
+  /**
+   * Replaces the content area with the video section placeholder.
+   */
+  public void showVideoSection() {
+    Label title = new Label("video");
+    title.getStyleClass().add("settings-title");
+    Label placeholder = new Label("(video settings coming soon)");
+    placeholder.getStyleClass().add("settings-placeholder");
+
+    VBox videoBox = new VBox(20, title, placeholder);
+    videoBox.setAlignment(Pos.TOP_CENTER);
+    videoBox.setPadding(new Insets(30));
+
+    contentArea.getChildren().setAll(videoBox);
+  }
+
+  /**
+   * Replaces the content area with the hot keys section placeholder.
+   */
+  public void showHotKeysSection() {
+    Label title = new Label("hot keys");
+    title.getStyleClass().add("settings-title");
+    Label placeholder = new Label("(hot key bindings coming soon)");
+    placeholder.getStyleClass().add("settings-placeholder");
+
+    VBox hotKeysBox = new VBox(20, title, placeholder);
+    hotKeysBox.setAlignment(Pos.TOP_CENTER);
+    hotKeysBox.setPadding(new Insets(30));
+
+    contentArea.getChildren().setAll(hotKeysBox);
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  protected void initLayout() {
+    backgroundImage = new ImageView(new Image(Objects.requireNonNull(
+            getClass().getResourceAsStream("/millionsbackground.png"))));
+    backgroundImage.setPreserveRatio(false);
+
+    audioButton = new Button("audio");
+    videoButton = new Button("video");
+    hotKeysButton = new Button("hot keys");
+    backButton = new Button("Back");
+
+    // Spacer pushes the Back button to the bottom of the sidebar.
+    Region spacer = new Region();
+    VBox.setVgrow(spacer, javafx.scene.layout.Priority.ALWAYS);
+
+    VBox sidebar = new VBox(15,
+            audioButton, videoButton, hotKeysButton, spacer, backButton);
+    sidebar.setAlignment(Pos.TOP_LEFT);
+    sidebar.setPadding(new Insets(30));
+    sidebar.setPrefWidth(180);
+
+    contentArea = new StackPane();
+    contentArea.setPadding(new Insets(30));
+
+    mainPanel = new BorderPane();
+    mainPanel.setLeft(sidebar);
+    mainPanel.setCenter(contentArea);
+    mainPanel.setMaxWidth(800);
+    mainPanel.setMaxHeight(500);
+
+    // Center the BorderPane on top of the background.
+    HBox centerWrapper = new HBox(mainPanel);
+    centerWrapper.setAlignment(Pos.CENTER);
+
+    getRootPane().getChildren().addAll(backgroundImage, centerWrapper);
+
+    // Make the background fill the root pane.
+    backgroundImage.fitWidthProperty().bind(getRootPane().widthProperty());
+    backgroundImage.fitHeightProperty().bind(getRootPane().heightProperty());
+
+    // Default section shown when settings opens.
+    showAudioSection();
+
+    registerButton(SettingsActions.AUDIO, audioButton);
+    registerButton(SettingsActions.VIDEO, videoButton);
+    registerButton(SettingsActions.HOTKEYS, hotKeysButton);
+    registerButton(SettingsActions.BACK, backButton);
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  protected void initStyling() {
+    getRootPane().getStyleClass().add("main-menu-bg");
+    mainPanel.getStyleClass().add("settings-panel");
+    audioButton.getStyleClass().add("settings-tab-button");
+    videoButton.getStyleClass().add("settings-tab-button");
+    hotKeysButton.getStyleClass().add("settings-tab-button");
+    backButton.getStyleClass().add("settings-tab-button");
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public void onUpdate() {
+    // Reset til audio-section hver gang viewet vises.
+    if (contentArea != null) {
+      showAudioSection();
     }
+  }
 }
\ No newline at end of file
diff --git a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/event/EventManagerTest.java b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/event/EventManagerTest.java
index 58d6d0e..716e96e 100644
--- a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/event/EventManagerTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/event/EventManagerTest.java
@@ -1,6 +1,7 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.service.event;
 
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewData;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewEnum;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -72,7 +73,7 @@ private class GenericEventPublisher implements EventPublisher {
     private final EventManager eventManager;
 
     public GenericEventPublisher(final EventManager eventManager, final TestEventTypes eventType) {
-      viewData = new ViewData("Test");
+      viewData = new ViewData(ViewEnum.IN_GAME);
       eventData = new EventData<ViewData>(eventType, viewData);
       this.eventManager = eventManager;
     }
diff --git a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewControllerTest.java b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewControllerTest.java
index abf0158..e105cdf 100644
--- a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewControllerTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewControllerTest.java
@@ -29,18 +29,22 @@ void controllerElementSetsButtonBehavior() {
     assertTrue(testViewElement.buttonPressed);
   }
 
-  private class GenericViewElement extends ViewElement<Pane> {
+  private enum GenericViewActions {
+    TEST_ACTION;
+  }
+
+  private class GenericViewElement extends ViewElement<Pane, GenericViewActions> {
     public Boolean buttonPressed = false;
     private Button interactableButton;
 
     protected GenericViewElement(final Pane rootPane) {
-      super(rootPane);
+      super(rootPane, GenericViewActions.class);
     }
 
     @Override
     protected void initLayout() {
       interactableButton = new Button("Click me!");
-      getButtons().add(interactableButton);
+      registerButton(GenericViewActions.TEST_ACTION, interactableButton);
     }
 
     public Button getInteractableButton() {
@@ -61,7 +65,7 @@ protected GenericViewController(final ViewControllerTest.GenericViewElement view
 
     @Override
     protected void initInteractions() {
-      getViewElement().getInteractableButton().setOnAction(e -> {
+      getViewElement().setOnAction(GenericViewActions.TEST_ACTION, () -> {
         getViewElement().buttonPressed = true;
       });
     }
diff --git a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewManagerTest.java b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewManagerTest.java
index 1f9aeb3..b5edcfe 100644
--- a/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewManagerTest.java
+++ b/src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ViewManagerTest.java
@@ -64,22 +64,27 @@ void throwsErrorWhenAddingWidgetWithNoViewName() {
     });
   }
 
-  private class GenericViewElement extends ViewElement<Pane> {
+  private enum GenericActions {
+    ACTION_1;
+  }
+
+
+  private class GenericViewElement extends ViewElement<Pane, GenericActions> {
     public Boolean buttonPressed = false;
     private Button interactableButton;
 
     protected GenericViewElement(final Pane rootPane, final String viewName) {
-      super(rootPane, viewName);
+      super(rootPane, viewName, GenericActions.class);
     }
 
     protected GenericViewElement(final Pane rootPane) {
-      super(rootPane);
+      super(rootPane, GenericActions.class);
     }
 
     @Override
     protected void initLayout() {
       interactableButton = new Button("Click me!");
-      getButtons().add(interactableButton);
+      registerButton(GenericActions.ACTION_1, interactableButton);
     }
 
     public Button getInteractableButton() {
@@ -100,7 +105,7 @@ protected GenericViewController(final ViewManagerTest.GenericViewElement viewEle
 
     @Override
     protected void initInteractions() {
-      getViewElement().getInteractableButton().setOnAction(e -> {
+      getViewElement().setOnAction(GenericActions.ACTION_1, () -> {
         getViewElement().buttonPressed = true;
       });
     }