diff --git a/changelog.txt b/changelog.txt
new file mode 100644
index 0000000000..920800cbd5
--- /dev/null
+++ b/changelog.txt
@@ -0,0 +1,55 @@
+0.4.7
+Bugfixes
+    Fixed replays sometimes not unloading
+    Fixed width of settings panel labels
+    Mapfinished panel resets to page 0 properly
+    Added StartupVids.txt to override Valve's startup vid
+
+0.4.5
+Changelog Introduced
+    The version update panel now includes a changelog for the newer version.
+Spectator UI Updated
+    Now includes toggled mouse control upon pressing your +duck bind
+    Added a red X that stops the replay and respawns the player (similar to MapFinished)
+Bugfixes
+    Fixed scroll detection
+        Scrolls of all force are detected now, player should jump properly (sorry about that, scrollers!)
+    Replays
+        Fixed crash with replays not unloading properly
+        Fixed potential crash with replays ending
+        Fixed velocity setting to a value that was too high (due to teleports)
+        Fixed potential "roaming" spec mode if replay was finished
+    Ending player movement actually approaches 0 now
+        The player will actually stop inside the end trigger
+
+0.4.0
+Replay System
+    Automatically records replays for every run
+    Small, lightweight file (28 bytes / tick)
+    Truncates the recording to the first two seconds before the run started to show prestrafe only
+    Supports all stats that were displayed during the real run
+    Allows playback of ghosts with options for 15 different display models and customizable colors (see mom_replay_* commands for more details)
+Comparisons Panel
+    Compare your current run against your PB
+    Compare against any run stats; all, some or none
+Precise Timer
+    Times accurate to 6 decimal places (however, we currently only display 3 decimal places)
+    The only timer for surf or bhop that is more accurate than the interval per tick
+    Read about how it works on our devblog
+Map Finished Screen
+    Mouse controls for watching the replay of the run you just finished
+    Pages for stats in every zone, not just overall
+    Shows both XY and XYZ velocity (controlled by mom_speedometer_hvel currently)
+Other changes
+    Added Source Shader Editor
+    Added both XY and XYZ velocities to run stats
+    Player's velocity is now slowed down when they finish a map to allow them to see the map finished screen
+    Crosshair is off by default
+    left and right are now bindable from Options->Keyboard
+    JUMP indicator in key press display no longer flashes when the player uses the scroll wheel to jump
+    Credits can now go faster if attack is pressed
+    Disabled demo interpolation, which fixes demo stuttering bug, but makes demos lag. Demos will work properly if you turn off client interpolation (cl_interp 0) but this breaks other things
+    point_servercommand entities are disabled by default
+    sv_gravity is development-only (sorry)
+    Player FOV setting now works properly through fov_desired
+    Changed mom_generate_zon_file to mom_zone_generate
\ No newline at end of file
diff --git a/mp/game/momentum/media/StartupVids.txt b/mp/game/momentum/media/StartupVids.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/mp/game/momentum/resource/SourceScheme.res b/mp/game/momentum/resource/SourceScheme.res
index 8a7796febd..7877e6de37 100644
--- a/mp/game/momentum/resource/SourceScheme.res
+++ b/mp/game/momentum/resource/SourceScheme.res
@@ -89,7 +89,7 @@ Scheme
 		FrameSystemButton.BgColor		"Blank"
 		FrameSystemButton.Icon			""
 		FrameSystemButton.DisabledIcon	""
-		FrameTitleBar.Font				"Verdana"		
+		FrameTitleBar.Font				"DefaultSmall"		
 		FrameTitleBar.TextColor			"255 255 255 204"
 		FrameTitleBar.BgColor			"Blank"
 		FrameTitleBar.DisabledTextColor	"255 255 255 91"
@@ -255,6 +255,7 @@ Scheme
 				"name"		"Verdana" [$LINUX]
 				"tall"		"16"
 				"weight"	"500"
+                "antialias" "1"
 			}
 		}
 		"DefaultBold"
@@ -287,6 +288,7 @@ Scheme
 				"tall"		"12" [!$LINUX]
 				"tall"		"16" [$LINUX]
 				"weight"	"0"
+                "antialias" "1"
 			}
 		}
 		"DefaultSmallDropShadow"
@@ -298,6 +300,7 @@ Scheme
 				"tall"		"13"
 				"weight"	"0"
 				"dropshadow" "1"
+                "antialias" "1"
 			}
 		}
 		"DefaultVerySmall"
@@ -306,8 +309,10 @@ Scheme
 			{
 				"name"		"Tahoma" [!$LINUX]
 				"name"		"Verdana" [$LINUX]
-				"tall"		"12"
+				"tall"		"12" [$LINUX]
+                "tall"      "10" [!$LINUX]
 				"weight"	"0"
+                "antialias" "1"
 			}
 		}
 
diff --git a/mp/game/momentum/resource/gameui_english.txt b/mp/game/momentum/resource/gameui_english.txt
index ff333582f8..f07a8ecd8b 100644
Binary files a/mp/game/momentum/resource/gameui_english.txt and b/mp/game/momentum/resource/gameui_english.txt differ
diff --git a/mp/game/momentum/resource/ui/MomentumSettingsPanel.res b/mp/game/momentum/resource/ui/MomentumSettingsPanel.res
index e34057f1d9..a4af93d2b4 100644
--- a/mp/game/momentum/resource/ui/MomentumSettingsPanel.res
+++ b/mp/game/momentum/resource/ui/MomentumSettingsPanel.res
@@ -4,10 +4,10 @@
 	{
 		"ControlName"		"CMomentumSettingsPanel"
 		"fieldName"		"CMomentumSettingsPanel"
-		"xpos"		"337"
-		"ypos"		"74"
-		"wide"		"360"
-		"tall"		"360"
+		"xpos"		"304"
+		"ypos"		"144"
+		"wide"		"266"
+		"tall"		"266"
 		"autoResize"		"1"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -25,7 +25,7 @@
 		"fieldName"		"frame_topGrip"
 		"xpos"		"4"
 		"ypos"		"0"
-		"wide"		"351"
+		"wide"		"258"
 		"tall"		"2"
 		"autoResize"		"0"
 		"pinCorner"		"0"
@@ -41,8 +41,8 @@
 		"ControlName"		"Panel"
 		"fieldName"		"frame_bottomGrip"
 		"xpos"		"4"
-		"ypos"		"357"
-		"wide"		"346"
+		"ypos"		"264"
+		"wide"		"252"
 		"tall"		"2"
 		"autoResize"		"0"
 		"pinCorner"		"0"
@@ -60,7 +60,7 @@
 		"xpos"		"0"
 		"ypos"		"4"
 		"wide"		"2"
-		"tall"		"351"
+		"tall"		"258"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -74,10 +74,10 @@
 	{
 		"ControlName"		"Panel"
 		"fieldName"		"frame_rightGrip"
-		"xpos"		"357"
+		"xpos"		"264"
 		"ypos"		"4"
 		"wide"		"2"
-		"tall"		"346"
+		"tall"		"252"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -108,7 +108,7 @@
 	{
 		"ControlName"		"Panel"
 		"fieldName"		"frame_trGrip"
-		"xpos"		"355"
+		"xpos"		"262"
 		"ypos"		"0"
 		"wide"		"4"
 		"tall"		"4"
@@ -126,7 +126,7 @@
 		"ControlName"		"Panel"
 		"fieldName"		"frame_blGrip"
 		"xpos"		"0"
-		"ypos"		"355"
+		"ypos"		"262"
 		"wide"		"4"
 		"tall"		"4"
 		"autoResize"		"0"
@@ -142,8 +142,8 @@
 	{
 		"ControlName"		"Panel"
 		"fieldName"		"frame_brGrip"
-		"xpos"		"350"
-		"ypos"		"350"
+		"xpos"		"257"
+		"ypos"		"257"
 		"wide"		"9"
 		"tall"		"9"
 		"autoResize"		"0"
@@ -161,7 +161,7 @@
 		"fieldName"		"frame_caption"
 		"xpos"		"0"
 		"ypos"		"0"
-		"wide"		"354"
+		"wide"		"261"
 		"tall"		"12"
 		"autoResize"		"0"
 		"pinCorner"		"0"
@@ -178,8 +178,8 @@
 		"fieldName"		"frame_minimize"
 		"xpos"		"0"
 		"ypos"		"0"
-		"wide"		"8"
-		"tall"		"8"
+		"wide"		"0"
+		"tall"		"0"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -196,7 +196,7 @@
 		"centerwrap"		"0"
 		"textinsetx"		"2"
 		"textinsety"		"1"
-		"auto_wide_tocontents"		"0"
+		"auto_wide_tocontents"		"1"
 		"use_proportional_insets"		"0"
 		"Default"		"0"
 	}
@@ -206,8 +206,8 @@
 		"fieldName"		"frame_maximize"
 		"xpos"		"0"
 		"ypos"		"0"
-		"wide"		"8"
-		"tall"		"8"
+		"wide"		"0"
+		"tall"		"0"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -224,7 +224,7 @@
 		"centerwrap"		"0"
 		"textinsetx"		"2"
 		"textinsety"		"1"
-		"auto_wide_tocontents"		"0"
+		"auto_wide_tocontents"		"1"
 		"use_proportional_insets"		"0"
 		"Default"		"0"
 	}
@@ -234,8 +234,8 @@
 		"fieldName"		"frame_mintosystray"
 		"xpos"		"0"
 		"ypos"		"0"
-		"wide"		"8"
-		"tall"		"8"
+		"wide"		"0"
+		"tall"		"0"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -252,7 +252,7 @@
 		"centerwrap"		"0"
 		"textinsetx"		"2"
 		"textinsety"		"1"
-		"auto_wide_tocontents"		"0"
+		"auto_wide_tocontents"		"1"
 		"use_proportional_insets"		"0"
 		"command"		"MinimizeToSysTray"
 		"Default"		"0"
@@ -261,7 +261,7 @@
 	{
 		"ControlName"		"Button"
 		"fieldName"		"frame_close"
-		"xpos"		"335"
+		"xpos"		"242"
 		"ypos"		"8"
 		"wide"		"17"
 		"tall"		"17"
@@ -281,9 +281,9 @@
 		"centerwrap"		"0"
 		"textinsetx"		"4"
 		"textinsety"		"2"
-		"auto_wide_tocontents"		"0"
+		"auto_wide_tocontents"		"1"
 		"use_proportional_insets"		"0"
-		"Default"		"1"
+		"Default"		"0"
 	}
 	"frame_menu"
 	{
@@ -308,7 +308,7 @@
 		"centerwrap"		"0"
 		"textinsetx"		"0"
 		"textinsety"		"0"
-		"auto_wide_tocontents"		"0"
+		"auto_wide_tocontents"		"1"
 		"use_proportional_insets"		"0"
 		"Default"		"0"
 	}
@@ -316,11 +316,11 @@
 	{
 		"ControlName"		"ComboBox"
 		"fieldName"		"SpeedoUnits"
-		"xpos"		"88"
-		"ypos"		"108"
-		"wide"		"120"
+		"xpos"		"11"
+		"ypos"		"100"
+		"wide"		"96"
 		"tall"		"17"
-		"autoResize"		"1"
+		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
 		"pin_corner_to_sibling"		"0"
@@ -338,11 +338,11 @@
 	{
 		"ControlName"		"ComboBox"
 		"fieldName"		"SyncType"
-		"xpos"		"52"
-		"ypos"		"256"
-		"wide"		"170"
+		"xpos"		"16"
+		"ypos"		"208"
+		"wide"		"185"
 		"tall"		"16"
-		"autoResize"		"0"
+		"autoResize"		"1"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
 		"pin_corner_to_sibling"		"0"
@@ -360,9 +360,9 @@
 	{
 		"ControlName"		"ComboBox"
 		"fieldName"		"SyncColorize"
-		"xpos"		"72"
-		"ypos"		"273"
-		"wide"		"70"
+		"xpos"		"16"
+		"ypos"		"241"
+		"wide"		"56"
 		"tall"		"16"
 		"autoResize"		"0"
 		"pinCorner"		"0"
@@ -383,9 +383,9 @@
 		"ControlName"		"CvarToggleCheckButton"
 		"fieldName"		"SpeedoShow"
 		"xpos"		"8"
-		"ypos"		"40"
-		"wide"		"218"
-		"tall"		"11"
+		"ypos"		"26"
+		"wide"		"96"
+		"tall"		"16"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -398,21 +398,24 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"Font"		"DefaultVerySmall"
 		"wrap"		"0"
 		"centerwrap"		"0"
 		"textinsetx"		"6"
 		"textinsety"		"0"
-		"auto_wide_tocontents"		"0"
+		"auto_wide_tocontents"		"1"
 		"use_proportional_insets"		"0"
 		"Default"		"0"
+		"cvar_name"		"mom_speedometer"
+		"cvar_value"		"1"
 	}
 	"SpeedoShowJump"
 	{
 		"ControlName"		"CvarToggleCheckButton"
 		"fieldName"		"SpeedoShowJump"
 		"xpos"		"8"
-		"ypos"		"69"
-		"wide"		"312"
+		"ypos"		"56"
+		"wide"		"189"
 		"tall"		"16"
 		"autoResize"		"0"
 		"pinCorner"		"0"
@@ -426,23 +429,26 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"Font"		"DefaultVerySmall"
 		"wrap"		"0"
 		"centerwrap"		"0"
 		"textinsetx"		"6"
 		"textinsety"		"0"
-		"auto_wide_tocontents"		"0"
+		"auto_wide_tocontents"		"1"
 		"use_proportional_insets"		"0"
 		"Default"		"0"
+		"cvar_name"		"mom_speedometer_showlastjumpvel"
+		"cvar_value"		"1"
 	}
 	"ShowSpeedoHvel"
 	{
 		"ControlName"		"CvarToggleCheckButton"
 		"fieldName"		"ShowSpeedoHvel"
 		"xpos"		"8"
-		"ypos"		"56"
-		"wide"		"217"
-		"tall"		"11"
-		"autoResize"		"0"
+		"ypos"		"72"
+		"wide"		"194"
+		"tall"		"16"
+		"autoResize"		"1"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
 		"pin_corner_to_sibling"		"0"
@@ -454,23 +460,26 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"Font"		"DefaultVerySmall"
 		"wrap"		"0"
 		"centerwrap"		"0"
 		"textinsetx"		"6"
 		"textinsety"		"0"
-		"auto_wide_tocontents"		"0"
+		"auto_wide_tocontents"		"1"
 		"use_proportional_insets"		"0"
 		"Default"		"0"
+		"cvar_name"		"mom_speedometer_hvel"
+		"cvar_value"		"0"
 	}
 	"SpeedoShowColor"
 	{
 		"ControlName"		"CvarToggleCheckButton"
 		"fieldName"		"SpeedoShowColor"
 		"xpos"		"8"
-		"ypos"		"85"
-		"wide"		"320"
+		"ypos"		"40"
+		"wide"		"185"
 		"tall"		"16"
-		"autoResize"		"0"
+		"autoResize"		"1"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
 		"pin_corner_to_sibling"		"0"
@@ -482,23 +491,26 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"Font"		"DefaultVerySmall"
 		"wrap"		"0"
 		"centerwrap"		"0"
 		"textinsetx"		"6"
 		"textinsety"		"0"
-		"auto_wide_tocontents"		"0"
+		"auto_wide_tocontents"		"1"
 		"use_proportional_insets"		"0"
 		"Default"		"0"
+		"cvar_name"		"mom_speedometer_colorize"
+		"cvar_value"		"1"
 	}
 	"SyncShow"
 	{
 		"ControlName"		"CvarToggleCheckButton"
 		"fieldName"		"SyncShow"
-		"xpos"		"8"
-		"ypos"		"224"
-		"wide"		"161"
+		"xpos"		"9"
+		"ypos"		"161"
+		"wide"		"107"
 		"tall"		"16"
-		"autoResize"		"0"
+		"autoResize"		"1"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
 		"pin_corner_to_sibling"		"0"
@@ -510,23 +522,26 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"Font"		"DefaultVerySmall"
 		"wrap"		"0"
 		"centerwrap"		"0"
 		"textinsetx"		"6"
 		"textinsety"		"0"
-		"auto_wide_tocontents"		"0"
+		"auto_wide_tocontents"		"1"
 		"use_proportional_insets"		"0"
 		"Default"		"0"
+		"cvar_name"		"mom_strafesync_draw"
+		"cvar_value"		"1"
 	}
 	"SyncShowBar"
 	{
 		"ControlName"		"CvarToggleCheckButton"
 		"fieldName"		"SyncShowBar"
-		"xpos"		"8"
-		"ypos"		"240"
-		"wide"		"144"
+		"xpos"		"9"
+		"ypos"		"176"
+		"wide"		"96"
 		"tall"		"16"
-		"autoResize"		"0"
+		"autoResize"		"1"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
 		"pin_corner_to_sibling"		"0"
@@ -538,23 +553,26 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"Font"		"DefaultVerySmall"
 		"wrap"		"0"
 		"centerwrap"		"0"
 		"textinsetx"		"6"
 		"textinsety"		"0"
-		"auto_wide_tocontents"		"0"
+		"auto_wide_tocontents"		"1"
 		"use_proportional_insets"		"0"
 		"Default"		"0"
+		"cvar_name"		"mom_strafesync_drawbar"
+		"cvar_value"		"1"
 	}
 	"ButtonsShow"
 	{
 		"ControlName"		"CvarToggleCheckButton"
 		"fieldName"		"ButtonsShow"
-		"xpos"		"8"
-		"ypos"		"168"
-		"wide"		"336"
+		"xpos"		"9"
+		"ypos"		"133"
+		"wide"		"200"
 		"tall"		"16"
-		"autoResize"		"0"
+		"autoResize"		"1"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
 		"pin_corner_to_sibling"		"0"
@@ -566,51 +584,25 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"Font"		"DefaultVerySmall"
 		"wrap"		"0"
 		"centerwrap"		"0"
 		"textinsetx"		"6"
 		"textinsety"		"0"
-		"auto_wide_tocontents"		"0"
+		"auto_wide_tocontents"		"1"
 		"use_proportional_insets"		"0"
 		"Default"		"0"
-	}
-	"ApplyButton"
-	{
-		"ControlName"		"Button"
-		"fieldName"		"ApplyButton"
-		"xpos"		"234"
-		"ypos"		"273"
-		"wide"		"40"
-		"tall"		"16"
-		"autoResize"		"0"
-		"pinCorner"		"0"
-		"RoundedCorners"		"15"
-		"pin_corner_to_sibling"		"0"
-		"pin_to_sibling_corner"		"0"
-		"visible"		"1"
-		"enabled"		"0"
-		"tabPosition"		"0"
-		"labelText"		"#GameUI_Apply"
-		"textAlignment"		"west"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"wrap"		"0"
-		"centerwrap"		"0"
-		"textinsetx"		"6"
-		"textinsety"		"0"
-		"auto_wide_tocontents"		"0"
-		"use_proportional_insets"		"0"
-		"command"		"ApplyChanges"
-		"Default"		"0"
+		"cvar_name"		"mom_showkeypresses"
+		"cvar_value"		"1"
 	}
 	"SyncLabel"
 	{
 		"ControlName"		"Label"
 		"fieldName"		"SyncLabel"
-		"xpos"		"4"
-		"ypos"		"212"
-		"wide"		"144"
-		"tall"		"8"
+		"xpos"		"2"
+		"ypos"		"152"
+		"wide"		"51"
+		"tall"		"10"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -623,21 +615,22 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"Font"		"DefaultSmall"
 		"wrap"		"0"
 		"centerwrap"		"0"
 		"textinsetx"		"0"
 		"textinsety"		"0"
-		"auto_wide_tocontents"		"0"
+		"auto_wide_tocontents"		"1"
 		"use_proportional_insets"		"0"
 	}
 	"SpeedoLabel"
 	{
 		"ControlName"		"Label"
 		"fieldName"		"SpeedoLabel"
-		"xpos"		"6"
-		"ypos"		"25"
-		"wide"		"80"
-		"tall"		"16"
+		"xpos"		"2"
+		"ypos"		"17"
+		"wide"		"57"
+		"tall"		"12"
 		"autoResize"		"1"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -650,21 +643,22 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"Font"		"DefaultSmall"
 		"wrap"		"0"
 		"centerwrap"		"0"
 		"textinsetx"		"0"
 		"textinsety"		"0"
-		"auto_wide_tocontents"		"0"
+		"auto_wide_tocontents"		"1"
 		"use_proportional_insets"		"0"
 	}
 	"KeysLabel"
 	{
 		"ControlName"		"Label"
 		"fieldName"		"KeysLabel"
-		"xpos"		"4"
-		"ypos"		"155"
-		"wide"		"40"
-		"tall"		"8"
+		"xpos"		"2"
+		"ypos"		"120"
+		"wide"		"53"
+		"tall"		"13"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -677,21 +671,22 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"Font"		"DefaultSmall"
 		"wrap"		"0"
 		"centerwrap"		"0"
 		"textinsetx"		"0"
 		"textinsety"		"0"
-		"auto_wide_tocontents"		"0"
+		"auto_wide_tocontents"		"1"
 		"use_proportional_insets"		"0"
 	}
 	"SpeedoUnitsLabel"
 	{
 		"ControlName"		"Label"
 		"fieldName"		"SpeedoUnitsLabel"
-		"xpos"		"12"
-		"ypos"		"107"
-		"wide"		"75"
-		"tall"		"16"
+		"xpos"		"4"
+		"ypos"		"88"
+		"wide"		"72"
+		"tall"		"11"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -704,21 +699,22 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"Font"		"DefaultVerySmall"
 		"wrap"		"0"
 		"centerwrap"		"0"
 		"textinsetx"		"0"
 		"textinsety"		"0"
-		"auto_wide_tocontents"		"0"
+		"auto_wide_tocontents"		"1"
 		"use_proportional_insets"		"0"
 	}
 	"SyncTypeLabel"
 	{
 		"ControlName"		"Label"
 		"fieldName"		"SyncTypeLabel"
-		"xpos"		"11"
-		"ypos"		"256"
-		"wide"		"65"
-		"tall"		"11"
+		"xpos"		"4"
+		"ypos"		"194"
+		"wide"		"48"
+		"tall"		"12"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -731,22 +727,23 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"Font"		"DefaultVerySmall"
 		"wrap"		"0"
 		"centerwrap"		"0"
 		"textinsetx"		"0"
 		"textinsety"		"0"
-		"auto_wide_tocontents"		"0"
+		"auto_wide_tocontents"		"1"
 		"use_proportional_insets"		"0"
 	}
 	"SyncColorTypeLabel"
 	{
 		"ControlName"		"Label"
 		"fieldName"		"SyncColorTypeLabel"
-		"xpos"		"10"
-		"ypos"		"273"
-		"wide"		"59"
-		"tall"		"12"
-		"autoResize"		"0"
+		"xpos"		"4"
+		"ypos"		"226"
+		"wide"		"65"
+		"tall"		"9"
+		"autoResize"		"1"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
 		"pin_corner_to_sibling"		"0"
@@ -758,21 +755,52 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"Font"		"DefaultVerySmall"
 		"wrap"		"0"
 		"centerwrap"		"0"
 		"textinsetx"		"0"
 		"textinsety"		"0"
-		"auto_wide_tocontents"		"0"
+		"auto_wide_tocontents" "1"
 		"use_proportional_insets"		"0"
 	}
+	"ApplyButton"
+	{
+		"ControlName"		"Button"
+		"fieldName"		"ApplyButton"
+		"xpos"		"224"
+		"ypos"		"232"
+		"wide"		"25"
+		"tall"		"16"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"RoundedCorners"		"15"
+		"pin_corner_to_sibling"		"0"
+		"pin_to_sibling_corner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"		"0"
+		"labelText"		"#GameUI_Apply"
+		"textAlignment"		"center"
+		"dulltext"		"0"
+		"brighttext"		"0"
+		"Font"		"DefaultVerySmall"
+		"wrap"		"0"
+		"centerwrap"		"0"
+		"textinsetx"		"6"
+		"textinsety"		"0"
+		"auto_wide_tocontents"		"1"
+		"use_proportional_insets"		"0"
+		"command"		"ApplyChanges"
+		"Default"		"0"
+	}
 	"BuildModeDialog"
 	{
 		"ControlName"		"BuildModeDialog"
 		"fieldName"		"BuildModeDialog"
-		"xpos"		"61"
-		"ypos"		"100"
-		"wide"		"210"
-		"tall"		"289"
+		"xpos"		"33"
+		"ypos"		"19"
+		"wide"		"160"
+		"tall"		"224"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
diff --git a/mp/game/momentum/resource/ui/Spectator.res b/mp/game/momentum/resource/ui/Spectator.res
index d431037ecc..db649c8c9f 100644
--- a/mp/game/momentum/resource/ui/Spectator.res
+++ b/mp/game/momentum/resource/ui/Spectator.res
@@ -43,7 +43,7 @@
 	{
 		"ControlName"		"Label"
 		"fieldName"			"playerlabel"
-		"xpos"				"r86"
+		"xpos"				"10"
 		"ypos"				"20"
 		"wide"				"81"
 		"tall"				"15"
@@ -60,7 +60,7 @@
 	{
 		"ControlName"		"Label"
 		"fieldName"			"timelabel"
-		"xpos"				"r86"
+		"xpos"				"10"
 		"ypos"				"28"
 		"wide"				"81"
 		"tall"				"15"
@@ -92,7 +92,7 @@
 	{
 		"ControlName"		"Label"
 		"fieldName"			"extrainfo"
-		"xpos"				"r86"
+		"xpos"				"10"
 		"ypos"				"12"
 		"wide"				"81"
 		"tall"				"15"
@@ -105,6 +105,7 @@
 		"dulltext"			"0"
 		"brighttext"		"0"
 	}
+    //Not used?
 	"titlelabel"
 	{
 		"ControlName"		"Label"
@@ -123,4 +124,20 @@
 		"dulltext"			"0"
 		"brighttext"		"0"
 	}
+    
+    "Close_Panel"
+    {
+        "ControlName"   "ImagePanel"
+        "fieldName"     "Close_Panel"
+        "xpos"          "r36"//Give a 4 pixel padding
+        "ypos"          "4"
+        "wide"          "32"
+        "tall"          "32"
+        "autoResize"    "0"
+        "pinCorner"     "0"
+        "visible"       "1"
+        "enabled"       "1"
+        "scaleImage"    "1"
+        "image"         "close_button"
+    }
 }
diff --git a/mp/game/momentum/resource/ui/versionwarnpanel.res b/mp/game/momentum/resource/ui/versionwarnpanel.res
index af09405341..bb16c534f8 100644
--- a/mp/game/momentum/resource/ui/versionwarnpanel.res
+++ b/mp/game/momentum/resource/ui/versionwarnpanel.res
@@ -4,11 +4,10 @@
 	{
 		"ControlName"		"CVersionWarnPanel"
 		"fieldName"		"VersionWarnPanel"
-		"xpos"		"c-225"
-		"ypos"		"c-50"
-		"wide"		"450"
-		"tall"		"100"
-		"alpha"		"255"
+		"xpos"		"c-250"
+		"ypos"		"c-125"
+		"wide"		"650"
+		"tall"		"320"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -16,18 +15,18 @@
 		"pin_to_sibling_corner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"tabPosition"		"32"
+		"tabPosition"		"0"
 		"settitlebarvisible"		"1"
-		"title"		"New version available"
+		"title"		"#MOM_NewVersionTitle"
 	}
 	"frame_topGrip"
 	{
 		"ControlName"		"Panel"
 		"fieldName"		"frame_topGrip"
-		"xpos"		"8"
+		"xpos"		"4"
 		"ypos"		"0"
-		"wide"		"496"
-		"tall"		"5"
+		"wide"		"255"
+		"tall"		"2"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -41,10 +40,10 @@
 	{
 		"ControlName"		"Panel"
 		"fieldName"		"frame_bottomGrip"
-		"xpos"		"8"
-		"ypos"		"507"
-		"wide"		"486"
-		"tall"		"5"
+		"xpos"		"4"
+		"ypos"		"157"
+		"wide"		"250"
+		"tall"		"2"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -59,9 +58,9 @@
 		"ControlName"		"Panel"
 		"fieldName"		"frame_leftGrip"
 		"xpos"		"0"
-		"ypos"		"8"
-		"wide"		"5"
-		"tall"		"496"
+		"ypos"		"4"
+		"wide"		"2"
+		"tall"		"151"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -75,10 +74,10 @@
 	{
 		"ControlName"		"Panel"
 		"fieldName"		"frame_rightGrip"
-		"xpos"		"507"
-		"ypos"		"8"
-		"wide"		"5"
-		"tall"		"486"
+		"xpos"		"261"
+		"ypos"		"4"
+		"wide"		"2"
+		"tall"		"146"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -94,8 +93,8 @@
 		"fieldName"		"frame_tlGrip"
 		"xpos"		"0"
 		"ypos"		"0"
-		"wide"		"8"
-		"tall"		"8"
+		"wide"		"4"
+		"tall"		"4"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -109,10 +108,10 @@
 	{
 		"ControlName"		"Panel"
 		"fieldName"		"frame_trGrip"
-		"xpos"		"504"
+		"xpos"		"259"
 		"ypos"		"0"
-		"wide"		"8"
-		"tall"		"8"
+		"wide"		"4"
+		"tall"		"4"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -127,9 +126,9 @@
 		"ControlName"		"Panel"
 		"fieldName"		"frame_blGrip"
 		"xpos"		"0"
-		"ypos"		"504"
-		"wide"		"8"
-		"tall"		"8"
+		"ypos"		"155"
+		"wide"		"4"
+		"tall"		"4"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -143,10 +142,10 @@
 	{
 		"ControlName"		"Panel"
 		"fieldName"		"frame_brGrip"
-		"xpos"		"494"
-		"ypos"		"494"
-		"wide"		"18"
-		"tall"		"18"
+		"xpos"		"254"
+		"ypos"		"150"
+		"wide"		"9"
+		"tall"		"9"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -160,10 +159,10 @@
 	{
 		"ControlName"		"Panel"
 		"fieldName"		"frame_caption"
-		"xpos"		"3"
-		"ypos"		"-16"
-		"wide"		"502"
-		"tall"		"23"
+		"xpos"		"0"
+		"ypos"		"0"
+		"wide"		"258"
+		"tall"		"12"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -179,8 +178,8 @@
 		"fieldName"		"frame_minimize"
 		"xpos"		"0"
 		"ypos"		"0"
-		"wide"		"18"
-		"tall"		"18"
+		"wide"		"0"
+		"tall"		"0"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -207,8 +206,8 @@
 		"fieldName"		"frame_maximize"
 		"xpos"		"0"
 		"ypos"		"0"
-		"wide"		"18"
-		"tall"		"18"
+		"wide"		"0"
+		"tall"		"0"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -235,8 +234,8 @@
 		"fieldName"		"frame_mintosystray"
 		"xpos"		"0"
 		"ypos"		"0"
-		"wide"		"18"
-		"tall"		"18"
+		"wide"		"0"
+		"tall"		"0"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -262,10 +261,10 @@
 	{
 		"ControlName"		"Button"
 		"fieldName"		"frame_close"
-		"xpos"		"487"
+		"xpos"		"239"
 		"ypos"		"8"
-		"wide"		"13"
-		"tall"		"13"
+		"wide"		"17"
+		"tall"		"17"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -280,21 +279,21 @@
 		"brighttext"		"0"
 		"wrap"		"0"
 		"centerwrap"		"0"
-		"textinsetx"		"2"
-		"textinsety"		"1"
+		"textinsetx"		"4"
+		"textinsety"		"2"
 		"auto_wide_tocontents"		"0"
 		"use_proportional_insets"		"0"
+		"command"		"turnoff"
 		"Default"		"0"
-		"command"	"turnoff"
 	}
 	"frame_menu"
 	{
 		"ControlName"		"FrameSystemButton"
 		"fieldName"		"frame_menu"
-		"xpos"		"7"
-		"ypos"		"8"
-		"wide"		"18"
-		"tall"		"18"
+		"xpos"		"3"
+		"ypos"		"4"
+		"wide"		"9"
+		"tall"		"9"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -320,8 +319,8 @@
 		"fieldName"		"CloseButton"
 		"xpos"		"0"
 		"ypos"		"0"
-		"wide"		"18"
-		"tall"		"18"
+		"wide"		"0"
+		"tall"		"0"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -333,8 +332,8 @@
 		"labelText"		"#GameUI_Close"
 		"textAlignment"		"north-west"
 		"dulltext"		"0"
-		"Font"			"Default"
 		"brighttext"		"0"
+		"Font"		"Default"
 		"wrap"		"0"
 		"centerwrap"		"0"
 		"textinsetx"		"2"
@@ -345,34 +344,88 @@
 	}
 	"ReleaseText"
 	{
-		"ControlName"	"URLLabel"
+		"ControlName"		"URLLabel"
 		"fieldName"		"ReleaseText"
-		"xpos"			"25"
-		"ypos"			"50"
-		"wide"			"640"
-		"tall"			"20"
-		"autoResize"	"0"
+		"xpos"		"380"
+		"ypos"		"94"
+		"wide"		"260"
+		"tall"		"120"
+		"autoResize"		"0"
 		"pinCorner"		"0"
+		"RoundedCorners"		"15"
+		"pin_corner_to_sibling"		"0"
+		"pin_to_sibling_corner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"textAlignment"	"west"
+		"tabPosition"		"0"
 		"labelText"		"#MOM_NewVersion"
+		"textAlignment"		"west"
+		"dulltext"		"0"
+		"brighttext"		"1"
+		"Font"		"DefaultSmall"
+		"wrap"		"1"
+		"centerwrap"		"0"
+		"textinsetx"		"0"
+		"textinsety"		"0"
+		"auto_wide_tocontents"		"0"
+		"use_proportional_insets"		"0"
+		"URLText"		"https://github.com/momentum-mod/game/releases"
+	}
+	"ChangeLog"
+	{
+		"ControlName"		"RichText"
+		"fieldName"		"ChangeLog"
+		"xpos"		"12"
+		"ypos"		"55"
+		"wide"		"350"
+		"tall"		"250"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"RoundedCorners"		"15"
+		"pin_corner_to_sibling"		"0"
+		"pin_to_sibling_corner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"		"0"
+		"maxchars"		"-1"
+		"scrollbar"		"1"
+	}
+	"Changelog_Label"
+	{
+		"ControlName"		"Label"
+		"fieldName"		"Changelog_Label"
+		"xpos"		"9"
+		"ypos"		"36"
+		"wide"		"150"
+		"tall"		"20"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"RoundedCorners"		"15"
+		"pin_corner_to_sibling"		"0"
+		"pin_to_sibling_corner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"		"0"
+		"labelText"		"#MOM_ChangeLog"
+		"textAlignment"		"west"
 		"dulltext"		"0"
-		"brighttext"	"1"
-		"Font"			"Default"
-		"wrap"			"0"
-		"centerwrap"	"0"
-		"textinsetx"	"0"
-		"textinsety"	"0"
+		"brighttext"		"0"
+		"font"		"DefaultVerySmall"
+		"wrap"		"0"
+		"centerwrap"		"0"
+		"textinsetx"		"0"
+		"textinsety"		"0"
+		"auto_wide_tocontents"		"0"
+		"use_proportional_insets"		"0"
 	}
 	"BuildModeDialog"
 	{
 		"ControlName"		"BuildModeDialog"
 		"fieldName"		"BuildModeDialog"
-		"xpos"		"327"
-		"ypos"		"301"
-		"wide"		"300"
-		"tall"		"420"
+		"xpos"		"0"
+		"ypos"		"0"
+		"wide"		"160"
+		"tall"		"224"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"RoundedCorners"		"15"
@@ -384,4 +437,4 @@
 		"settitlebarvisible"		"1"
 		"title"		"#Frame_Untitled"
 	}
-}
\ No newline at end of file
+}
diff --git a/mp/game/momentum/scripts/HudLayout.res b/mp/game/momentum/scripts/HudLayout.res
index 51b16fa086..f6b22935b4 100644
--- a/mp/game/momentum/scripts/HudLayout.res
+++ b/mp/game/momentum/scripts/HudLayout.res
@@ -79,9 +79,9 @@
          //You can override "MenuItemColor" etc here (I think)
     }
     // Version warning
-    CHudVersionWarn
+    CHudVersionInfo
     {
-        "fieldName"     "CHudVersionWarn"
+        "fieldName"     "CHudVersionInfo"
         "xpos"          "640"
         "ypos"          "460"
         "visible"       "1"
diff --git a/mp/src/game/client/cdll_client_int.cpp b/mp/src/game/client/cdll_client_int.cpp
index 77a7e9e762..5b8f10d962 100644
--- a/mp/src/game/client/cdll_client_int.cpp
+++ b/mp/src/game/client/cdll_client_int.cpp
@@ -170,10 +170,6 @@ extern vgui::IInputInternal *g_InputInternal;
 #include "sixense/in_sixense.h"
 #endif
 
-
-//Momentum
-#include "mom_event_listener.h"
-
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
@@ -1093,8 +1089,6 @@ int CHLClient::Init( CreateInterfaceFn appSystemFactory, CreateInterfaceFn physi
 	HookHapticMessages(); // Always hook the messages
 #endif
 
-    g_MOMEventListener->Init();//Hook into game events
-
 	return true;
 }
 
diff --git a/mp/src/game/client/client_momentum.vpc b/mp/src/game/client/client_momentum.vpc
index f79d1bd03c..1ee5eaf982 100644
--- a/mp/src/game/client/client_momentum.vpc
+++ b/mp/src/game/client/client_momentum.vpc
@@ -60,7 +60,7 @@ $Project "Client (Momentum)"
                             }
                         }
                     }
-                }  
+                }
                 
                 $File "momentum\ui\MomentumSettingsDialog.cpp"
                 $File "momentum\ui\IMomentumSettingsPanel.h"
@@ -75,13 +75,14 @@ $Project "Client (Momentum)"
                 $File   "momentum\ui\ClientTimesDisplay.cpp"
                 $File   "momentum\ui\IVersionWarnPanel.h"
                 $File   "momentum\ui\VersionWarnPanel.cpp"
-                $File   "momentum\ui\hud_versionwarn.cpp"
-                $File   "momentum\ui\hud_mapfinished.cpp"
+                $File   "momentum\ui\VersionWarnPanel.h"
+                $File   "momentum\ui\hud_versioninfo.cpp"
+                $File "momentum\ui\hud_mapfinished.cpp"
                 $File "momentum\ui\hud_mapfinished.h"
-                $File   "momentum\ui\hud_keypress.cpp"
-                $File   "hl2\hud_credits.cpp"
-                $File   "hl2\hud_weaponselection.cpp"
-                $File   "hud_chat.cpp"
+                $File "momentum\ui\hud_keypress.cpp"
+                $File "hl2\hud_credits.cpp"
+                $File "hl2\hud_weaponselection.cpp"
+                $File "hud_chat.cpp"
                 $File "momentum\ui\hud_comparisons.cpp"
                 $File "momentum\ui\hud_comparisons.h"
                 $File "momentum\ui\hud_mapinfo.cpp"
diff --git a/mp/src/game/client/momentum/client_events.cpp b/mp/src/game/client/momentum/client_events.cpp
index 924b7af8ea..a9fffb59e0 100644
--- a/mp/src/game/client/momentum/client_events.cpp
+++ b/mp/src/game/client/momentum/client_events.cpp
@@ -3,57 +3,66 @@
 #endif
 
 #include "client_events.h"
+
 #include "filesystem.h"
 #include "movevars_shared.h"
+#include "util/mom_util.h"
+#include "mom_event_listener.h"
 
 #include "tier0/memdbgon.h"
 
 extern IFileSystem *filesystem;
 
-namespace Momentum {
+void CMOMClientEvents::PostInit()
+{
+    g_MOMEventListener->Init();//Hook into game events
+
+    // enable console by default
+    ConVarRef con_enable("con_enable");
+    con_enable.SetValue(true);
 
-	void OnClientDLLInit()
-	{
-		// enable console by default
-		ConVarRef con_enable("con_enable");
-		con_enable.SetValue(true);
-		// mount CSS content even if it's on a different drive than SDK
+    if (SteamAPI_IsSteamRunning())
+    {
+        mom_UTIL->GetRemoteRepoModVersion();
+    }
+
+    // mount CSS content even if it's on a different drive than SDK
 #ifdef _WIN32
-		HKEY hKey;
-		if (VCRHook_RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-			"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 240",
-			0,
-			KEY_READ,
-			&hKey) == ERROR_SUCCESS)
-		{
-			char installPath[MAX_PATH];
-			DWORD len = sizeof(installPath);
-			if (VCRHook_RegQueryValueEx(hKey,
-				"InstallLocation",
-				NULL,
-				NULL,
-				(LPBYTE)installPath,
-				&len) == ERROR_SUCCESS)
-			{
-				char path[MAX_PATH];
-				Q_strncpy(path, installPath, sizeof(path));
-
-				Q_strncat(path, "\\cstrike", sizeof(path));
-				filesystem->AddSearchPath(path, "GAME");
-
-				Q_strncat(path, "\\download", sizeof(path));
-				filesystem->AddSearchPath(path, "GAME");
-
-				Q_strncpy(path, installPath, sizeof(path));
-				Q_strncat(path, "\\cstrike\\cstrike_pak.vpk", sizeof(path));
-				filesystem->AddSearchPath(path, "GAME");
-
-				filesystem->PrintSearchPaths();
-			}
-
-			VCRHook_RegCloseKey(hKey);
-		}
+    HKEY hKey;
+    if (VCRHook_RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+        "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 240",
+        0,
+        KEY_READ,
+        &hKey) == ERROR_SUCCESS)
+    {
+        char installPath[MAX_PATH];
+        DWORD len = sizeof(installPath);
+        if (VCRHook_RegQueryValueEx(hKey,
+            "InstallLocation",
+            NULL,
+            NULL,
+            (LPBYTE) installPath,
+            &len) == ERROR_SUCCESS)
+        {
+            char path[MAX_PATH];
+            Q_strncpy(path, installPath, sizeof(path));
+
+            Q_strncat(path, "\\cstrike", sizeof(path));
+            filesystem->AddSearchPath(path, "GAME");
+
+            Q_strncat(path, "\\download", sizeof(path));
+            filesystem->AddSearchPath(path, "GAME");
+
+            Q_strncpy(path, installPath, sizeof(path));
+            Q_strncat(path, "\\cstrike\\cstrike_pak.vpk", sizeof(path));
+            filesystem->AddSearchPath(path, "GAME");
+
+            filesystem->PrintSearchPaths();
+        }
+
+        VCRHook_RegCloseKey(hKey);
+    }
 #endif
-	}
+}
 
-} // namespace Momentum
+CMOMClientEvents g_MOMClientEvents("CMOMClientEvents");
\ No newline at end of file
diff --git a/mp/src/game/client/momentum/client_events.h b/mp/src/game/client/momentum/client_events.h
index 302cbc8bda..791d46c3ce 100644
--- a/mp/src/game/client/momentum/client_events.h
+++ b/mp/src/game/client/momentum/client_events.h
@@ -4,10 +4,18 @@
 #pragma once
 #endif
 
-namespace Momentum {
+#include "cbase.h"
 
-	void OnClientDLLInit();
+class CMOMClientEvents : public CAutoGameSystem
+{
+public:
+    CMOMClientEvents(const char *pName) : CAutoGameSystem(pName)
+    {
+    }
 
-} // namespace Momentum
+    //After DLL inits successfully
+    void PostInit() override;
 
-#endif // CLIENT_EVENTS_H
+};
+
+#endif // CLIENT_EVENTS_H
\ No newline at end of file
diff --git a/mp/src/game/client/momentum/clientmode_mom_normal.cpp b/mp/src/game/client/momentum/clientmode_mom_normal.cpp
index a6fb99d37c..7584d994b2 100644
--- a/mp/src/game/client/momentum/clientmode_mom_normal.cpp
+++ b/mp/src/game/client/momentum/clientmode_mom_normal.cpp
@@ -12,6 +12,7 @@
 #include "iinput.h"
 #include "momSpectatorGUI.h"
 #include "momentum/mom_shareddefs.h"
+#include "momSpectatorGUI.h"
 #include "vgui_int.h"
 #include <vgui/IInput.h>
 #include <vgui/IPanel.h>
@@ -111,6 +112,7 @@ void ClientModeMOMNormal::Init()
     m_pHudMenuStatic = GET_HUDELEMENT(CHudMenuStatic);
     m_pHudMapFinished = GET_HUDELEMENT(CHudMapFinishedDialog);
     m_pLeaderboards = dynamic_cast<CClientTimesDisplay*>(m_pViewport->FindPanelByName(PANEL_TIMES));
+    m_pSpectatorGUI = dynamic_cast<CMOMSpectatorGUI*>(m_pViewport->FindPanelByName(PANEL_SPECGUI));
     // Load up the combine control panel scheme
     g_hVGuiCombineScheme = vgui::scheme()->LoadSchemeFromFileEx(
         enginevgui->GetPanel(PANEL_CLIENTDLL),
@@ -161,29 +163,33 @@ int ClientModeMOMNormal::HudElementKeyInput(int down, ButtonCode_t keynum, const
 
 int ClientModeMOMNormal::HandleSpectatorKeyInput(int down, ButtonCode_t keynum, const char *pszCurrentBinding)
 {
-    // MOM_TODO: re-enable this in beta when we add movie-style controls to the spectator menu!
-    /*
-    // we are in spectator mode, open spectator menu
-    if (down && pszCurrentBinding && Q_strcmp(pszCurrentBinding, "+duck") == 0)
-    {
-        m_pViewport->ShowPanel(PANEL_SPECMENU, true);
-        return 0; // we handled it, don't handle twice or send to server
-    }
-    */
-    if (down && pszCurrentBinding && Q_strcmp(pszCurrentBinding, "+attack") == 0)
-    {
-        engine->ClientCmd("spec_next");
-        return 0;
-    }
-    else if (down && pszCurrentBinding && Q_strcmp(pszCurrentBinding, "+attack2") == 0)
+    if (m_pSpectatorGUI)
     {
-        engine->ClientCmd("spec_prev");
-        return 0;
-    }
-    else if (down && pszCurrentBinding && Q_strcmp(pszCurrentBinding, "+jump") == 0)
-    {
-        engine->ClientCmd("spec_mode");
-        return 0;
+        // we are in spectator mode, open spectator menu
+        if (down && pszCurrentBinding && !Q_strcmp(pszCurrentBinding, "+duck"))
+        {
+            m_pSpectatorGUI->SetMouseInputEnabled(!m_pSpectatorGUI->IsMouseInputEnabled());
+            // MOM_TODO: re-enable this in beta when we add movie-style controls to the spectator menu!
+            //m_pViewport->ShowPanel(PANEL_SPECMENU, true);
+
+            return 0; // we handled it, don't handle twice or send to server
+        }
+
+        if (down && pszCurrentBinding && !Q_strcmp(pszCurrentBinding, "+attack") && !m_pSpectatorGUI->IsMouseInputEnabled())
+        {
+            engine->ClientCmd("spec_next");
+            return 0;
+        }
+        else if (down && pszCurrentBinding && !Q_strcmp(pszCurrentBinding, "+attack2") && !m_pSpectatorGUI->IsMouseInputEnabled())
+        {
+            engine->ClientCmd("spec_prev");
+            return 0;
+        }
+        else if (down && pszCurrentBinding && !Q_strcmp(pszCurrentBinding, "+jump"))
+        {
+            engine->ClientCmd("spec_mode");
+            return 0;
+        }
     }
 
     return 1;
diff --git a/mp/src/game/client/momentum/clientmode_mom_normal.h b/mp/src/game/client/momentum/clientmode_mom_normal.h
index c40995b66b..ca48a6e01f 100644
--- a/mp/src/game/client/momentum/clientmode_mom_normal.h
+++ b/mp/src/game/client/momentum/clientmode_mom_normal.h
@@ -16,6 +16,7 @@
 #include "hud_menu_static.h"
 #include "hud_mapfinished.h"
 #include "ClientTimesDisplay.h"
+#include "momSpectatorGUI.h"
 #include <vgui/Cursor.h>
 #include <vgui_controls/EditablePanel.h>
 
@@ -47,6 +48,7 @@ class ClientModeMOMNormal : public ClientModeShared
     CHudMenuStatic *m_pHudMenuStatic;
     CHudMapFinishedDialog *m_pHudMapFinished;
     CClientTimesDisplay *m_pLeaderboards;
+    CMOMSpectatorGUI *m_pSpectatorGUI;
 };
 
 extern IClientMode *GetClientModeNormal();
diff --git a/mp/src/game/client/momentum/ui/IVersionWarnPanel.h b/mp/src/game/client/momentum/ui/IVersionWarnPanel.h
index 1d8a0157af..3de4a470c9 100644
--- a/mp/src/game/client/momentum/ui/IVersionWarnPanel.h
+++ b/mp/src/game/client/momentum/ui/IVersionWarnPanel.h
@@ -5,10 +5,13 @@
 class VersionWarnPanel
 {
   public:
+    virtual ~VersionWarnPanel() {}
     virtual void Create(vgui::VPANEL parent) = 0;
     virtual void Destroy(void) = 0;
     virtual void Activate(void) = 0;
     virtual void Close() = 0;
+    virtual void SetVersion(const char *pVersion) const = 0;
+    virtual void SetChangelog(char *pChangelog) const = 0;
 };
 
 extern VersionWarnPanel *versionwarnpanel;
\ No newline at end of file
diff --git a/mp/src/game/client/momentum/ui/MomentumSettingsDialog.cpp b/mp/src/game/client/momentum/ui/MomentumSettingsDialog.cpp
index 67ee6d898d..cf14a36a05 100644
--- a/mp/src/game/client/momentum/ui/MomentumSettingsDialog.cpp
+++ b/mp/src/game/client/momentum/ui/MomentumSettingsDialog.cpp
@@ -1,60 +1,60 @@
-//The following include files are necessary to allow your  the panel .cpp to compile.
 #include "cbase.h"
+
 #include "IMomentumSettingsPanel.h"
-using namespace vgui;
 #include <vgui/IVGui.h>
-#include <vgui_controls/Frame.h>
 #include <vgui_controls/Button.h>
+#include <vgui_controls/CvarToggleCheckButton.h>
+#include <vgui_controls/Frame.h>
 #include <vgui_controls/URLLabel.h>
 #include <vgui_controls/pch_vgui_controls.h>
-#include <vgui_controls/CvarToggleCheckButton.h>
 
 #include "momentum/mom_shareddefs.h"
 #include "tier0/memdbgon.h"
 
+using namespace vgui;
+
 class CMomentumSettingsPanel : public vgui::Frame
 {
     DECLARE_CLASS_SIMPLE(CMomentumSettingsPanel, vgui::Frame);
-    //CMomentumSettingsPanel : This Class / vgui::Frame : BaseClass
+    // CMomentumSettingsPanel : This Class / vgui::Frame : BaseClass
 
-    CMomentumSettingsPanel(vgui::VPANEL parent); 	// Constructor
-    ~CMomentumSettingsPanel() {};				// Destructor
+    CMomentumSettingsPanel(VPANEL parent); // Constructor
+    ~CMomentumSettingsPanel(){};           // Destructor
     void Activate() override;
 
-protected:
-    //VGUI overrides:
+  protected:
+    // VGUI overrides:
     void OnTick() override;
     MESSAGE_FUNC_PTR(OnTextChanged, "TextChanged", panel);
     MESSAGE_FUNC_PTR(OnCheckboxChecked, "CheckButtonChecked", panel);
-    MESSAGE_FUNC(OnApplyChanges, "ApplyChanges")
-    {
-        m_pApplyButton->SetEnabled(false);
-    }
+    MESSAGE_FUNC(OnApplyChanges, "ApplyChanges") { m_pApplyButton->SetEnabled(false); }
 
-private:
+  private:
     void LoadSettings();
-    //Other used VGUI control Elements:
+    // Other used VGUI control Elements:
     ComboBox *m_pSpeedometerUnits, *m_pSyncType, *m_pSyncColorize;
 
-    CvarToggleCheckButton<ConVarRef> *m_pSpeedometerShow, *m_pSpeedometerShowLastJump, *m_pSpeedometerShowVerticalVel, *m_pSpeedometerColorize,
-        *m_pSyncShow, *m_pSyncShowBar, *m_pButtonsShow,
-        *m_pShowVersion;
+    CvarToggleCheckButton<ConVarRef> *m_pSpeedometerShow, *m_pSpeedometerShowLastJump, *m_pSpeedometerShowVerticalVel,
+        *m_pSpeedometerColorize, *m_pSyncShow, *m_pSyncShowBar, *m_pButtonsShow, *m_pShowVersion;
 
     Button *m_pApplyButton;
-
 };
 
 // Constuctor: Initializes the Panel
-CMomentumSettingsPanel::CMomentumSettingsPanel(vgui::VPANEL parent)
-    : BaseClass(nullptr, "CMomentumSettingsPanel")
+CMomentumSettingsPanel::CMomentumSettingsPanel(vgui::VPANEL parent) : BaseClass(nullptr, "CMomentumSettingsPanel")
 {
     SetParent(parent);
+
+    SetProportional(true);
+    LoadControlSettings("resource/ui/MomentumSettingsPanel.res");
+
     SetPaintBackgroundType(1);
     SetRoundedCorners(PANEL_ROUND_CORNER_ALL);
     SetKeyBoardInputEnabled(true);
     SetMouseInputEnabled(true);
 
-    SetProportional(true);
+    SetMinimumSize(500, 500);
+
     SetTitleBarVisible(true);
     SetMinimizeButtonVisible(false);
     SetMaximizeButtonVisible(false);
@@ -62,47 +62,51 @@ CMomentumSettingsPanel::CMomentumSettingsPanel(vgui::VPANEL parent)
     SetSizeable(false);
     SetMoveable(true);
     SetVisible(false);
-    
-    m_pSpeedometerUnits = new ComboBox(this, "SpeedoUnits", 3, false);
+
+    m_pSpeedometerUnits = FindControl<ComboBox>("SpeedoUnits");
+    m_pSpeedometerUnits->SetNumberOfEditLines(3);
     m_pSpeedometerUnits->AddItem("#MOM_Settings_Speedometer_Units_UPS", nullptr);
     m_pSpeedometerUnits->AddItem("#MOM_Settings_Speedometer_Units_KPH", nullptr);
     m_pSpeedometerUnits->AddItem("#MOM_Settings_Speedometer_Units_MPH", nullptr);
     m_pSpeedometerUnits->AddActionSignalTarget(this);
 
-    m_pSyncType = new ComboBox(this, "SyncType", 2, false);
+    m_pSyncType = FindControl<ComboBox>("SyncType");
+    m_pSyncType->SetNumberOfEditLines(2);
     m_pSyncType->AddItem("#MOM_Settings_Sync_Type_Sync1", nullptr);
     m_pSyncType->AddItem("#MOM_Settings_Sync_Type_Sync2", nullptr);
     m_pSyncType->AddActionSignalTarget(this);
 
-    m_pSyncColorize = new ComboBox(this, "SyncColorize", 3, false);
+    m_pSyncColorize = FindControl<ComboBox>("SyncColorize");
+    m_pSyncColorize->SetNumberOfEditLines(3);
     m_pSyncColorize->AddItem("#MOM_Settings_Sync_Color_Type_None", nullptr);
     m_pSyncColorize->AddItem("#MOM_Settings_Sync_Color_Type_1", nullptr);
     m_pSyncColorize->AddItem("#MOM_Settings_Sync_Color_Type_2", nullptr);
     m_pSyncColorize->AddActionSignalTarget(this);
 
-    m_pSpeedometerShow = new CvarToggleCheckButton<ConVarRef>(this, "SpeedoShow", "#MOM_Settings_Speedometer_Show", "mom_speedometer", false);
+    m_pSpeedometerShow = FindControl<CvarToggleCheckButton<ConVarRef>>("SpeedoShow");
     m_pSpeedometerShow->AddActionSignalTarget(this);
-    m_pSpeedometerShowLastJump = new CvarToggleCheckButton<ConVarRef>(this, "SpeedoShowJump", "#MOM_Settings_Speedometer_Show_Jump", 
-        "mom_speedometer_showlastjumpvel", false);
+
+    m_pSpeedometerShowLastJump = FindControl<CvarToggleCheckButton<ConVarRef>>("SpeedoShowJump");
     m_pSpeedometerShowLastJump->AddActionSignalTarget(this);
-    m_pSpeedometerShowVerticalVel = new CvarToggleCheckButton<ConVarRef>(this, "ShowSpeedoHvel", "#MOM_Settings_Speedometer_Show_Hvel",
-        "mom_speedometer_hvel", false);
+
+    m_pSpeedometerShowVerticalVel = FindControl<CvarToggleCheckButton<ConVarRef>>("ShowSpeedoHvel");
     m_pSpeedometerShowVerticalVel->AddActionSignalTarget(this);
-    m_pSpeedometerColorize = new CvarToggleCheckButton<ConVarRef>(this, "SpeedoShowColor", "#MOM_Settings_Speedometer_Show_Color", 
-        "mom_speedometer_colorize", false);
+
+    m_pSpeedometerColorize = FindControl<CvarToggleCheckButton<ConVarRef>>("SpeedoShowColor");
     m_pSpeedometerColorize->AddActionSignalTarget(this);
 
-    m_pSyncShow = new CvarToggleCheckButton<ConVarRef>(this, "SyncShow", "#MOM_Settings_Sync_Show", "mom_strafesync_draw", false);
+    m_pSyncShow = FindControl<CvarToggleCheckButton<ConVarRef>>("SyncShow");
     m_pSyncShow->AddActionSignalTarget(this);
-    m_pSyncShowBar = new CvarToggleCheckButton<ConVarRef>(this, "SyncShowBar", "#MOM_Settings_Sync_Show_Bar", "mom_strafesync_drawbar", false);
+
+    m_pSyncShowBar = FindControl<CvarToggleCheckButton<ConVarRef>>("SyncShowBar");
     m_pSyncShowBar->AddActionSignalTarget(this);
 
-    m_pButtonsShow = new CvarToggleCheckButton<ConVarRef>(this, "ButtonsShow", "#MOM_Settings_Buttons_Show", "mom_showkeypresses", false);
+    m_pButtonsShow = FindControl<CvarToggleCheckButton<ConVarRef>>("ButtonsShow");
     m_pButtonsShow->AddActionSignalTarget(this);
-    //MOM_TODO: have one for hud_versionwarn? 
+    // MOM_TODO: have one for hud_versionwarn?
 
-    m_pApplyButton = new Button(this, "ApplyButton", "#GameUI_Apply", this);
-    m_pApplyButton->SetCommand("ApplyChanges");
+    m_pApplyButton = FindControl<Button>("ApplyButton");
+    m_pApplyButton->AddActionSignalTarget(this);
 
     m_pApplyButton->AddActionSignalTarget(m_pSpeedometerShow);
     m_pApplyButton->AddActionSignalTarget(m_pSpeedometerShowLastJump);
@@ -111,35 +115,31 @@ CMomentumSettingsPanel::CMomentumSettingsPanel(vgui::VPANEL parent)
     m_pApplyButton->AddActionSignalTarget(m_pSyncShow);
     m_pApplyButton->AddActionSignalTarget(m_pSyncShowBar);
     m_pApplyButton->AddActionSignalTarget(m_pButtonsShow);
-    
-    SetScheme("ClientScheme");
-    //SetScheme(vgui::scheme()->LoadSchemeFromFile("resource/ClientScheme.res", "ClientScheme"));
 
-    LoadControlSettings("resource/ui/MomentumSettingsPanel.res");
+    SetScheme("SourceScheme");
+    //Okay so this is gross but ComboBoxes only use the "Default" font for the text inside them. IDK why.
+    //Maybe in the future, we can update the scheme to not have grossly large default fonts (in ClientScheme)
+    HFont comboBoxFont = scheme()->GetIScheme(scheme()->GetScheme("SourceScheme"))->GetFont("DefaultVerySmall", true);
+    m_pSyncType->SetFont(comboBoxFont);
+    m_pSyncColorize->SetFont(comboBoxFont);
+    m_pSpeedometerUnits->SetFont(comboBoxFont);
+
     LoadSettings();
 
     ivgui()->AddTickSignal(GetVPanel());
 }
 
-//Class: CMyPanelInterface Class. Used for construction.
+// Class: CMyPanelInterface Class. Used for construction.
 class CMomentumSettingsPanelInterface : public MomentumSettingsPanel
 {
-private:
+  private:
     CMomentumSettingsPanel *settings_panel;
-public:
-    CMomentumSettingsPanelInterface()
-    {
-        settings_panel = nullptr;
-    }
-    ~CMomentumSettingsPanelInterface()
-    {
-        settings_panel = nullptr;
-    }
-    void Create(vgui::VPANEL parent)
-    {
-        settings_panel = new CMomentumSettingsPanel(parent);
-    }
-    void Destroy()
+
+  public:
+    CMomentumSettingsPanelInterface() { settings_panel = nullptr; }
+    ~CMomentumSettingsPanelInterface() { settings_panel = nullptr; }
+    void Create(vgui::VPANEL parent) override { settings_panel = new CMomentumSettingsPanel(parent); }
+    void Destroy() override
     {
         if (settings_panel)
         {
@@ -147,14 +147,14 @@ class CMomentumSettingsPanelInterface : public MomentumSettingsPanel
             delete settings_panel;
         }
     }
-    void Activate(void)
+    void Activate(void) override
     {
         if (settings_panel)
         {
             settings_panel->Activate();
         }
     }
-    void Close()
+    void Close() override
     {
         if (settings_panel)
         {
@@ -163,23 +163,21 @@ class CMomentumSettingsPanelInterface : public MomentumSettingsPanel
     }
 };
 static CMomentumSettingsPanelInterface g_SettingsPanel;
-MomentumSettingsPanel* momentum_settings = (MomentumSettingsPanel*) &g_SettingsPanel;
+MomentumSettingsPanel *momentum_settings = static_cast<MomentumSettingsPanel *>(&g_SettingsPanel);
 
-ConVar cl_showsettingspanel("cl_showsettingspanel", "0", FCVAR_CLIENTDLL | FCVAR_CLIENTCMD_CAN_EXECUTE 
-    | FCVAR_SERVER_CAN_EXECUTE | FCVAR_HIDDEN, "Sets the state of settings panel");
-
-CON_COMMAND(mom_settings_show, "Shows the settings")
+CON_COMMAND_F(mom_settings_show, "Shows the settings panel.\n",
+              FCVAR_CLIENTDLL | FCVAR_CLIENTCMD_CAN_EXECUTE | FCVAR_SERVER_CAN_EXECUTE | FCVAR_HIDDEN)
 {
     momentum_settings->Activate();
 }
 
-//Combobox changed a value
-void CMomentumSettingsPanel::OnTextChanged(vgui::Panel* panel)
+// Combobox changed a value
+void CMomentumSettingsPanel::OnTextChanged(vgui::Panel *panel)
 {
     ConVarRef units("mom_speedometer_units"), sync_type("mom_strafesync_type"), sync_color("mom_strafesync_colorize");
-    
+
     units.SetValue(m_pSpeedometerUnits->GetActiveItem() + 1);
-    sync_type.SetValue(m_pSyncType->GetActiveItem() + 1);//Sync type needs +1 added to it before setting convar!
+    sync_type.SetValue(m_pSyncType->GetActiveItem() + 1); // Sync type needs +1 added to it before setting convar!
     sync_color.SetValue(m_pSyncColorize->GetActiveItem());
 }
 
@@ -194,7 +192,7 @@ void CMomentumSettingsPanel::LoadSettings()
 void CMomentumSettingsPanel::OnTick()
 {
     BaseClass::OnTick();
-    vgui::GetAnimationController()->UpdateAnimations(system()->GetFrameTime());
+    GetAnimationController()->UpdateAnimations(system()->GetFrameTime());
 }
 
 void CMomentumSettingsPanel::Activate()
@@ -203,7 +201,7 @@ void CMomentumSettingsPanel::Activate()
     BaseClass::Activate();
 }
 
-void CMomentumSettingsPanel::OnCheckboxChecked(vgui::Panel* panel)
+void CMomentumSettingsPanel::OnCheckboxChecked(vgui::Panel *panel)
 {
     m_pApplyButton->SetEnabled(true);
 
diff --git a/mp/src/game/client/momentum/ui/VersionWarnPanel.cpp b/mp/src/game/client/momentum/ui/VersionWarnPanel.cpp
index e9a06ecc42..9886a8310c 100644
--- a/mp/src/game/client/momentum/ui/VersionWarnPanel.cpp
+++ b/mp/src/game/client/momentum/ui/VersionWarnPanel.cpp
@@ -1,132 +1,54 @@
-//The following include files are necessary to allow The Panel .cpp to compile.
+// The following include files are necessary to allow The Panel .cpp to compile.
 #include "cbase.h"
-#include "IVersionWarnPanel.h"
-using namespace vgui;
-#include <vgui/IVGui.h>
-#include <vgui_controls/Frame.h>
-#include <vgui_controls/Button.h>
-#include <vgui_controls/URLLabel.h>
 
-#include "momentum/mom_shareddefs.h"
+#include "VersionWarnPanel.h"
 
 #include "tier0/memdbgon.h"
 
-//CVersionWarnPanel class
-class CVersionWarnPanel : public vgui::Frame
-{
-    DECLARE_CLASS_SIMPLE(CVersionWarnPanel, vgui::Frame);
-    //CVersionWarnPanel : This Class / vgui::Frame : BaseClass
-
-    CVersionWarnPanel(vgui::VPANEL parent); 	// Constructor
-    ~CVersionWarnPanel(){};				// Destructor
-
-protected:
-    //VGUI overrides:
-    virtual void OnTick();
-    virtual void OnCommand(const char* pcCommand);
-
-private:
-    //Other used VGUI control Elements:
-    URLLabel *m_pReleaseText;
-    const char *m_pVersion;
-};
-
 // Constuctor: Initializes the Panel
-CVersionWarnPanel::CVersionWarnPanel(vgui::VPANEL parent)
-    : BaseClass(nullptr, "VersionWarnPanel")
+CVersionWarnPanel::CVersionWarnPanel(VPANEL parent) : BaseClass(nullptr, "VersionWarnPanel")
 {
+    V_memset(m_cOnlineVersion, 0, sizeof(m_cOnlineVersion));
     SetParent(parent);
+    LoadControlSettings("resource/ui/versionwarnpanel.res");
+    m_pReleaseText = FindControl<URLLabel>("ReleaseText", true);
+    m_pChangeLog = FindControl<RichText>("ChangeLog", true);
 
     SetKeyBoardInputEnabled(true);
     SetMouseInputEnabled(true);
-
-    SetProportional(true);
     SetTitleBarVisible(true);
     SetMinimizeButtonVisible(false);
     SetMaximizeButtonVisible(false);
     SetCloseButtonVisible(true);
     SetSizeable(false);
+    SetMinimumSize(400, 250);
     SetMoveable(true);
     SetVisible(false);
+    SetProportional(true);
 
-
-    SetScheme(vgui::scheme()->LoadSchemeFromFile("resource/SourceScheme.res", "SourceScheme"));
-
-    LoadControlSettings("resource/ui/versionwarnpanel.res");
-
-    vgui::ivgui()->AddTickSignal(GetVPanel(), 100);
-
-    m_pReleaseText = FindControl<URLLabel>("ReleaseText", true);
-    if (!m_pReleaseText)
+    //SetScheme(scheme()->LoadSchemeFromFile("resource/SourceScheme.res", "SourceScheme"));
+    if (!m_pReleaseText || !m_pChangeLog)
     {
         Assert("Missing one more gameui controls from ui/versionwarnpanel.res");
     }
-
 }
 
-//Class: CMyPanelInterface Class. Used for construction.
-class CVersionWarnPanelInterface : public VersionWarnPanel
+// Called when the versions don't match (there's an update)
+void CVersionWarnPanel::Activate()
 {
-private:
-    CVersionWarnPanel *MyPanel;
-public:
-    CVersionWarnPanelInterface()
-    {
-        MyPanel = nullptr;
-    }
-    void Create(vgui::VPANEL parent)
-    {
-        MyPanel = new CVersionWarnPanel(parent);
-    }
-    void Destroy()
-    {
-        if (MyPanel)
-        {
-            MyPanel->SetParent(nullptr);
-            delete MyPanel;
-        }
-    }
-    void Activate(void)
-    {
-        if (MyPanel)
-        {
-            MyPanel->Activate();
-        }
-    }
-    void Close()
-    {
-        if (MyPanel)
-        {
-            MyPanel->Close();
-        }
-    }
-};
-static CVersionWarnPanelInterface g_VersionWarn;
-VersionWarnPanel* versionwarnpanel = (VersionWarnPanel*)&g_VersionWarn;
-
-ConVar cl_showversionwarnpanel("cl_showversionwarnpanel", "0", FCVAR_CLIENTDLL | FCVAR_CLIENTCMD_CAN_EXECUTE | FCVAR_SERVER_CAN_EXECUTE | FCVAR_HIDDEN, "Sets the state of versionwarnpanel");
+    //HFont m_hfReleaseFont = m_pReleaseText->GetFont();
+    char m_cReleaseText[225];
+    m_pReleaseText->GetText(m_cReleaseText, sizeof(m_cReleaseText));
+    char m_cReleaseF[225];
 
-void CVersionWarnPanel::OnTick()
-{
-    BaseClass::OnTick();
-    if (Q_strcmp(cl_showversionwarnpanel.GetString(), cl_showversionwarnpanel.GetDefault()) != 0)
-    {
-        SetVisible(true);        
-        HFont m_hfReleaseFont = m_pReleaseText->GetFont();
-        char m_cReleaseText[225];
-        m_pReleaseText->GetText(m_cReleaseText, sizeof(m_cReleaseText));
-        char m_cReleaseF[225];
+    Q_snprintf(m_cReleaseF, 225, m_cReleaseText, MOM_CURRENT_VERSION, m_cOnlineVersion);
+    m_pReleaseText->SetText(m_cReleaseF);
+    m_pReleaseText->SetURL("https://github.com/momentum-mod/game/releases");
 
-        Q_snprintf(m_cReleaseF, 225, m_cReleaseText, MOM_CURRENT_VERSION, cl_showversionwarnpanel.GetString());
-        cl_showversionwarnpanel.Revert();
-        m_pReleaseText->SetText(m_cReleaseF);
-        m_pReleaseText->SetURL("https://github.com/momentum-mod/game/releases");
-        SetSize(UTIL_ComputeStringWidth(m_hfReleaseFont, m_cReleaseF) + m_pReleaseText->GetXPos() * 2, GetTall());
-        m_pReleaseText->SetPos(m_pReleaseText->GetXPos(), GetTall() / 2);
-    }
+    BaseClass::Activate();
 }
 
-void CVersionWarnPanel::OnCommand(const char* pcCommand)
+void CVersionWarnPanel::OnCommand(const char *pcCommand)
 {
     BaseClass::OnCommand(pcCommand);
 
@@ -139,5 +61,10 @@ void CVersionWarnPanel::OnCommand(const char* pcCommand)
 
 CON_COMMAND(mom_version, "Prints mod current installed version")
 {
-    Log("Mod currently installed version: %s\n",MOM_CURRENT_VERSION);
-}
\ No newline at end of file
+    Log("Mod currently installed version: %s\n", MOM_CURRENT_VERSION);
+    // MOM_TODO: Do we want to check for new versions in the future?
+}
+
+// Interface this class to the rest of the DLL
+static CVersionWarnPanelInterface g_VersionWarn;
+VersionWarnPanel *versionwarnpanel = static_cast<VersionWarnPanel *>(&g_VersionWarn);
\ No newline at end of file
diff --git a/mp/src/game/client/momentum/ui/VersionWarnPanel.h b/mp/src/game/client/momentum/ui/VersionWarnPanel.h
new file mode 100644
index 0000000000..e38962bbf7
--- /dev/null
+++ b/mp/src/game/client/momentum/ui/VersionWarnPanel.h
@@ -0,0 +1,105 @@
+#pragma once
+
+#include "cbase.h"
+
+#include "IVersionWarnPanel.h"
+#include <vgui/IVGui.h>
+#include <vgui_controls/Button.h>
+#include <vgui_controls/Frame.h>
+#include <vgui_controls/RichText.h>
+#include <vgui_controls/URLLabel.h>
+
+#include "momentum/mom_shareddefs.h"
+
+using namespace vgui;
+
+// CVersionWarnPanel class
+class CVersionWarnPanel : public Frame
+{
+    DECLARE_CLASS_SIMPLE(CVersionWarnPanel, Frame);
+    // CVersionWarnPanel : This Class / vgui::Frame : BaseClass
+
+    CVersionWarnPanel(VPANEL parent); // Constructor
+    ~CVersionWarnPanel(){};           // Destructor
+
+    void SetVersion(const char *version) { Q_strncpy(m_cOnlineVersion, version, 12); }
+
+    void SetChangelog(char *pChangelog)
+    {
+        Q_strncpy(m_cOnlineChangelog, pChangelog, sizeof(m_cOnlineChangelog));
+        if (m_pChangeLog)
+        {
+            m_pChangeLog->InsertString(m_cOnlineChangelog);
+            m_pChangeLog->GotoTextStart();
+        }
+    }
+
+    void ApplySchemeSettings(IScheme *pScheme) override
+    {
+        BaseClass::ApplySchemeSettings(pScheme);
+        m_pChangeLog->SetFont(pScheme->GetFont("DefaultSmall"));
+    }
+
+    void Activate() override;
+
+  protected:
+    // VGUI overrides:
+    void OnCommand(const char *pcCommand) override;
+
+  private:
+    // Other used VGUI control Elements:
+    URLLabel *m_pReleaseText;
+    RichText *m_pChangeLog;
+    char m_cOnlineVersion[12];
+    char m_cOnlineChangelog[4056]; // MOM_TODO: Determine a better size
+};
+
+class CVersionWarnPanelInterface : public VersionWarnPanel
+{
+  private:
+    CVersionWarnPanel *pPanel;
+
+  public:
+    CVersionWarnPanelInterface() { pPanel = nullptr; }
+    ~CVersionWarnPanelInterface() { }
+    void Create(vgui::VPANEL parent) override { pPanel = new CVersionWarnPanel(parent); }
+    void Destroy() override
+    {
+        if (pPanel)
+        {
+            pPanel->SetParent(nullptr);
+            delete pPanel;
+        }
+        pPanel = nullptr;
+    }
+    void Activate(void) override
+    {
+        if (pPanel)
+        {
+            pPanel->Activate();
+        }
+    }
+    void Close() override
+    {
+        if (pPanel)
+        {
+            pPanel->Close();
+        }
+    }
+
+    void SetVersion(const char *pVersion) const override
+    {
+        if (pPanel)
+        {
+            pPanel->SetVersion(pVersion);
+        }
+    }
+
+    void SetChangelog(char *pChangelog) const override
+    {
+        if (pPanel)
+        {
+            pPanel->SetChangelog(pChangelog);
+        }
+    }
+};
\ No newline at end of file
diff --git a/mp/src/game/client/momentum/ui/hud_keypress.cpp b/mp/src/game/client/momentum/ui/hud_keypress.cpp
index 55c03b0e72..2f5c3abbc9 100644
--- a/mp/src/game/client/momentum/ui/hud_keypress.cpp
+++ b/mp/src/game/client/momentum/ui/hud_keypress.cpp
@@ -195,10 +195,10 @@ void CHudKeyPressDisplay::OnThink()
             m_nButtons = pReplayEnt->m_nReplayButtons;
             m_nStrafes = pReplayEnt->m_iTotalStrafes;
             m_nJumps = pReplayEnt->m_iTotalJumps;
-        } 
+        }
         else
         {
-            m_nButtons = ::input->GetButtonBits(1);
+            m_nButtons = ::input->GetButtonBits(engine->IsPlayingDemo());
             if (g_MOMEventListener)
             {
                 //we should only draw the strafe/jump counters when the timer is running
diff --git a/mp/src/game/client/momentum/ui/hud_mapfinished.cpp b/mp/src/game/client/momentum/ui/hud_mapfinished.cpp
index 9095d10ed2..c83267d5a8 100644
--- a/mp/src/game/client/momentum/ui/hud_mapfinished.cpp
+++ b/mp/src/game/client/momentum/ui/hud_mapfinished.cpp
@@ -227,6 +227,14 @@ void CHudMapFinishedDialog::Reset()
     strcpy(m_pszEndRunTime, "00:00:00.000"); 
 }
 
+void CHudMapFinishedDialog::SetVisible(bool b)
+{
+    BaseClass::SetVisible(b);
+    //We reset the page to 0 when this this panel is shown because Reset() is not always called.
+    if (b) 
+        m_iCurrentPage = 0;
+}
+
 #define MAKE_UNI_NUM(name, size, number, format) \
     wchar_t name[size]; \
     V_snwprintf(name, size, format, number)
diff --git a/mp/src/game/client/momentum/ui/hud_mapfinished.h b/mp/src/game/client/momentum/ui/hud_mapfinished.h
index ccb1950822..df114d2a74 100644
--- a/mp/src/game/client/momentum/ui/hud_mapfinished.h
+++ b/mp/src/game/client/momentum/ui/hud_mapfinished.h
@@ -38,6 +38,7 @@ class CHudMapFinishedDialog : public CHudElement, public EditablePanel
     void OnThink() override;
     void Init() override;
     void Reset() override;
+    void SetVisible(bool) override;
     void FireGameEvent(IGameEvent*) override;
 
     void OnMousePressed(MouseCode code) override;
diff --git a/mp/src/game/client/momentum/ui/hud_versionwarn.cpp b/mp/src/game/client/momentum/ui/hud_versioninfo.cpp
similarity index 81%
rename from mp/src/game/client/momentum/ui/hud_versionwarn.cpp
rename to mp/src/game/client/momentum/ui/hud_versioninfo.cpp
index 52b6bafcdf..4d387faac5 100644
--- a/mp/src/game/client/momentum/ui/hud_versionwarn.cpp
+++ b/mp/src/game/client/momentum/ui/hud_versioninfo.cpp
@@ -13,12 +13,12 @@
 
 using namespace vgui;
 
-class CHudVersionWarn : public CHudElement, public Panel
+class CHudVersionInfo : public CHudElement, public Panel
 {
-    DECLARE_CLASS_SIMPLE(CHudVersionWarn, Panel);
+    DECLARE_CLASS_SIMPLE(CHudVersionInfo, Panel);
 
   public:
-    CHudVersionWarn(const char *pElementName);
+    CHudVersionInfo(const char *pElementName);
 
     bool ShouldDraw() override { return CHudElement::ShouldDraw(); }
 
@@ -33,10 +33,10 @@ class CHudVersionWarn : public CHudElement, public Panel
     wchar_t uVersionText[BUFSIZELOCL];
 };
 
-DECLARE_HUDELEMENT(CHudVersionWarn);
+DECLARE_HUDELEMENT(CHudVersionInfo);
 
-CHudVersionWarn::CHudVersionWarn(const char *pElementName)
-    : CHudElement(pElementName), Panel(g_pClientMode->GetViewport(), "CHudVersionWarn")
+CHudVersionInfo::CHudVersionInfo(const char *pElementName)
+    : CHudElement(pElementName), Panel(g_pClientMode->GetViewport(), "CHudVersionInfo")
 {
     SetPaintBackgroundEnabled(false);
     SetProportional(true);
@@ -45,7 +45,7 @@ CHudVersionWarn::CHudVersionWarn(const char *pElementName)
     SetHiddenBits(HIDEHUD_WEAPONSELECTION);
 }
 
-void CHudVersionWarn::Init()
+void CHudVersionInfo::Init()
 {
     char m_pszStringVersion[BUFSIZELOCL];
     char strVersion[BUFSIZELOCL];
@@ -57,7 +57,7 @@ void CHudVersionWarn::Init()
     g_pVGuiLocalize->ConvertANSIToUnicode(m_pszStringVersion, uVersionText, sizeof(m_pszStringVersion));
 }
 
-void CHudVersionWarn::Paint()
+void CHudVersionInfo::Paint()
 {
     surface()->DrawSetTextPos(0, 0);
     surface()->DrawSetTextFont(m_hTextFont);
diff --git a/mp/src/game/client/momentum/ui/momSpectatorGUI.cpp b/mp/src/game/client/momentum/ui/momSpectatorGUI.cpp
index f2fa077cc8..daac11071b 100644
--- a/mp/src/game/client/momentum/ui/momSpectatorGUI.cpp
+++ b/mp/src/game/client/momentum/ui/momSpectatorGUI.cpp
@@ -1,40 +1,41 @@
 //========= Copyright Valve Corporation, All rights reserved. ============//
 //
-// Purpose: 
+// Purpose:
 //
 // $NoKeywords: $
 //=============================================================================//
 
 #include "cbase.h"
+#include <KeyValues.h>
 #include <cdll_client_int.h>
-#include <globalvars_base.h>
 #include <cdll_util.h>
-#include <KeyValues.h>
+#include <globalvars_base.h>
 
 #include "momspectatorgui.h"
 
-#include <vgui/IScheme.h>
 #include <vgui/ILocalize.h>
-#include <vgui/ISurface.h>
 #include <vgui/IPanel.h>
+#include <vgui/IScheme.h>
+#include <vgui/ISurface.h>
 #include <vgui_controls/ImageList.h>
 #include <vgui_controls/MenuItem.h>
 #include <vgui_controls/TextImage.h>
 
 #include <stdio.h> // _snprintf define
 
-#include <game/client/iviewport.h>
 #include "commandmenu.h"
 #include "hltvcamera.h"
+#include <game/client/iviewport.h>
 
-#include <vgui_controls/TextEntry.h>
-#include <vgui_controls/Panel.h>
-#include <vgui_controls/ImagePanel.h>
-#include <vgui_controls/Menu.h>
 #include "IGameUIFuncs.h" // for key bindings
+#include <igameresources.h>
 #include <imapoverview.h>
 #include <shareddefs.h>
-#include <igameresources.h>
+#include <vgui/IInput.h>
+#include <vgui_controls/ImagePanel.h>
+#include <vgui_controls/Menu.h>
+#include <vgui_controls/Panel.h>
+#include <vgui_controls/TextEntry.h>
 
 #include "mom_player_shared.h"
 #include "util/mom_util.h"
@@ -45,16 +46,15 @@
 CMOMSpectatorGUI *g_pMOMSpectatorGUI = nullptr;
 
 // NB disconnect between localization text and observer mode enums
-static const char *s_SpectatorModes[] =
-{
-	"#Spec_Mode0",	// 	OBS_MODE_NONE = 0,	
-	"#Spec_Mode1",	// 	OBS_MODE_DEATHCAM,	
-	"",				// 	OBS_MODE_FREEZECAM,	
-	"#Spec_Mode2",	// 	OBS_MODE_FIXED,		
-	"#Spec_Mode3",	// 	OBS_MODE_IN_EYE,	
-	"#Spec_Mode4",	// 	OBS_MODE_CHASE,		
-	"#Spec_Mode_POI",	// 	OBS_MODE_POI, PASSTIME
-	"#Spec_Mode5",	// 	OBS_MODE_ROAMING,	
+static const char *s_SpectatorModes[] = {
+    "#Spec_Mode0",    // 	OBS_MODE_NONE = 0,
+    "#Spec_Mode1",    // 	OBS_MODE_DEATHCAM,
+    "",               // 	OBS_MODE_FREEZECAM,
+    "#Spec_Mode2",    // 	OBS_MODE_FIXED,
+    "#Spec_Mode3",    // 	OBS_MODE_IN_EYE,
+    "#Spec_Mode4",    // 	OBS_MODE_CHASE,
+    "#Spec_Mode_POI", // 	OBS_MODE_POI, PASSTIME
+    "#Spec_Mode5",    // 	OBS_MODE_ROAMING,
 };
 
 using namespace vgui;
@@ -64,15 +64,15 @@ using namespace vgui;
 //-----------------------------------------------------------------------------
 class CSpecButton : public Button
 {
-public:
-	CSpecButton(Panel *parent, const char *panelName): Button(parent, panelName, "") {}
-
-private:
-	void ApplySchemeSettings(vgui::IScheme *pScheme)
-	{
-		Button::ApplySchemeSettings(pScheme);
-		SetFont(pScheme->GetFont("Marlett", IsProportional()) );
-	}
+  public:
+    CSpecButton(Panel *parent, const char *panelName) : Button(parent, panelName, "") {}
+
+  private:
+    void ApplySchemeSettings(vgui::IScheme *pScheme)
+    {
+        Button::ApplySchemeSettings(pScheme);
+        SetFont(pScheme->GetFont("Marlett", IsProportional()));
+    }
 };
 
 //-----------------------------------------------------------------------------
@@ -80,70 +80,70 @@ class CSpecButton : public Button
 //-----------------------------------------------------------------------------
 CMOMSpectatorMenu::CMOMSpectatorMenu(IViewPort *pViewPort) : Frame(nullptr, PANEL_SPECMENU)
 {
-	m_iDuckKey = BUTTON_CODE_INVALID;
-		
-	m_pViewPort = pViewPort;
-
-	SetMouseInputEnabled( true );
-	SetKeyBoardInputEnabled( true );
-	SetTitleBarVisible( false ); // don't draw a title bar
-	SetMoveable( false );
-	SetSizeable( false );
-	SetProportional(true);
-	SetScheme("ClientScheme");
+    m_iDuckKey = BUTTON_CODE_INVALID;
+
+    m_pViewPort = pViewPort;
+
+    SetMouseInputEnabled(true);
+    SetKeyBoardInputEnabled(true);
+    SetTitleBarVisible(false); // don't draw a title bar
+    SetMoveable(false);
+    SetSizeable(false);
+    SetProportional(true);
+    SetScheme("ClientScheme");
     ListenForGameEvent("spec_target_updated");
 
-	m_pPlayerList = new ComboBox(this, "playercombo", 10 , false);
-	HFont hFallbackFont = scheme()->GetIScheme( GetScheme() )->GetFont( "DefaultVerySmallFallBack", false );
-	if ( INVALID_FONT != hFallbackFont )
-	{
-		m_pPlayerList->SetUseFallbackFont( true, hFallbackFont );
-	}
-
-	m_pViewOptions = new ComboBox(this, "viewcombo", 10 , false );
-	m_pConfigSettings = new ComboBox(this, "settingscombo", 10 , false );	
-
-	m_pLeftButton = new CSpecButton( this, "specprev");
-	m_pLeftButton->SetText("3");
-	m_pRightButton = new CSpecButton( this, "specnext");
-	m_pRightButton->SetText("4");
-
-	m_pPlayerList->SetText("");
-	m_pViewOptions->SetText("#Spec_Modes");
-	m_pConfigSettings->SetText("#Spec_Options");
-
-	m_pPlayerList->SetOpenDirection( Menu::UP );
-	m_pViewOptions->SetOpenDirection( Menu::UP );
-	m_pConfigSettings->SetOpenDirection( Menu::UP );
-
-	// create view config menu
-	CommandMenu * menu = new CommandMenu(m_pConfigSettings, "spectatormenu", gViewPortInterface);
-	menu->LoadFromFile( "Resource/spectatormenu.res" );
-	m_pConfigSettings->SetMenu( menu );	// attach menu to combo box
-
-	// create view mode menu
-	menu = new CommandMenu(m_pViewOptions, "spectatormodes", gViewPortInterface);
-	menu->LoadFromFile("Resource/spectatormodes.res");
-	m_pViewOptions->SetMenu( menu );	// attach menu to combo box
-
-	LoadControlSettings("Resource/UI/BottomSpectator.res");
-	ListenForGameEvent( "spec_target_updated" );
+    m_pPlayerList = new ComboBox(this, "playercombo", 10, false);
+    HFont hFallbackFont = scheme()->GetIScheme(GetScheme())->GetFont("DefaultVerySmallFallBack", false);
+    if (INVALID_FONT != hFallbackFont)
+    {
+        m_pPlayerList->SetUseFallbackFont(true, hFallbackFont);
+    }
+
+    m_pViewOptions = new ComboBox(this, "viewcombo", 10, false);
+    m_pConfigSettings = new ComboBox(this, "settingscombo", 10, false);
+
+    m_pLeftButton = new CSpecButton(this, "specprev");
+    m_pLeftButton->SetText("3");
+    m_pRightButton = new CSpecButton(this, "specnext");
+    m_pRightButton->SetText("4");
+
+    m_pPlayerList->SetText("");
+    m_pViewOptions->SetText("#Spec_Modes");
+    m_pConfigSettings->SetText("#Spec_Options");
+
+    m_pPlayerList->SetOpenDirection(Menu::UP);
+    m_pViewOptions->SetOpenDirection(Menu::UP);
+    m_pConfigSettings->SetOpenDirection(Menu::UP);
+
+    // create view config menu
+    CommandMenu *menu = new CommandMenu(m_pConfigSettings, "spectatormenu", gViewPortInterface);
+    menu->LoadFromFile("Resource/spectatormenu.res");
+    m_pConfigSettings->SetMenu(menu); // attach menu to combo box
+
+    // create view mode menu
+    menu = new CommandMenu(m_pViewOptions, "spectatormodes", gViewPortInterface);
+    menu->LoadFromFile("Resource/spectatormodes.res");
+    m_pViewOptions->SetMenu(menu); // attach menu to combo box
+
+    LoadControlSettings("Resource/UI/BottomSpectator.res");
+    ListenForGameEvent("spec_target_updated");
 }
 
 void CMOMSpectatorMenu::ApplySchemeSettings(IScheme *pScheme)
 {
-	BaseClass::ApplySchemeSettings(pScheme);
-	// need to MakeReadyForUse() on the menus so we can set their bg color before they are displayed
-	m_pConfigSettings->GetMenu()->MakeReadyForUse();
-	m_pViewOptions->GetMenu()->MakeReadyForUse();
-	m_pPlayerList->GetMenu()->MakeReadyForUse();
+    BaseClass::ApplySchemeSettings(pScheme);
+    // need to MakeReadyForUse() on the menus so we can set their bg color before they are displayed
+    m_pConfigSettings->GetMenu()->MakeReadyForUse();
+    m_pViewOptions->GetMenu()->MakeReadyForUse();
+    m_pPlayerList->GetMenu()->MakeReadyForUse();
 
     if (g_pMOMSpectatorGUI)
-	{
+    {
         m_pConfigSettings->GetMenu()->SetBgColor(g_pMOMSpectatorGUI->GetBlackBarColor());
         m_pViewOptions->GetMenu()->SetBgColor(g_pMOMSpectatorGUI->GetBlackBarColor());
         m_pPlayerList->GetMenu()->SetBgColor(g_pMOMSpectatorGUI->GetBlackBarColor());
-	}
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -151,94 +151,93 @@ void CMOMSpectatorMenu::ApplySchemeSettings(IScheme *pScheme)
 //-----------------------------------------------------------------------------
 void CMOMSpectatorMenu::PerformLayout()
 {
-	int w,h;
-	GetHudSize(w, h);
+    int w, h;
+    GetHudSize(w, h);
 
-	// fill the screen
-	SetSize(w,GetTall());
+    // fill the screen
+    SetSize(w, GetTall());
 }
 
-
 //-----------------------------------------------------------------------------
 // Purpose: Handles changes to combo boxes
 //-----------------------------------------------------------------------------
 void CMOMSpectatorMenu::OnTextChanged(KeyValues *data)
 {
-	Panel *panel = reinterpret_cast<vgui::Panel *>( data->GetPtr("panel") );
-
-	vgui::ComboBox *box = dynamic_cast<vgui::ComboBox *>( panel );
-
-	if( box == m_pConfigSettings) // don't change the text in the config setting combo
-	{
-		m_pConfigSettings->SetText("#Spec_Options");
-	}
-	else if ( box == m_pPlayerList )
-	{
-		KeyValues *kv = box->GetActiveItemUserData();
-		if ( kv && GameResources() )
-		{
-			const char *player = kv->GetString("player");
-
-			int currentPlayerNum = GetSpectatorTarget();
-			const char *currentPlayerName = GameResources()->GetPlayerName( currentPlayerNum );
-
-			if ( !FStrEq( currentPlayerName, player ) )
-			{
-				char command[128];
-				Q_snprintf( command, sizeof(command), "spec_player \"%s\"", player );
-				engine->ClientCmd( command );
-			}
-		}
-	}
+    Panel *panel = reinterpret_cast<Panel *>(data->GetPtr("panel"));
+
+    ComboBox *box = dynamic_cast<ComboBox *>(panel);
+
+    if (box == m_pConfigSettings) // don't change the text in the config setting combo
+    {
+        m_pConfigSettings->SetText("#Spec_Options");
+    }
+    else if (box == m_pPlayerList)
+    {
+        KeyValues *kv = box->GetActiveItemUserData();
+        if (kv && GameResources())
+        {
+            const char *player = kv->GetString("player");
+
+            int currentPlayerNum = GetSpectatorTarget();
+            const char *currentPlayerName = GameResources()->GetPlayerName(currentPlayerNum);
+
+            if (!FStrEq(currentPlayerName, player))
+            {
+                char command[128];
+                Q_snprintf(command, sizeof(command), "spec_player \"%s\"", player);
+                engine->ClientCmd(command);
+            }
+        }
+    }
 }
 
 void CMOMSpectatorMenu::OnCommand(const char *command)
 {
-	if (!stricmp(command, "specnext") )
-	{
-		engine->ClientCmd("spec_next");
-	}
-	else if (!stricmp(command, "specprev") )
-	{
-		engine->ClientCmd("spec_prev");
-	}
+    if (!stricmp(command, "specnext"))
+    {
+        engine->ClientCmd("spec_next");
+    }
+    else if (!stricmp(command, "specprev"))
+    {
+        engine->ClientCmd("spec_prev");
+    }
 }
 
-void CMOMSpectatorMenu::FireGameEvent(IGameEvent * event)
+void CMOMSpectatorMenu::FireGameEvent(IGameEvent *event)
 {
-	const char *pEventName = event->GetName();
-
- 	if ( Q_strcmp( "spec_target_updated", pEventName ) == 0 )
-	{
-		IGameResources *gr = GameResources();
-		if ( !gr )
-			return;
-
-		// make sure the player combo box is up to date
-		int playernum = GetSpectatorTarget();
-		if ( playernum < 1 || playernum > MAX_PLAYERS )
-			return;
-
-		const char *selectedPlayerName = gr->GetPlayerName( playernum );
-		const char *currentPlayerName = "";
-		KeyValues *kv = m_pPlayerList->GetActiveItemUserData();
-		if ( kv )
-		{
-			currentPlayerName = kv->GetString( "player" );
-		}
-		if ( !FStrEq( currentPlayerName, selectedPlayerName ) )
-		{
-			for ( int i=0; i<m_pPlayerList->GetItemCount(); ++i )
-			{
-				KeyValues *kv = m_pPlayerList->GetItemUserData( i );
-				if ( kv && FStrEq( kv->GetString( "player" ), selectedPlayerName ) )
-				{
-					m_pPlayerList->ActivateItemByRow( i );
-					break;
-				}
-			}
-		}
-	}
+    const char *pEventName = event->GetName();
+
+    if (Q_strcmp("spec_target_updated", pEventName) == 0)
+    {
+        IGameResources *gr = GameResources();
+        if (!gr)
+            return;
+
+        // make sure the player combo box is up to date
+        int playernum = GetSpectatorTarget();
+        if (playernum < 1 || playernum > MAX_PLAYERS)
+            return;
+
+        const char *selectedPlayerName = gr->GetPlayerName(playernum);
+        const char *currentPlayerName = "";
+        KeyValues *kv = m_pPlayerList->GetActiveItemUserData();
+        if (kv)
+        {
+            currentPlayerName = kv->GetString("player");
+        }
+        if (!FStrEq(currentPlayerName, selectedPlayerName))
+        {
+            for (int i = 0; i < m_pPlayerList->GetItemCount(); ++i)
+            {
+                KeyValues *kv = m_pPlayerList->GetItemUserData(i);
+                if (kv && FStrEq(kv->GetString("player"), selectedPlayerName))
+                {
+                    m_pPlayerList->ActivateItemByRow(i);
+                    break;
+                }
+            }
+        }
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -246,229 +245,236 @@ void CMOMSpectatorMenu::FireGameEvent(IGameEvent * event)
 //-----------------------------------------------------------------------------
 void CMOMSpectatorMenu::OnKeyCodePressed(KeyCode code)
 {
-	if ( code == m_iDuckKey )
-	{
-		// hide if DUCK is pressed again
-		m_pViewPort->ShowPanel( this, false );
-	}
-    
+    if (code == m_iDuckKey)
+    {
+        // hide if DUCK is pressed again
+        m_pViewPort->ShowPanel(this, false);
+    }
 }
 
 void CMOMSpectatorMenu::ShowPanel(bool bShow)
 {
-    
-	if ( BaseClass::IsVisible() == bShow )
-		return;
-
-	if ( bShow )
-	{
-		Activate();
-		SetMouseInputEnabled( true );
-		SetKeyBoardInputEnabled( true );
-	}
-	else
-	{
-		SetVisible( false );
-		SetMouseInputEnabled( false );
-		SetKeyBoardInputEnabled( false );
-	}
-
-	bool bIsEnabled = true;
-	
-	 if ( engine->IsHLTV() && HLTVCamera()->IsPVSLocked() )
-	{
-		 // when watching HLTV or Replay with a locked PVS, some elements are disabled
-		 bIsEnabled = false;
-	 }
-	
-	m_pLeftButton->SetVisible( bIsEnabled );
-	m_pRightButton->SetVisible( bIsEnabled );
-	m_pPlayerList->SetVisible( bIsEnabled );
-	m_pViewOptions->SetVisible( bIsEnabled );
-    
 
+    if (BaseClass::IsVisible() == bShow)
+        return;
+
+    if (bShow)
+    {
+        Activate();
+        SetMouseInputEnabled(true);
+        SetKeyBoardInputEnabled(true);
+    }
+    else
+    {
+        SetVisible(false);
+        SetMouseInputEnabled(false);
+        SetKeyBoardInputEnabled(false);
+    }
+
+    bool bIsEnabled = true;
+
+    if (engine->IsHLTV() && HLTVCamera()->IsPVSLocked())
+    {
+        // when watching HLTV or Replay with a locked PVS, some elements are disabled
+        bIsEnabled = false;
+    }
+
+    m_pLeftButton->SetVisible(bIsEnabled);
+    m_pRightButton->SetVisible(bIsEnabled);
+    m_pPlayerList->SetVisible(bIsEnabled);
+    m_pViewOptions->SetVisible(bIsEnabled);
 }
 
 void CMOMSpectatorMenu::Update(void)
 {
-	IGameResources *gr = GameResources();
-
-	Reset();
-
-	if ( m_iDuckKey == BUTTON_CODE_INVALID )
-	{
-		m_iDuckKey = gameuifuncs->GetButtonCodeForBind( "duck" );
-	}
-
-	if ( !gr )
-		return;
-
-	int iPlayerIndex;
-	for ( iPlayerIndex = 1 ; iPlayerIndex <= gpGlobals->maxClients; iPlayerIndex++ )
-	{
-
-		// does this slot in the array have a name?
-		if ( !gr->IsConnected( iPlayerIndex ) )
-			continue;
-
-		if ( gr->IsLocalPlayer( iPlayerIndex ) )
-			continue;
-
-		if ( !gr->IsAlive( iPlayerIndex ) )
-			continue;
-
-		wchar_t playerText[ 80 ], playerName[ 64 ], *team, teamText[ 64 ];
-		char localizeTeamName[64];
-		char szPlayerIndex[16];
-		g_pVGuiLocalize->ConvertANSIToUnicode( UTIL_SafeName( gr->GetPlayerName(iPlayerIndex) ), playerName, sizeof( playerName ) );
-		const char * teamname = gr->GetTeamName( gr->GetTeam(iPlayerIndex) );
-		if ( teamname )
-		{	
-			Q_snprintf( localizeTeamName, sizeof( localizeTeamName ), "#%s", teamname );
-			team=g_pVGuiLocalize->Find( localizeTeamName );
-
-			if ( !team ) 
-			{
-				g_pVGuiLocalize->ConvertANSIToUnicode( teamname , teamText, sizeof( teamText ) );
-				team = teamText;
-			}
-
-			g_pVGuiLocalize->ConstructString( playerText, sizeof( playerText ), g_pVGuiLocalize->Find( "#Spec_PlayerItem_Team" ), 2, playerName, team );
-		}
-		else
-		{
-			g_pVGuiLocalize->ConstructString( playerText, sizeof( playerText ), g_pVGuiLocalize->Find( "#Spec_PlayerItem" ), 1, playerName );
-		}
-
-		Q_snprintf( szPlayerIndex, sizeof( szPlayerIndex ), "%d", iPlayerIndex );
-
-		KeyValues *kv = new KeyValues( "UserData", "player", gr->GetPlayerName( iPlayerIndex ), "index", szPlayerIndex );
-		m_pPlayerList->AddItem( playerText, kv );
-		kv->deleteThis();
-	}
-
-	// make sure the player combo box is up to date
-	int playernum = GetSpectatorTarget();
-	const char *selectedPlayerName = gr->GetPlayerName( playernum );
-	for ( iPlayerIndex=0; iPlayerIndex<m_pPlayerList->GetItemCount(); ++iPlayerIndex )
-	{
-		KeyValues *kv = m_pPlayerList->GetItemUserData( iPlayerIndex );
-		if ( kv && FStrEq( kv->GetString( "player" ), selectedPlayerName ) )
-		{
-			m_pPlayerList->ActivateItemByRow( iPlayerIndex );
-			break;
-		}
-	}
-
-	//=============================================================================
-	// HPE_BEGIN:
-	// [pfreese] make sure the view mode combo box is up to date - the spectator 
-	// mode can be changed multiple ways
-	//=============================================================================
-	
-	int specmode = GetSpectatorMode();
-	m_pViewOptions->SetText(s_SpectatorModes[specmode]);
-	
-	//=============================================================================
-	// HPE_END
-	//=============================================================================
+    IGameResources *gr = GameResources();
+
+    Reset();
+
+    if (m_iDuckKey == BUTTON_CODE_INVALID)
+    {
+        m_iDuckKey = gameuifuncs->GetButtonCodeForBind("duck");
+    }
+
+    if (!gr)
+        return;
+
+    int iPlayerIndex;
+    for (iPlayerIndex = 1; iPlayerIndex <= gpGlobals->maxClients; iPlayerIndex++)
+    {
+
+        // does this slot in the array have a name?
+        if (!gr->IsConnected(iPlayerIndex))
+            continue;
+
+        if (gr->IsLocalPlayer(iPlayerIndex))
+            continue;
+
+        if (!gr->IsAlive(iPlayerIndex))
+            continue;
+
+        wchar_t playerText[80], playerName[64], *team, teamText[64];
+        char localizeTeamName[64];
+        char szPlayerIndex[16];
+        g_pVGuiLocalize->ConvertANSIToUnicode(UTIL_SafeName(gr->GetPlayerName(iPlayerIndex)), playerName,
+                                              sizeof(playerName));
+        const char *teamname = gr->GetTeamName(gr->GetTeam(iPlayerIndex));
+        if (teamname)
+        {
+            Q_snprintf(localizeTeamName, sizeof(localizeTeamName), "#%s", teamname);
+            team = g_pVGuiLocalize->Find(localizeTeamName);
+
+            if (!team)
+            {
+                g_pVGuiLocalize->ConvertANSIToUnicode(teamname, teamText, sizeof(teamText));
+                team = teamText;
+            }
+
+            g_pVGuiLocalize->ConstructString(playerText, sizeof(playerText),
+                                             g_pVGuiLocalize->Find("#Spec_PlayerItem_Team"), 2, playerName, team);
+        }
+        else
+        {
+            g_pVGuiLocalize->ConstructString(playerText, sizeof(playerText), g_pVGuiLocalize->Find("#Spec_PlayerItem"),
+                                             1, playerName);
+        }
+
+        Q_snprintf(szPlayerIndex, sizeof(szPlayerIndex), "%d", iPlayerIndex);
+
+        KeyValues *kv = new KeyValues("UserData", "player", gr->GetPlayerName(iPlayerIndex), "index", szPlayerIndex);
+        m_pPlayerList->AddItem(playerText, kv);
+        kv->deleteThis();
+    }
+
+    // make sure the player combo box is up to date
+    int playernum = GetSpectatorTarget();
+    const char *selectedPlayerName = gr->GetPlayerName(playernum);
+    for (iPlayerIndex = 0; iPlayerIndex < m_pPlayerList->GetItemCount(); ++iPlayerIndex)
+    {
+        KeyValues *kv = m_pPlayerList->GetItemUserData(iPlayerIndex);
+        if (kv && FStrEq(kv->GetString("player"), selectedPlayerName))
+        {
+            m_pPlayerList->ActivateItemByRow(iPlayerIndex);
+            break;
+        }
+    }
+
+    //=============================================================================
+    // HPE_BEGIN:
+    // [pfreese] make sure the view mode combo box is up to date - the spectator
+    // mode can be changed multiple ways
+    //=============================================================================
+
+    int specmode = GetSpectatorMode();
+    m_pViewOptions->SetText(s_SpectatorModes[specmode]);
+
+    //=============================================================================
+    // HPE_END
+    //=============================================================================
 }
 
 //-----------------------------------------------------------------------------
 // main spectator panel
 
-
-
 //-----------------------------------------------------------------------------
 // Purpose: Constructor
 //-----------------------------------------------------------------------------
 CMOMSpectatorGUI::CMOMSpectatorGUI(IViewPort *pViewPort) : EditablePanel(nullptr, PANEL_SPECGUI)
 {
-// 	m_bHelpShown = false;
-//	m_bInsetVisible = false;
-//	m_iDuckKey = KEY_NONE;
-	SetSize( 10, 10 ); // Quiet "parent not sized yet" spew
-	m_bSpecScoreboard = false;
+    // 	m_bHelpShown = false;
+    //	m_bInsetVisible = false;
+    //	m_iDuckKey = KEY_NONE;
+    SetSize(10, 10); // Quiet "parent not sized yet" spew
+    m_bSpecScoreboard = false;
 
-	m_pViewPort = pViewPort;
+    m_pViewPort = pViewPort;
     g_pMOMSpectatorGUI = this;
 
     ListenForGameEvent("spec_target_updated");
 
+    surface()->CreatePopup(GetVPanel(), false, false, false, false, false);
+
     m_flNextUpdateTime = -1.0f;
 
-	// initialize dialog
-	SetVisible(false);
-	SetProportional(true);
+    // initialize dialog
+    SetVisible(false);
+    SetProportional(true);
 
-	// load the new scheme early!!
-	SetScheme("ClientScheme");
-	SetMouseInputEnabled( false );
-	SetKeyBoardInputEnabled( false );
+    // load the new scheme early!!
+    SetScheme("ClientScheme");
+    SetMouseInputEnabled(false);
+    SetKeyBoardInputEnabled(false);
 
-	m_pTopBar = new Panel( this, "topbar" );
- 	m_pBottomBarBlank = new Panel( this, "bottombarblank" );
+    LoadControlSettings(GetResFile());
 
-	// m_pBannerImage = new ImagePanel( m_pTopBar, NULL );
-	m_pPlayerLabel = new Label( this, "playerlabel", "" );
-	m_pPlayerLabel->SetVisible( false );
+    m_pTopBar = FindControl<Panel>("topbar");
+    m_pBottomBarBlank = FindControl<Panel>("bottombarblank");
 
-    m_pReplayLabel = new Label(this, "replaylabel", "");
-    m_pReplayLabel->SetVisible(false);
+    m_pPlayerLabel = FindControl<Label>("playerlabel");
+    m_pPlayerLabel->SetVisible(false);
 
-    m_pTimeLabel = new Label(this, "timelabel", "");
-    m_pTimeLabel->SetVisible(false);
+    m_pReplayLabel = FindControl<Label>("replaylabel");
+    m_pTimeLabel = FindControl<Label>("timelabel");
 
-	TextImage *image = m_pPlayerLabel->GetTextImage();
-	if ( image )
-	{
-		HFont hFallbackFont = scheme()->GetIScheme( GetScheme() )->GetFont( "DefaultVerySmallFallBack", false );
-		if ( INVALID_FONT != hFallbackFont )
-		{
-			image->SetUseFallbackFont( true, hFallbackFont );
-		}
-	}
+    m_pCloseButton = FindControl<ImagePanel>("Close_Panel");
+    m_pCloseButton->SetMouseInputEnabled(true);
+    m_pCloseButton->InstallMouseHandler(this);
 
-	SetPaintBorderEnabled(false);
-	SetPaintBackgroundEnabled(false);
+    TextImage *image = m_pPlayerLabel->GetTextImage();
+    if (image)
+    {
+        HFont hFallbackFont = scheme()->GetIScheme(GetScheme())->GetFont("DefaultVerySmallFallBack", false);
+        if (INVALID_FONT != hFallbackFont)
+        {
+            image->SetUseFallbackFont(true, hFallbackFont);
+        }
+    }
+
+    SetPaintBorderEnabled(false);
+    SetPaintBackgroundEnabled(false);
 
-	// m_pBannerImage->SetVisible(false);
-	InvalidateLayout();
+    InvalidateLayout();
 }
 
 //-----------------------------------------------------------------------------
 // Purpose: Destructor
 //-----------------------------------------------------------------------------
-CMOMSpectatorGUI::~CMOMSpectatorGUI()
-{
-    g_pMOMSpectatorGUI = nullptr;
-}
+CMOMSpectatorGUI::~CMOMSpectatorGUI() { g_pMOMSpectatorGUI = nullptr; }
 
 //-----------------------------------------------------------------------------
 // Purpose: Sets the colour of the top and bottom bars
 //-----------------------------------------------------------------------------
 void CMOMSpectatorGUI::ApplySchemeSettings(IScheme *pScheme)
 {
-	KeyValues *pConditions = nullptr;
-
-	LoadControlSettings( GetResFile(), nullptr, nullptr, pConditions );
+    m_pBottomBarBlank->SetVisible(false);
+    m_pTopBar->SetVisible(true);
 
-	if ( pConditions )
-	{
-		pConditions->deleteThis();
-	}
+    BaseClass::ApplySchemeSettings(pScheme);
+    SetBgColor(Color(0, 0, 0, 0)); // make the background transparent
+    m_pTopBar->SetBgColor(GetBlackBarColor());
+    m_pBottomBarBlank->SetBgColor(GetBlackBarColor());
+    SetPaintBorderEnabled(false);
 
-	m_pBottomBarBlank->SetVisible( false );
-	m_pTopBar->SetVisible( true );
-
-	BaseClass::ApplySchemeSettings( pScheme );
-	SetBgColor(Color( 0,0,0,0 ) ); // make the background transparent
-	m_pTopBar->SetBgColor(GetBlackBarColor());
-	m_pBottomBarBlank->SetBgColor(GetBlackBarColor());
-	SetPaintBorderEnabled(false);
-
-	SetBorder(nullptr);
+    SetBorder(nullptr);
+}
 
+void CMOMSpectatorGUI::OnMousePressed(MouseCode code)
+{
+    if (code == MOUSE_LEFT)
+    {
+        VPANEL over = input()->GetMouseOver();
+        if (over == m_pCloseButton->GetVPanel())
+        {
+            SetMouseInputEnabled(false);
+            // We're piggybacking on this event because it's basically the same as the X on the mapfinished panel
+            IGameEvent *pClosePanel = gameeventmanager->CreateEvent("mapfinished_panel_closed");
+            if (pClosePanel)
+            {
+                // Fire this event so other classes can get at this
+                gameeventmanager->FireEvent(pClosePanel);
+            }
+        }
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -476,15 +482,15 @@ void CMOMSpectatorGUI::ApplySchemeSettings(IScheme *pScheme)
 //-----------------------------------------------------------------------------
 void CMOMSpectatorGUI::PerformLayout()
 {
-	int w,h,x,y;
-	GetHudSize(w, h);
-	
-	// fill the screen
-	SetBounds(0,0,w,h);
-
-	// stretch the bottom bar across the screen
-	m_pBottomBarBlank->GetPos(x,y);
-	m_pBottomBarBlank->SetSize( w, h - y );
+    int w, h, x, y;
+    GetHudSize(w, h);
+
+    // fill the screen
+    SetBounds(0, 0, w, h);
+
+    // stretch the bottom bar across the screen
+    m_pBottomBarBlank->GetPos(x, y);
+    m_pBottomBarBlank->SetSize(w, h - y);
 }
 
 //-----------------------------------------------------------------------------
@@ -498,7 +504,7 @@ void CMOMSpectatorGUI::OnThink()
         m_flNextUpdateTime = -1.0f;
     }
 
-	BaseClass::OnThink();
+    BaseClass::OnThink();
 }
 
 //-----------------------------------------------------------------------------
@@ -506,10 +512,10 @@ void CMOMSpectatorGUI::OnThink()
 //-----------------------------------------------------------------------------
 void CMOMSpectatorGUI::SetLogoImage(const char *image)
 {
-	if ( m_pBannerImage )
-	{
-		m_pBannerImage->SetImage( scheme()->GetImage(image, false) );
-	}
+    if (m_pBannerImage)
+    {
+        m_pBannerImage->SetImage(scheme()->GetImage(image, false));
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -517,11 +523,11 @@ void CMOMSpectatorGUI::SetLogoImage(const char *image)
 //-----------------------------------------------------------------------------
 void CMOMSpectatorGUI::SetLabelText(const char *textEntryName, const char *text)
 {
-	Label *entry = dynamic_cast<Label *>(FindChildByName(textEntryName));
-	if (entry)
-	{
-		entry->SetText(text);
-	}
+    Label *entry = dynamic_cast<Label *>(FindChildByName(textEntryName));
+    if (entry)
+    {
+        entry->SetText(text);
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -529,11 +535,11 @@ void CMOMSpectatorGUI::SetLabelText(const char *textEntryName, const char *text)
 //-----------------------------------------------------------------------------
 void CMOMSpectatorGUI::SetLabelText(const char *textEntryName, wchar_t *text)
 {
-	Label *entry = dynamic_cast<Label *>(FindChildByName(textEntryName));
-	if (entry)
-	{
-		entry->SetText(text);
-	}
+    Label *entry = dynamic_cast<Label *>(FindChildByName(textEntryName));
+    if (entry)
+    {
+        entry->SetText(text);
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -541,11 +547,11 @@ void CMOMSpectatorGUI::SetLabelText(const char *textEntryName, wchar_t *text)
 //-----------------------------------------------------------------------------
 void CMOMSpectatorGUI::MoveLabelToFront(const char *textEntryName)
 {
-	Label *entry = dynamic_cast<Label *>(FindChildByName(textEntryName));
-	if (entry)
-	{
-		entry->MoveToFront();
-	}
+    Label *entry = dynamic_cast<Label *>(FindChildByName(textEntryName));
+    if (entry)
+    {
+        entry->MoveToFront();
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -553,89 +559,91 @@ void CMOMSpectatorGUI::MoveLabelToFront(const char *textEntryName)
 //-----------------------------------------------------------------------------
 void CMOMSpectatorGUI::ShowPanel(bool bShow)
 {
-	if ( bShow && !IsVisible() )
-	{
-		m_bSpecScoreboard = false;
-	}
-	SetVisible( bShow );
-	if ( !bShow && m_bSpecScoreboard )
-	{
-		gViewPortInterface->ShowPanel( PANEL_SCOREBOARD, false );
-	}
+    if (bShow && !IsVisible())
+    {
+        m_bSpecScoreboard = false;
+    }
+    SetVisible(bShow);
+    if (!bShow && m_bSpecScoreboard)
+    {
+        gViewPortInterface->ShowPanel(PANEL_SCOREBOARD, false);
+    }
 }
 
 bool CMOMSpectatorGUI::ShouldShowPlayerLabel(int specmode)
 {
-	return ( (specmode == OBS_MODE_IN_EYE) ||	(specmode == OBS_MODE_CHASE) );
+    return ((specmode == OBS_MODE_IN_EYE) || (specmode == OBS_MODE_CHASE));
 }
 //-----------------------------------------------------------------------------
 // Purpose: Updates the gui, rearranges elements
 //-----------------------------------------------------------------------------
 void CMOMSpectatorGUI::Update()
 {
-	int wide, tall;
-	int bx, by, bwide, btall;
-
-	GetHudSize(wide, tall);
-	m_pTopBar->GetBounds( bx, by, bwide, btall );
-
-	IGameResources *gr = GameResources();
-	int specmode = GetSpectatorMode();
-	int playernum = GetSpectatorTarget();
-
-	IViewPortPanel *overview = gViewPortInterface->FindPanelByName( PANEL_OVERVIEW );
-
-	if ( overview && overview->IsVisible() )
-	{
-		int mx, my, mwide, mtall;
-
-		VPANEL p = overview->GetVPanel();
-		vgui::ipanel()->GetPos( p, mx, my );
-		vgui::ipanel()->GetSize( p, mwide, mtall );
-				
-		if ( my < btall )
-		{
-			// reduce to bar 
-			m_pTopBar->SetSize( wide - (mx + mwide), btall );
-			m_pTopBar->SetPos( (mx + mwide), 0 );
-		}
-		else
-		{
-			// full top bar
-			m_pTopBar->SetSize( wide , btall );
-			m_pTopBar->SetPos( 0, 0 );
-		}
-	}
-	else
-	{
-		// full top bar
-		m_pTopBar->SetSize( wide , btall ); // change width, keep height
-		m_pTopBar->SetPos( 0, 0 );
-	}
-
-	m_pPlayerLabel->SetVisible( ShouldShowPlayerLabel(specmode) );
-
-	// update player name filed, text & color
-
-	if ( playernum > 0 && playernum <= gpGlobals->maxClients && gr )
-	{
-		Color c = gr->GetTeamColor( gr->GetTeam(playernum) ); // Player's team color
-
-		m_pPlayerLabel->SetFgColor( c );
-		
-		wchar_t playerText[ 80 ], playerName[ 64 ];
-		V_wcsncpy( playerText, L"Unable to find #Spec_PlayerItem*", sizeof( playerText ) );
-		memset( playerName, 0x0, sizeof( playerName ) );
-
-		g_pVGuiLocalize->ConvertANSIToUnicode( UTIL_SafeName(gr->GetPlayerName( playernum )), playerName, sizeof( playerName ) );
-		g_pVGuiLocalize->ConstructString( playerText, sizeof( playerText ), g_pVGuiLocalize->Find( "#Spec_PlayerItem" ), 1, playerName );
-	
-		m_pPlayerLabel->SetText( playerText );
-	}
-	else
-	{
+    int wide, tall;
+    int bx, by, bwide, btall;
+
+    GetHudSize(wide, tall);
+    m_pTopBar->GetBounds(bx, by, bwide, btall);
+
+    IGameResources *gr = GameResources();
+    int specmode = GetSpectatorMode();
+    int playernum = GetSpectatorTarget();
+
+    IViewPortPanel *overview = gViewPortInterface->FindPanelByName(PANEL_OVERVIEW);
+
+    if (overview && overview->IsVisible())
+    {
+        int mx, my, mwide, mtall;
+
+        VPANEL p = overview->GetVPanel();
+        vgui::ipanel()->GetPos(p, mx, my);
+        vgui::ipanel()->GetSize(p, mwide, mtall);
+
+        if (my < btall)
+        {
+            // reduce to bar
+            m_pTopBar->SetSize(wide - (mx + mwide), btall);
+            m_pTopBar->SetPos((mx + mwide), 0);
+        }
+        else
+        {
+            // full top bar
+            m_pTopBar->SetSize(wide, btall);
+            m_pTopBar->SetPos(0, 0);
+        }
+    }
+    else
+    {
+        // full top bar
+        m_pTopBar->SetSize(wide, btall); // change width, keep height
+        m_pTopBar->SetPos(0, 0);
+    }
+
+    m_pPlayerLabel->SetVisible(ShouldShowPlayerLabel(specmode));
+
+    // update player name filed, text & color
+
+    if (playernum > 0 && playernum <= gpGlobals->maxClients && gr)
+    {
+        Color c = gr->GetTeamColor(gr->GetTeam(playernum)); // Player's team color
+
+        m_pPlayerLabel->SetFgColor(c);
+
+        wchar_t playerText[80], playerName[64];
+        V_wcsncpy(playerText, L"Unable to find #Spec_PlayerItem*", sizeof(playerText));
+        memset(playerName, 0x0, sizeof(playerName));
+
+        g_pVGuiLocalize->ConvertANSIToUnicode(UTIL_SafeName(gr->GetPlayerName(playernum)), playerName,
+                                              sizeof(playerName));
+        g_pVGuiLocalize->ConstructString(playerText, sizeof(playerText), g_pVGuiLocalize->Find("#Spec_PlayerItem"), 1,
+                                         playerName);
+
+        m_pPlayerLabel->SetText(playerText);
+    }
+    else
+    {
         m_pPlayerLabel->SetText("");
-	}
+    }
     CMomentumPlayer *pPlayer = ToCMOMPlayer(CBasePlayer::GetLocalPlayer());
     if (pPlayer)
     {
@@ -652,7 +660,8 @@ void CMOMSpectatorGUI::Update()
             wchar_t szTimeLabel[BUFSIZELOCL], wTime[BUFSIZETIME];
             mom_UTIL->FormatTime(pReplayEnt->m_RunData.m_flRunTime, tempRunTime);
             g_pVGuiLocalize->ConvertANSIToUnicode(tempRunTime, wTime, sizeof(wTime));
-            g_pVGuiLocalize->ConstructString(szTimeLabel, sizeof(szTimeLabel), g_pVGuiLocalize->Find("#MOM_MF_RunTime"), 1, wTime);
+            g_pVGuiLocalize->ConstructString(szTimeLabel, sizeof(szTimeLabel), g_pVGuiLocalize->Find("#MOM_MF_RunTime"),
+                                             1, wTime);
 
             SetLabelText("timelabel", szTimeLabel);
 
@@ -665,33 +674,34 @@ void CMOMSpectatorGUI::Update()
     }
 
     // update extra info field
-	wchar_t szEtxraInfo[1024];
-	wchar_t szTitleLabel[1024];
-	char tempstr[128];
-
-	if ( engine->IsHLTV() )
-	{
-		// set spectator number and HLTV title
-		Q_snprintf(tempstr,sizeof(tempstr),"Spectators : %d", HLTVCamera()->GetNumSpectators() );
-		g_pVGuiLocalize->ConvertANSIToUnicode(tempstr,szEtxraInfo,sizeof(szEtxraInfo));
-		
-		Q_strncpy( tempstr, HLTVCamera()->GetTitleText(), sizeof(tempstr) );
-		g_pVGuiLocalize->ConvertANSIToUnicode(tempstr,szTitleLabel,sizeof(szTitleLabel));
-	}
-	else
-	{
-		// otherwise show map name
-		Q_FileBase( engine->GetLevelName(), tempstr, sizeof(tempstr) );
-
-		wchar_t wMapName[64];
-		g_pVGuiLocalize->ConvertANSIToUnicode(tempstr,wMapName,sizeof(wMapName));
-		g_pVGuiLocalize->ConstructString( szEtxraInfo,sizeof( szEtxraInfo ), g_pVGuiLocalize->Find("#Spec_Map" ),1, wMapName );
-
-		g_pVGuiLocalize->ConvertANSIToUnicode( "" ,szTitleLabel,sizeof(szTitleLabel));
-	}
-
-	SetLabelText("extrainfo", szEtxraInfo );
-	SetLabelText("titlelabel", szTitleLabel );
+    wchar_t szEtxraInfo[1024];
+    wchar_t szTitleLabel[1024];
+    char tempstr[128];
+
+    if (engine->IsHLTV())
+    {
+        // set spectator number and HLTV title
+        Q_snprintf(tempstr, sizeof(tempstr), "Spectators : %d", HLTVCamera()->GetNumSpectators());
+        g_pVGuiLocalize->ConvertANSIToUnicode(tempstr, szEtxraInfo, sizeof(szEtxraInfo));
+
+        Q_strncpy(tempstr, HLTVCamera()->GetTitleText(), sizeof(tempstr));
+        g_pVGuiLocalize->ConvertANSIToUnicode(tempstr, szTitleLabel, sizeof(szTitleLabel));
+    }
+    else
+    {
+        // otherwise show map name
+        Q_FileBase(engine->GetLevelName(), tempstr, sizeof(tempstr));
+
+        wchar_t wMapName[64];
+        g_pVGuiLocalize->ConvertANSIToUnicode(tempstr, wMapName, sizeof(wMapName));
+        g_pVGuiLocalize->ConstructString(szEtxraInfo, sizeof(szEtxraInfo), g_pVGuiLocalize->Find("#Spec_Map"), 1,
+                                         wMapName);
+
+        g_pVGuiLocalize->ConvertANSIToUnicode("", szTitleLabel, sizeof(szTitleLabel));
+    }
+
+    SetLabelText("extrainfo", szEtxraInfo);
+    SetLabelText("titlelabel", szTitleLabel);
 }
 
 //-----------------------------------------------------------------------------
@@ -699,34 +709,30 @@ void CMOMSpectatorGUI::Update()
 //-----------------------------------------------------------------------------
 void CMOMSpectatorGUI::UpdateTimer()
 {
-	wchar_t szText[ 63 ];
+    wchar_t szText[63];
 
-	int timer = 0;
+    int timer = 0;
 
-	V_swprintf_safe ( szText, L"%d:%02d\n", (timer / 60), (timer % 60) );
+    V_swprintf_safe(szText, L"%d:%02d\n", (timer / 60), (timer % 60));
 
-	SetLabelText("timerlabel", szText );
+    SetLabelText("timerlabel", szText);
 }
 
-static void ForwardSpecCmdToServer( const CCommand &args )
+static void ForwardSpecCmdToServer(const CCommand &args)
 {
-	if ( engine->IsPlayingDemo() )
-		return;
-
-	if ( args.ArgC() == 1 )
-	{
-		// just forward the command without parameters
-		engine->ServerCmd( args[ 0 ] );
-	}
-	else if ( args.ArgC() == 2 )
-	{
-		// forward the command with parameter
-		char command[128];
-		Q_snprintf( command, sizeof(command), "%s \"%s\"", args[ 0 ], args[ 1 ] );
-		engine->ServerCmd( command );
-	}
-}
-
-
-
+    if (engine->IsPlayingDemo())
+        return;
 
+    if (args.ArgC() == 1)
+    {
+        // just forward the command without parameters
+        engine->ServerCmd(args[0]);
+    }
+    else if (args.ArgC() == 2)
+    {
+        // forward the command with parameter
+        char command[128];
+        Q_snprintf(command, sizeof(command), "%s \"%s\"", args[0], args[1]);
+        engine->ServerCmd(command);
+    }
+}
diff --git a/mp/src/game/client/momentum/ui/momSpectatorGUI.h b/mp/src/game/client/momentum/ui/momSpectatorGUI.h
index 41b94157a1..01443274db 100644
--- a/mp/src/game/client/momentum/ui/momSpectatorGUI.h
+++ b/mp/src/game/client/momentum/ui/momSpectatorGUI.h
@@ -1,6 +1,6 @@
 //========= Copyright Valve Corporation, All rights reserved. ============//
 //
-// Purpose: 
+// Purpose:
 //
 // $NoKeywords: $
 //=============================================================================//
@@ -11,14 +11,14 @@
 #pragma once
 #endif
 
+#include "GameEventListener.h"
+#include <igameevents.h>
 #include <vgui/IScheme.h>
 #include <vgui/KeyCode.h>
-#include <vgui_controls/Frame.h>
-#include <vgui_controls/EditablePanel.h>
 #include <vgui_controls/Button.h>
 #include <vgui_controls/ComboBox.h>
-#include <igameevents.h>
-#include "GameEventListener.h"
+#include <vgui_controls/EditablePanel.h>
+#include <vgui_controls/Frame.h>
 
 #include <game/client/iviewport.h>
 
@@ -26,14 +26,14 @@ class KeyValues;
 
 namespace vgui
 {
-	class TextEntry;
-	class Button;
-	class Panel;
-	class ImagePanel;
-	class ComboBox;
+class TextEntry;
+class Button;
+class Panel;
+class ImagePanel;
+class ComboBox;
 }
 
-#define BLACK_BAR_COLOR	Color(0, 0, 0, 196)
+#define BLACK_BAR_COLOR Color(0, 0, 0, 196)
 
 class IBaseFileSystem;
 
@@ -44,33 +44,34 @@ class CMOMSpectatorGUI : public vgui::EditablePanel, public IViewPortPanel, publ
 {
     DECLARE_CLASS_SIMPLE(CMOMSpectatorGUI, vgui::EditablePanel);
 
-public:
+  public:
     CMOMSpectatorGUI(IViewPort *pViewPort);
     virtual ~CMOMSpectatorGUI();
 
-    const char *GetName( void ) override { return PANEL_SPECGUI; }
-    void SetData(KeyValues *data) override {};
-    void Reset() override {};
+    const char *GetName(void) override { return PANEL_SPECGUI; }
+    void SetData(KeyValues *data) override{};
+    void Reset() override{};
     void Update() override;
     bool NeedsUpdate(void) override { return false; }
     bool HasInputElements(void) override { return false; }
     void ShowPanel(bool bShow) override;
-	
-	// both vgui::Frame and IViewPortPanel define these, so explicitly define them here as passthroughs to vgui
-	vgui::VPANEL GetVPanel( void ) { return BaseClass::GetVPanel(); }
-	bool IsVisible() override { return BaseClass::IsVisible(); }
+
+    // both vgui::Frame and IViewPortPanel define these, so explicitly define them here as passthroughs to vgui
+    vgui::VPANEL GetVPanel(void) { return BaseClass::GetVPanel(); }
+    bool IsVisible() override { return BaseClass::IsVisible(); }
     void SetParent(vgui::VPANEL parent) override { BaseClass::SetParent(parent); }
-	void OnThink() override;
+    void OnThink() override;
 
-	int GetTopBarHeight() { return m_pTopBar->GetTall(); }
-	int GetBottomBarHeight() { return m_pBottomBarBlank->GetTall(); }
-	
-	bool ShouldShowPlayerLabel( int specmode );
+    int GetTopBarHeight() { return m_pTopBar->GetTall(); }
+    int GetBottomBarHeight() { return m_pBottomBarBlank->GetTall(); }
 
-	Color GetBlackBarColor( void ) { return BLACK_BAR_COLOR; }
+    bool ShouldShowPlayerLabel(int specmode);
+
+    Color GetBlackBarColor(void) { return BLACK_BAR_COLOR; }
+
+    const char *GetResFile(void) const
+    { return "resource/UI/Spectator.res"; }
 
-	const char *GetResFile( void ) { return "Resource/UI/Spectator.res"; }
-	
     void FireGameEvent(IGameEvent *pEvent) override
     {
         if (!Q_strcmp(pEvent->GetName(), "spec_target_updated"))
@@ -81,42 +82,46 @@ class CMOMSpectatorGUI : public vgui::EditablePanel, public IViewPortPanel, publ
             // to fill the panel with the replay's info.
             m_flNextUpdateTime = gpGlobals->curtime + gpGlobals->interval_per_tick * 3.0f;
         }
-	}
+    }
 
-protected:
+  protected:
+    void SetLabelText(const char *textEntryName, const char *text);
+    void SetLabelText(const char *textEntryName, wchar_t *text);
+    void MoveLabelToFront(const char *textEntryName);
+    void UpdateTimer();
+    void SetLogoImage(const char *image);
 
-	void SetLabelText(const char *textEntryName, const char *text);
-	void SetLabelText(const char *textEntryName, wchar_t *text);
-	void MoveLabelToFront(const char *textEntryName);
-	void UpdateTimer();
-	void SetLogoImage(const char *image);
-
-protected:	
-	enum { INSET_OFFSET = 2 } ; 
+  protected:
+    enum
+    {
+        INSET_OFFSET = 2
+    };
 
-	// vgui overrides
-	virtual void PerformLayout();
-	virtual void ApplySchemeSettings(vgui::IScheme *pScheme);
-//	virtual void OnCommand( const char *command );
+    // vgui overrides
+    void PerformLayout() override;
+    void ApplySchemeSettings(vgui::IScheme *pScheme) override;
+    void OnMousePressed(vgui::MouseCode code) override;
+    //	virtual void OnCommand( const char *command );
 
-	vgui::Panel *m_pTopBar;
-	vgui::Panel *m_pBottomBarBlank;
+    vgui::Panel *m_pTopBar;
+    vgui::Panel *m_pBottomBarBlank;
 
-	vgui::ImagePanel *m_pBannerImage;
-	vgui::Label *m_pPlayerLabel;
+    vgui::ImagePanel *m_pBannerImage;
+    vgui::Label *m_pPlayerLabel;
     vgui::Label *m_pReplayLabel;
     vgui::Label *m_pTimeLabel;
 
-	IViewPort *m_pViewPort;
+    vgui::ImagePanel *m_pCloseButton;
 
-	// bool m_bHelpShown;
-	// bool m_bInsetVisible;
-	bool m_bSpecScoreboard;
+    IViewPort *m_pViewPort;
+
+    // bool m_bHelpShown;
+    // bool m_bInsetVisible;
+    bool m_bSpecScoreboard;
 
     float m_flNextUpdateTime;
 };
 
-
 //-----------------------------------------------------------------------------
 // Purpose: the bottom bar panel, this is a separate panel because it
 // wants mouse input and the main window doesn't
@@ -125,46 +130,46 @@ class CMOMSpectatorMenu : public vgui::Frame, public IViewPortPanel, public CGam
 {
     DECLARE_CLASS_SIMPLE(CMOMSpectatorMenu, vgui::Frame);
 
-public:
+  public:
     CMOMSpectatorMenu(IViewPort *pViewPort);
     ~CMOMSpectatorMenu() {}
 
     const char *GetName(void) override { return PANEL_SPECMENU; }
-    void SetData(KeyValues *data) override {};
-    void Reset(void) override{ m_pPlayerList->DeleteAllItems(); }
+    void SetData(KeyValues *data) override{};
+    void Reset(void) override { m_pPlayerList->DeleteAllItems(); }
     void Update(void) override;
     bool NeedsUpdate(void) override { return false; }
     bool HasInputElements(void) override { return true; }
     void ShowPanel(bool bShow) override;
     void FireGameEvent(IGameEvent *event) override;
 
-	// both vgui::Frame and IViewPortPanel define these, so explicitly define them here as passthroughs to vgui
-	 bool IsVisible() override { return BaseClass::IsVisible(); }
-	vgui::VPANEL GetVPanel( void ) { return BaseClass::GetVPanel(); }
+    // both vgui::Frame and IViewPortPanel define these, so explicitly define them here as passthroughs to vgui
+    bool IsVisible() override { return BaseClass::IsVisible(); }
+    vgui::VPANEL GetVPanel(void) { return BaseClass::GetVPanel(); }
     void SetParent(vgui::VPANEL parent) override { BaseClass::SetParent(parent); }
 
-private:
-	// VGUI2 overrides
-	MESSAGE_FUNC_PARAMS( OnTextChanged, "TextChanged", data );
-	void OnCommand( const char *command ) override ;
+  private:
+    // VGUI2 overrides
+    MESSAGE_FUNC_PARAMS(OnTextChanged, "TextChanged", data);
+    void OnCommand(const char *command) override;
     void OnKeyCodePressed(vgui::KeyCode code) override;
     void ApplySchemeSettings(vgui::IScheme *pScheme) override;
     void PerformLayout() override;
 
-	void SetViewModeText( const char *text ) { m_pViewOptions->SetText( text ); }
-	void SetPlayerFgColor( Color c1 ) { m_pPlayerList->SetFgColor(c1); }
+    void SetViewModeText(const char *text) { m_pViewOptions->SetText(text); }
+    void SetPlayerFgColor(Color c1) { m_pPlayerList->SetFgColor(c1); }
 
-	vgui::ComboBox *m_pPlayerList;
-	vgui::ComboBox *m_pViewOptions;
-	vgui::ComboBox *m_pConfigSettings;
+    vgui::ComboBox *m_pPlayerList;
+    vgui::ComboBox *m_pViewOptions;
+    vgui::ComboBox *m_pConfigSettings;
 
-	vgui::Button *m_pLeftButton;
-	vgui::Button *m_pRightButton;
+    vgui::Button *m_pLeftButton;
+    vgui::Button *m_pRightButton;
 
-	IViewPort *m_pViewPort;
-	ButtonCode_t m_iDuckKey;
+    IViewPort *m_pViewPort;
+    ButtonCode_t m_iDuckKey;
 };
 
-extern CMOMSpectatorGUI * g_pMOMSpectatorGUI;
+extern CMOMSpectatorGUI *g_pMOMSpectatorGUI;
 
 #endif // MOMSSPECTATORGUI_H
diff --git a/mp/src/game/server/gameinterface.cpp b/mp/src/game/server/gameinterface.cpp
index f61f006273..364a84a632 100644
--- a/mp/src/game/server/gameinterface.cpp
+++ b/mp/src/game/server/gameinterface.cpp
@@ -747,9 +747,6 @@ bool CServerGameDLL::DLLInit( CreateInterfaceFn appSystemFactory,
 	gamestatsuploader->InitConnection();
 #endif
 
-    //Momentum
-    Momentum::OnServerDLLInit();
-
 	return true;
 }
 
diff --git a/mp/src/game/server/momentum/mom_player.cpp b/mp/src/game/server/momentum/mom_player.cpp
index 7f48117d7a..c310cdf869 100644
--- a/mp/src/game/server/momentum/mom_player.cpp
+++ b/mp/src/game/server/momentum/mom_player.cpp
@@ -34,7 +34,7 @@ PRECACHE_REGISTER(player);
 CMomentumPlayer::CMomentumPlayer() : 
       m_duckUntilOnGround(false), m_flStamina(0), m_flTicksOnGround(0), m_flLastVelocity(0), m_flLastSyncVelocity(0),
       m_nPerfectSyncTicks(0), m_nStrafeTicks(0), m_nAccelTicks(0), m_bPrevTimerRunning(false), m_nPrevButtons(0),
-      m_nTicksInAir(0)
+      m_nTicksInAir(0), m_flTweenVelValue(1.0f)
 {
     m_flPunishTime = -1;
     m_iLastBlock = -1;
@@ -69,6 +69,12 @@ void CMomentumPlayer::FireGameEvent(IGameEvent* pEvent)
         //Hide the mapfinished panel and reset our speed to normal
         m_RunData.m_bMapFinished = false;
         SetLaggedMovementValue(1.0f);
+
+        //Fix for the replay system not being able to listen to events
+        if (g_ReplaySystem->GetReplayManager()->GetPlaybackReplay())
+        {
+            g_ReplaySystem->GetReplayManager()->UnloadPlayback();
+        }
     }
 }
 
@@ -229,6 +235,68 @@ bool CMomentumPlayer::SelectSpawnSpot(const char *pEntClassName, CBaseEntity *&p
     return false;
 }
 
+bool CMomentumPlayer::ClientCommand(const CCommand& args)
+{
+    auto cmd = args[0];
+
+    //We're overriding this to prevent the spec_mode to change to ROAMING,
+    // remove this if we want to allow the player to fly around their ghost as it goes
+    // (and change the ghost entity code to match as well)
+    if (!stricmp(cmd, "spec_mode")) // new observer mode
+    {
+        int mode;
+
+        if (GetObserverMode() == OBS_MODE_FREEZECAM)
+        {
+            AttemptToExitFreezeCam();
+            return true;
+        }
+
+        // check for parameters.
+        if (args.ArgC() >= 2)
+        {
+            mode = atoi(args[1]);
+
+            if (mode < OBS_MODE_IN_EYE || mode > OBS_MODE_CHASE)
+                mode = OBS_MODE_IN_EYE;
+        }
+        else
+        {
+            // switch to next spec mode if no parameter given
+            mode = GetObserverMode() + 1;
+
+            if (mode > OBS_MODE_CHASE)
+            {
+                mode = OBS_MODE_IN_EYE;
+            }
+            else if (mode < OBS_MODE_IN_EYE)
+            {
+                mode = OBS_MODE_CHASE;
+            }
+        }
+
+        // don't allow input while player or death cam animation
+        if (GetObserverMode() > OBS_MODE_DEATHCAM)
+        {
+            // set new spectator mode, don't allow OBS_MODE_NONE
+            if (!SetObserverMode(mode))
+                ClientPrint(this, HUD_PRINTCONSOLE, "#Spectator_Mode_Unkown");
+            else
+                engine->ClientCommand(edict(), "cl_spec_mode %d", mode);
+        }
+        else
+        {
+            // remember spectator mode for later use
+            m_iObserverLastMode = mode;
+            engine->ClientCommand(edict(), "cl_spec_mode %d", mode);
+        }
+
+        return true;
+    }
+
+    return BaseClass::ClientCommand(args);
+}
+
 void CMomentumPlayer::Touch(CBaseEntity *pOther)
 {
     BaseClass::Touch(pOther);
@@ -262,7 +330,7 @@ void CMomentumPlayer::CheckForBhop()
             m_iSuccessiveBhops++;
             if (g_Timer->IsRunning())
             {
-                int currentZone = m_RunData.m_iCurrentZone;//g_Timer->GetCurrentZoneNumber();
+                int currentZone = m_RunData.m_iCurrentZone;
                 m_RunStats.SetZoneJumps(0, m_RunStats.GetZoneJumps(0) + 1);
                 m_RunStats.SetZoneJumps(currentZone, m_RunStats.GetZoneJumps(currentZone) + 1);
             }
@@ -524,18 +592,16 @@ CBaseEntity *CMomentumPlayer::FindNextObserverTarget(bool bReverse)
 
 void CMomentumPlayer::TweenSlowdownPlayer()
 {
-    if (m_RunData.m_bMapFinished) //slowdown when map is finished
-    {
+    //slowdown when map is finished
+    if (m_RunData.m_bMapFinished)
         //decrease our lagged movement value by 10% every tick
-        if (!mom_UTIL->FloatEquals(m_flTweenVelValue, 0.0f))
-            m_flTweenVelValue += (0.01f - m_flTweenVelValue) * 0.1f;
-    }
+        m_flTweenVelValue *= 0.9f;
     else
         m_flTweenVelValue = 1.0f;//Reset the tweened value back to normal
 
     SetLaggedMovementValue(m_flTweenVelValue);
 
-    SetNextThink(gpGlobals->curtime + 0.01f, "TWEEN");
+    SetNextThink(gpGlobals->curtime + gpGlobals->interval_per_tick, "TWEEN");
 }
 
 CMomentumReplayGhostEntity* CMomentumPlayer::GetReplayEnt() const
diff --git a/mp/src/game/server/momentum/mom_player.h b/mp/src/game/server/momentum/mom_player.h
index cc6d292523..4b678d994d 100644
--- a/mp/src/game/server/momentum/mom_player.h
+++ b/mp/src/game/server/momentum/mom_player.h
@@ -135,6 +135,9 @@ class CMomentumPlayer : public CBasePlayer, public CGameEventListener
     int m_nZoneAvgCount[MAX_STAGES];
     float m_flZoneTotalSync[MAX_STAGES], m_flZoneTotalSync2[MAX_STAGES], m_flZoneTotalVelocity[MAX_STAGES][2];
 
+    //Overrode for the spectating GUI
+    bool ClientCommand(const CCommand &args) override;
+
   private:
     CountdownTimer m_ladderSurpressionTimer;
     Vector m_lastLadderNormal;
@@ -163,6 +166,6 @@ class CMomentumPlayer : public CBasePlayer, public CGameEventListener
     // Start zone thinkfunc
     int m_nTicksInAir;
 
-    float m_flTweenVelValue = 1.0f;
+    float m_flTweenVelValue;
 };
 #endif // MOMPLAYER_H
\ No newline at end of file
diff --git a/mp/src/game/server/momentum/mom_replay_entity.cpp b/mp/src/game/server/momentum/mom_replay_entity.cpp
index 70a52d9a93..2acd925108 100644
--- a/mp/src/game/server/momentum/mom_replay_entity.cpp
+++ b/mp/src/game/server/momentum/mom_replay_entity.cpp
@@ -57,7 +57,6 @@ CMomentumReplayGhostEntity::CMomentumReplayGhostEntity() :
 
 CMomentumReplayGhostEntity::~CMomentumReplayGhostEntity() 
 { 
-    g_ReplaySystem->GetReplayManager()->StopPlayback();
 }
 
 void CMomentumReplayGhostEntity::Precache(void)
@@ -143,19 +142,24 @@ void CMomentumReplayGhostEntity::UpdateStep()
     {
         --m_iCurrentStep;
 
-        if (m_iCurrentStep < 0)
+        if (m_bReplayShouldLoop && m_iCurrentStep < 0)
+        {
             m_iCurrentStep = m_pPlaybackReplay->GetFrameCount() - 1;
+        }
 
         return;
     }
     
     ++m_iCurrentStep;
 
-    if (m_iCurrentStep >= m_pPlaybackReplay->GetFrameCount())
+    if (m_iCurrentStep >= m_pPlaybackReplay->GetFrameCount() && m_bReplayShouldLoop)
         m_iCurrentStep = 0;
 }
 void CMomentumReplayGhostEntity::Think(void)
 {
+    if (!m_bIsActive)
+        return;
+
     if (!m_pPlaybackReplay)
     {
         BaseClass::Think();
@@ -181,12 +185,16 @@ void CMomentumReplayGhostEntity::Think(void)
         SetRenderColorA(mom_replay_ghost_alpha.GetInt());
     }
 
+    bool reverse = mom_replay_reverse.GetBool();
+
     //move the ghost
-    if (((mom_replay_reverse.GetBool() && m_iCurrentStep - 1 < 0) ||
-        (!mom_replay_reverse.GetBool() && m_iCurrentStep + 1 >= m_pPlaybackReplay->GetFrameCount())))
+    if (!m_bReplayShouldLoop &&
+        (reverse && (m_iCurrentStep - 1 < 0) ||
+        !reverse && (m_iCurrentStep + 1 >= m_pPlaybackReplay->GetFrameCount())))
     {
         // If we're not looping and we've reached the end of the video then stop and wait for the player
         // to make a choice about if it should repeat, or end.
+        SetAbsVelocity(vec3_origin);
     }
     else
     {
@@ -249,7 +257,12 @@ void CMomentumReplayGhostEntity::HandleGhostFirstPerson()
             float distY = fabs(currentStep->PlayerOrigin().y - nextStep->PlayerOrigin().y);
             float distZ = fabs(currentStep->PlayerOrigin().z - nextStep->PlayerOrigin().z);
             Vector interpolatedVel = Vector(distX, distY, distZ) / gpGlobals->interval_per_tick;
-            SetAbsVelocity(interpolatedVel);
+            float maxvel = sv_maxvelocity.GetFloat();
+
+            //Fixes an issue with teleporting
+            if (interpolatedVel.x <= maxvel && interpolatedVel.y <= maxvel && interpolatedVel.z <= maxvel)
+                SetAbsVelocity(interpolatedVel);
+
             m_nReplayButtons = currentStep->PlayerButtons(); // networked var that allows the replay to control keypress display on the client
 
             if (m_RunData.m_bTimerRunning)
@@ -393,7 +406,6 @@ void CMomentumReplayGhostEntity::StopTimer()
 void CMomentumReplayGhostEntity::EndRun()
 { 
     StopTimer();// Stop the timer for all spectating us
-    SetNextThink(-1);// Stop thinking
     m_bIsActive = false;
 
     // Make everybody stop spectating me. Goes backwards since players remove themselves.
diff --git a/mp/src/game/server/momentum/mom_replay_manager.cpp b/mp/src/game/server/momentum/mom_replay_manager.cpp
index 5310b3e985..17d1fa9988 100644
--- a/mp/src/game/server/momentum/mom_replay_manager.cpp
+++ b/mp/src/game/server/momentum/mom_replay_manager.cpp
@@ -160,17 +160,19 @@ void CMomReplayManager::StopPlayback()
     UnloadPlayback();
 }
 
-void CMomReplayManager::UnloadPlayback()
+void CMomReplayManager::UnloadPlayback(bool shutdown)
 {
     SetPlayingBack(false);
 
     if (m_pPlaybackReplay)
     {
-        if (m_pPlaybackReplay->GetRunEntity())
+        if (m_pPlaybackReplay->GetRunEntity() && !shutdown)
             m_pPlaybackReplay->GetRunEntity()->EndRun();
 
         delete m_pPlaybackReplay;
     }
 
     m_pPlaybackReplay = nullptr;
+
+    DevLog("Successfully unloaded playback, shutdown: %i\n", shutdown);
 }
\ No newline at end of file
diff --git a/mp/src/game/server/momentum/mom_replay_manager.h b/mp/src/game/server/momentum/mom_replay_manager.h
index fbe256f45e..b6bc125dbc 100644
--- a/mp/src/game/server/momentum/mom_replay_manager.h
+++ b/mp/src/game/server/momentum/mom_replay_manager.h
@@ -35,7 +35,7 @@ class CMomReplayManager
     bool StoreReplay(const char* path, const char* pathID = "MOD");
     CMomReplayBase* LoadReplay(const char* path, const char* pathID = "MOD");
     void StopPlayback();
-    void UnloadPlayback();
+    void UnloadPlayback(bool shutdown = false);
     void SetPlayingBack(bool playing) { m_bPlayingBack = playing; }
 
 public:
diff --git a/mp/src/game/server/momentum/mom_replay_system.cpp b/mp/src/game/server/momentum/mom_replay_system.cpp
index a72ab8e3ee..049f9cddea 100644
--- a/mp/src/game/server/momentum/mom_replay_system.cpp
+++ b/mp/src/game/server/momentum/mom_replay_system.cpp
@@ -92,17 +92,6 @@ void CMomentumReplaySystem::TrimReplay()
     }
 }
 
-
-void CMomentumReplaySystem::FireGameEvent(IGameEvent* pEvent)
-{
-    if (!Q_strcmp(pEvent->GetName(), "mapfinished_panel_closed"))
-    {
-        //If we loaded a replay, and it's not already playing, we want to unload it here
-        if (m_pReplayManager->GetPlaybackReplay() && !m_pReplayManager->PlayingBack())
-            m_pReplayManager->UnloadPlayback();
-    }
-}
-
 void CMomentumReplaySystem::UpdateRecordingParams()
 {
     ++m_iTickCount; // increment recording tick
diff --git a/mp/src/game/server/momentum/mom_replay_system.h b/mp/src/game/server/momentum/mom_replay_system.h
index 98a6c2f51b..145e6eec45 100644
--- a/mp/src/game/server/momentum/mom_replay_system.h
+++ b/mp/src/game/server/momentum/mom_replay_system.h
@@ -14,7 +14,7 @@
 
 class CMomentumReplayGhostEntity;
 
-class CMomentumReplaySystem : public CAutoGameSystemPerFrame, public CGameEventListener
+class CMomentumReplaySystem : public CAutoGameSystemPerFrame
 {
 public:
     CMomentumReplaySystem(const char *pName) :
@@ -27,7 +27,6 @@ class CMomentumReplaySystem : public CAutoGameSystemPerFrame, public CGameEventL
         m_player(nullptr)
     {
         m_pReplayManager = new CMomReplayManager();
-        ListenForGameEvent("mapfinished_panel_closed");
     }
 
     virtual ~CMomentumReplaySystem() override
@@ -48,6 +47,9 @@ class CMomentumReplaySystem : public CAutoGameSystemPerFrame, public CGameEventL
         //Stop a recording if there is one while the level shuts down
         if (m_pReplayManager->Recording())
             StopRecording(nullptr, true, false);
+
+        if (m_pReplayManager->GetPlaybackReplay())
+            m_pReplayManager->UnloadPlayback(true);
     }
 
     void SetTimerStartTick(int tick)
@@ -57,14 +59,10 @@ class CMomentumReplaySystem : public CAutoGameSystemPerFrame, public CGameEventL
 
     void BeginRecording(CBasePlayer *pPlayer);
     void StopRecording(CBasePlayer *pPlayer, bool throwaway, bool delay);
-
     void TrimReplay(); //Trims a replay's start down to only include a defined amount of time in the start trigger
-    void OnGhostEntityRemoved(CMomentumReplayGhostEntity*);// Called when a ghost entity is done being played.
 
     inline CMomReplayManager* GetReplayManager() const { return m_pReplayManager; }
 
-    void FireGameEvent(IGameEvent *pEvent) override;
-
 private:
     void UpdateRecordingParams(); // called every game frame after entities think and update
     void SetReplayInfo();
diff --git a/mp/src/game/server/momentum/server_events.cpp b/mp/src/game/server/momentum/server_events.cpp
index 201489d99c..f613d66953 100644
--- a/mp/src/game/server/momentum/server_events.cpp
+++ b/mp/src/game/server/momentum/server_events.cpp
@@ -3,16 +3,6 @@
 
 #include "tier0/memdbgon.h"
 
-void Momentum::OnServerDLLInit()
-{
-    TickSet::TickInit();
-    // MOM_TODO: connect to site
-    if (SteamAPI_IsSteamRunning())
-    {
-        mom_UTIL->GetRemoteRepoModVersion();
-    }
-}
-
 //This is only called when "map ____" is called, if the user uses changelevel then...
 // \/(o_o)\/
 void Momentum::GameInit()
@@ -51,6 +41,16 @@ void Momentum::GameInit()
     }
 }
 
+void CMOMServerEvents::PostInit()
+{
+    TickSet::TickInit();
+    // MOM_TODO: connect to site
+    /*if (SteamAPI_IsSteamRunning())
+    {
+
+    }*/
+}
+
 void CMOMServerEvents::LevelInitPostEntity()
 {
     const char *pMapName = gpGlobals->mapname.ToCStr();
@@ -106,4 +106,4 @@ void CMOMServerEvents::FrameUpdatePreEntityThink()
 }
 
 //Create the 
-CMOMServerEvents g_MOMServerEvents("MOMServerEvents");
\ No newline at end of file
+CMOMServerEvents g_MOMServerEvents("CMOMServerEvents");
\ No newline at end of file
diff --git a/mp/src/game/server/momentum/server_events.h b/mp/src/game/server/momentum/server_events.h
index f56c5b18bd..84f85d51e1 100644
--- a/mp/src/game/server/momentum/server_events.h
+++ b/mp/src/game/server/momentum/server_events.h
@@ -11,8 +11,6 @@
 #include "mapzones_edit.h"
 
 namespace Momentum {
-
-void OnServerDLLInit();
 void GameInit();
 } // namespace Momentum
 
@@ -22,7 +20,7 @@ class CMOMServerEvents : CAutoGameSystemPerFrame
     CMOMServerEvents(const char *pName) : CAutoGameSystemPerFrame(pName), zones(nullptr)
     {
     }
-
+    void PostInit() override;
     void LevelInitPostEntity() override;
     void LevelShutdownPreEntity() override;
     void FrameUpdatePreEntityThink() override;
diff --git a/mp/src/game/shared/momentum/mom_shareddefs.h b/mp/src/game/shared/momentum/mom_shareddefs.h
index 6d291b744d..079d972194 100644
--- a/mp/src/game/shared/momentum/mom_shareddefs.h
+++ b/mp/src/game/shared/momentum/mom_shareddefs.h
@@ -23,7 +23,7 @@ typedef enum MOMGM
 // Main Version (0 is alpha, 1 is beta, 2 is release)​.Main feature push (increment by one for each)​.​Small commits or hotfixes​
 // When editing this, remember to also edit version.txt on the main dir of the repo
 // If you have any doubts, please refer to http://semver.org/
-#define MOM_CURRENT_VERSION "0.4.0"
+#define MOM_CURRENT_VERSION "0.4.7"
 
 #define MOM_COLORIZATION_CHECK_FREQUENCY 0.1f
 
diff --git a/mp/src/game/shared/momentum/util/mom_util.cpp b/mp/src/game/shared/momentum/util/mom_util.cpp
index 91418c12e1..9d5c2e40d4 100644
--- a/mp/src/game/shared/momentum/util/mom_util.cpp
+++ b/mp/src/game/shared/momentum/util/mom_util.cpp
@@ -7,6 +7,17 @@
 
 extern IFileSystem *filesystem;
 
+inline void CleanupRequest(HTTPRequestCompleted_t* pCallback, uint8* pData)
+{
+    if (pData)
+    {
+        delete[] pData;
+    }
+    pData = nullptr;
+    steamapicontext->SteamHTTP()->ReleaseHTTPRequest(pCallback->m_hRequest);
+}
+
+
 void MomentumUtil::DownloadCallback(HTTPRequestCompleted_t *pCallback, bool bIOFailure)
 {
     if (bIOFailure)
@@ -32,7 +43,7 @@ void MomentumUtil::DownloadCallback(HTTPRequestCompleted_t *pCallback, bool bIOF
     DevLog("Successfully written file\n");
 
     // Free resources
-    steamapicontext->SteamHTTP()->ReleaseHTTPRequest(pCallback->m_hRequest);
+    CleanupRequest(pCallback, pData);
 }
 
 void MomentumUtil::PostTimeCallback(HTTPRequestCompleted_t *pCallback, bool bIOFailure)
@@ -91,7 +102,7 @@ void MomentumUtil::PostTimeCallback(HTTPRequestCompleted_t *pCallback, bool bIOF
     }
     // Last but not least, free resources
     alloc.deallocate();
-    steamapicontext->SteamHTTP()->ReleaseHTTPRequest(pCallback->m_hRequest);
+    CleanupRequest(pCallback, pData);
 }
 
 void MomentumUtil::PostTime(const char *szURL)
@@ -138,12 +149,41 @@ void MomentumUtil::CreateAndSendHTTPReq(const char *szURL, CCallResult<MomentumU
     }
 }
 
+
+#ifdef CLIENT_DLL
 void MomentumUtil::GetRemoteRepoModVersion()
 {
     CreateAndSendHTTPReq("http://raw.githubusercontent.com/momentum-mod/game/master/version.txt", &cbVersionCallback,
                          &MomentumUtil::VersionCallback);
 }
 
+void MomentumUtil::GetRemoteChangelog()
+{
+    CreateAndSendHTTPReq("http://raw.githubusercontent.com/momentum-mod/game/master/changelog.txt", &cbChangeLog, 
+        &MomentumUtil::ChangelogCallback);
+}
+
+void MomentumUtil::ChangelogCallback(HTTPRequestCompleted_t* pCallback, bool bIOFailure)
+{
+    if (bIOFailure)
+        return;
+    uint32 size;
+    steamapicontext->SteamHTTP()->GetHTTPResponseBodySize(pCallback->m_hRequest, &size);
+    if (size == 0)
+    {
+        Warning("MomentumUtil::ChangelogCallback: 0 body size!\n");
+        return;
+    }
+
+    uint8 *pData = new uint8[size];
+    steamapicontext->SteamHTTP()->GetHTTPResponseBodyData(pCallback->m_hRequest, pData, size);
+    char *pDataPtr = reinterpret_cast<char *>(pData);
+
+    versionwarnpanel->SetChangelog(pDataPtr);
+
+    CleanupRequest(pCallback, pData);
+}
+
 void MomentumUtil::VersionCallback(HTTPRequestCompleted_t *pCallback, bool bIOFailure)
 {
     if (bIOFailure)
@@ -164,20 +204,20 @@ void MomentumUtil::VersionCallback(HTTPRequestCompleted_t *pCallback, bool bIOFa
 
     char versionValue[15];
     Q_snprintf(versionValue, 15, "%s.%s.%s", repoVersion.Element(0), repoVersion.Element(1), repoVersion.Element(2));
-    if (Q_atoi(repoVersion.Element(0)) > Q_atoi(storedVersion.Element(0)))
-    {
-        ConVarRef("cl_showversionwarnpanel").SetValue(versionValue);
-    }
-    else if (Q_atoi(repoVersion.Element(1)) > Q_atoi(storedVersion.Element(1)))
-    {
-        ConVarRef("cl_showversionwarnpanel").SetValue(versionValue);
-    }
-    else if (Q_atoi(repoVersion.Element(2)) > Q_atoi(storedVersion.Element(2)))
+    for (int i = 0; i < 3; i++)
     {
-        ConVarRef("cl_showversionwarnpanel").SetValue(versionValue);
+        if (Q_atoi(repoVersion.Element(i)) > Q_atoi(storedVersion.Element(i)))
+        {
+            versionwarnpanel->SetVersion(versionValue);
+            GetRemoteChangelog();
+            versionwarnpanel->Activate();
+            break;
+        }
     }
-    steamapicontext->SteamHTTP()->ReleaseHTTPRequest(pCallback->m_hRequest);
+
+    CleanupRequest(pCallback, pData);
 }
+#endif
 
 void MomentumUtil::FormatTime(float m_flSecondsTime, char *pOut, int precision, bool fileName) const
 {
diff --git a/mp/src/game/shared/momentum/util/mom_util.h b/mp/src/game/shared/momentum/util/mom_util.h
index da94cc90ef..4100871c48 100644
--- a/mp/src/game/shared/momentum/util/mom_util.h
+++ b/mp/src/game/shared/momentum/util/mom_util.h
@@ -11,6 +11,9 @@
 #include "UtlSortVector.h"
 #include "filesystem.h"
 #include "gason.h"
+#ifdef CLIENT_DLL
+#include "VersionWarnPanel.h"
+#endif
 
 class MomentumUtil
 {
@@ -26,10 +29,15 @@ class MomentumUtil
     CCallResult<MomentumUtil, HTTPRequestCompleted_t> cbDownloadCallback;
     CCallResult<MomentumUtil, HTTPRequestCompleted_t> cbPostTimeCallback;
 
-    void GetRemoteRepoModVersion();
+#ifdef CLIENT_DLL
+    void GetRemoteChangelog();
+    CCallResult<MomentumUtil, HTTPRequestCompleted_t> cbChangeLog;
+    void ChangelogCallback(HTTPRequestCompleted_t*, bool);
 
+    void GetRemoteRepoModVersion();
     CCallResult<MomentumUtil, HTTPRequestCompleted_t> cbVersionCallback;
     void VersionCallback(HTTPRequestCompleted_t*, bool);
+#endif
 
     //Color GetColorFromVariation(float variation, float deadZone, Color normalcolor, Color increasecolor, Color decreasecolor);
     Color* GetColorFromHex(const char* hexColor); //in hex color format RRGGBB
diff --git a/mp/src/public/vgui_controls/cvartogglecheckbutton.h b/mp/src/public/vgui_controls/cvartogglecheckbutton.h
index 5d9a9ba13f..99fbe0520d 100644
--- a/mp/src/public/vgui_controls/cvartogglecheckbutton.h
+++ b/mp/src/public/vgui_controls/cvartogglecheckbutton.h
@@ -31,11 +31,12 @@ class CvarToggleCheckButton : public CheckButton
 	virtual void	SetSelected( bool state );
 
 	virtual void	Paint();
-
+    
 	void			Reset();
 	void			ApplyChanges();
 	bool			HasBeenModified();
 	virtual void	ApplySettings( KeyValues *inResourceData );
+    void GetSettings(KeyValues *outResources) override;
 
 private:
 	// Called when the OK / Apply button is pressed.  Changed data should be written into cvar.
@@ -186,6 +187,15 @@ void CvarToggleCheckButton<T>::ApplySettings( KeyValues *inResourceData )
 	}
 }
 
+template< class T >
+void CvarToggleCheckButton<T>::GetSettings( KeyValues *pOutResource)
+{
+    BaseClass::GetSettings(pOutResource);
+
+    pOutResource->SetString("cvar_name", m_cvar.GetName());
+    pOutResource->SetString("cvar_value", m_cvar.GetString());
+}
+
 } // namespace vgui
 
 #endif // CVARTOGGLECHECKBUTTON_H
diff --git a/version.txt b/version.txt
index 1d0ba9ea18..5546bd2c5e 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.4.0
+0.4.7
\ No newline at end of file