diff --git a/Content/DoorOverlay.uasset b/Content/DoorOverlay.uasset
index 16120de5acd753b3846a98ed20e35e3121557c7a..54882e27755333031706fbdd602fd809f3b146f8 100644
Binary files a/Content/DoorOverlay.uasset and b/Content/DoorOverlay.uasset differ
diff --git a/Source/CAVEOverlay/Private/CAVEOverlayController.cpp b/Source/CAVEOverlay/Private/CAVEOverlayController.cpp
index 0c667b68a41cb1f3dae904fc53c019aa2f8bd27d..d15ec0f6d11f08e68a9b95abcbea94be4f47b7f6 100644
--- a/Source/CAVEOverlay/Private/CAVEOverlayController.cpp
+++ b/Source/CAVEOverlay/Private/CAVEOverlayController.cpp
@@ -21,11 +21,11 @@
 DEFINE_LOG_CATEGORY(LogCAVEOverlay);
 
 template <std::size_t S>
-bool ContainsFString(const std::array<FString, S>& A, const FString& Entry)
+bool ContainsFString(const std::array<FString, S>& Array, const FString& Entry)
 {
-	for (FString CS : A)
+	for (FString Current_Entry : Array)
 	{
-		if (CS.Equals(Entry, ESearchCase::IgnoreCase)) return true;
+		if (Current_Entry.Equals(Entry, ESearchCase::IgnoreCase)) return true;
 	}
 	return false;
 }
@@ -188,6 +188,7 @@ void ACAVEOverlayController::BeginPlay()
 
 	//Input config
 	InputComponent->BindAction("Action4", EInputEvent::IE_Pressed, this, &ACAVEOverlayController::CycleDoorType);
+	InputComponent->BindKey(EKeys::F10, EInputEvent::IE_Pressed, this, &ACAVEOverlayController::CycleDoorType);
 
 	//Determine the screen-type for later usage
 	if (IDisplayCluster::Get().GetClusterMgr()->GetNodeId().Equals(Screen_Main, ESearchCase::IgnoreCase))
@@ -261,6 +262,18 @@ void ACAVEOverlayController::Tick(float DeltaTime)
 		bAttached = true;
 	}
 
+	//FPS Counter
+	if (Overlay) {
+		if (Door_Current_Mode == EDoor_Mode::DOOR_DEBUG && ContainsFString(Screens_FPS, IDisplayCluster::Get().GetClusterMgr()->GetNodeId()))
+		{
+			Overlay->FPS->SetText(FText::FromString(FString::Printf(TEXT("FPS: %.1f"), 1.0f / DeltaTime)));
+		}
+		else
+		{
+			Overlay->FPS->SetText(FText::FromString(""));
+		}
+	}
+	
 	if (!Shutter_Glasses) return; //Display Cluster not initialized
 
 	//Tape Logic
@@ -317,14 +330,4 @@ void ACAVEOverlayController::Tick(float DeltaTime)
 		Sign_Positive_X->SetVisibility(false);
 		Sign_Positive_Y->SetVisibility(false);
 	}
-
-	//FPS
-	if (Overlay && EDoor_Mode::DOOR_DEBUG && ContainsFString(Screens_FPS, IDisplayCluster::Get().GetClusterMgr()->GetNodeId()))
-	{
-		Overlay->FPS->SetText(FText::FromString(FString::Printf(TEXT("FPS: %.1f"), 1.0f / DeltaTime)));
-	}
-	else
-	{
-		Overlay->FPS->SetText(FText::FromString(""));
-	}
 }
diff --git a/Source/CAVEOverlay/Private/DoorOverlayData.cpp b/Source/CAVEOverlay/Private/DoorOverlayData.cpp
deleted file mode 100644
index 9ef86d7c227f37afc17a38ece6f692ad806757f0..0000000000000000000000000000000000000000
--- a/Source/CAVEOverlay/Private/DoorOverlayData.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "DoorOverlayData.h"
-