diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini
index 17fd7937..8c4afee7 100644
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@@ -20,3 +20,6 @@ EditorStartupMap=/Game/Maps/Main_Scene.Main_Scene
 GameDefaultMap=/Game/Maps/Main_Scene.Main_Scene
 GameInstanceClass=/Game/Blueprints/Player/GI.GI_C
 
+[/Script/Engine.UserInterfaceSettings]
+UIScaleCurve=(EditorCurveData=(Keys=((Time=560.000000,Value=0.250000),(Time=2160.000000,Value=1.000000)),DefaultValue=340282346638528859811704183484516925440.000000,PreInfinityExtrap=RCCE_Constant,PostInfinityExtrap=RCCE_Constant),ExternalCurve=None)
+
diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini
new file mode 100644
index 00000000..0eb42e48
--- /dev/null
+++ b/Config/DefaultInput.ini
@@ -0,0 +1,113 @@
+<<<<<<< Updated upstream
+
+
+[/Script/Engine.InputSettings]
+-AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
+-AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
+-AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
+-AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
+-AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f))
+-AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f))
+-AxisConfig=(AxisKeyName="Mouse2D",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f))
++AxisConfig=(AxisKeyName="Mouse2D",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MouseWheelAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_LeftTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_RightTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_Special_Left_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_Special_Left_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Daydream_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Daydream_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Daydream_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Daydream_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Vive_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Vive_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Vive_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Vive_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Vive_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Vive_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusGo_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusGo_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusGo_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusGo_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Left_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Right_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Grip_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Touch",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
+bAltEnterTogglesFullscreen=True
+bF11TogglesFullscreen=True
+bUseMouseForTouch=True
+bEnableMouseSmoothing=False
+bEnableFOVScaling=False
+bCaptureMouseOnLaunch=False
+bAlwaysShowTouchInterface=False
+bShowConsoleOnFourFingerTap=True
+bEnableGestureRecognizer=False
+bUseAutocorrect=False
+DefaultViewportMouseCaptureMode=CapturePermanently
+DefaultViewportMouseLockMode=DoNotLock
+FOVScale=0.011110
+DoubleClickTime=0.200000
++ActionMappings=(ActionName="triggerR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_Trigger_Click)
++ActionMappings=(ActionName="grabberR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_Grip_Click)
++ActionMappings=(ActionName="grabberR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Cosmos_Right_Grip_Click)
++ActionMappings=(ActionName="triggerR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Cosmos_Right_Trigger_Click)
++ActionMappings=(ActionName="triggerL",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Trigger_Click)
++ActionMappings=(ActionName="menuL",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_A_Click)
++ActionMappings=(ActionName="grabberL",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Grip_Click)
++ActionMappings=(ActionName="menuL",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Cosmos_Left_X_Click)
++ActionMappings=(ActionName="grabberL",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Cosmos_Left_Grip_Click)
++ActionMappings=(ActionName="triggerL",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Cosmos_Left_Trigger_Click)
++ActionMappings=(ActionName="menuR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Cosmos_Right_A_Click)
++ActionMappings=(ActionName="menuR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_A_Touch)
++AxisMappings=(AxisName="right",Scale=1.000000,Key=right)
++AxisMappings=(AxisName="forward",Scale=1.000000,Key=Up)
++AxisMappings=(AxisName="right",Scale=-1.000000,Key=Left)
++AxisMappings=(AxisName="right",Scale=1.000000,Key=D)
++AxisMappings=(AxisName="right",Scale=-1.000000,Key=A)
++AxisMappings=(AxisName="forward",Scale=-1.000000,Key=Down)
++AxisMappings=(AxisName="forward",Scale=1.000000,Key=W)
++AxisMappings=(AxisName="forward",Scale=-1.000000,Key=S)
+DefaultPlayerInputClass=/Script/Engine.PlayerInput
+DefaultInputComponentClass=/Script/Engine.InputComponent
+DefaultTouchInterface=None
+-ConsoleKeys=Tilde
++ConsoleKeys=Tilde
++ConsoleKeys=None
+
diff --git a/Content/Blueprints/Data/MathAndConvertFns.uasset b/Content/Blueprints/Data/MathAndConvertFns.uasset
index 88988391..d6fc1f90 100644
Binary files a/Content/Blueprints/Data/MathAndConvertFns.uasset and b/Content/Blueprints/Data/MathAndConvertFns.uasset differ
diff --git a/Content/Blueprints/Data/coords.uasset b/Content/Blueprints/Data/coordsStruct.uasset
similarity index 50%
rename from Content/Blueprints/Data/coords.uasset
rename to Content/Blueprints/Data/coordsStruct.uasset
index 91415813..256ab918 100644
Binary files a/Content/Blueprints/Data/coords.uasset and b/Content/Blueprints/Data/coordsStruct.uasset differ
diff --git a/Content/Blueprints/Data/updateState.uasset b/Content/Blueprints/Data/updateState.uasset
index ab6af3d3..7c695906 100644
Binary files a/Content/Blueprints/Data/updateState.uasset and b/Content/Blueprints/Data/updateState.uasset differ
diff --git a/Content/Blueprints/Player/CM.uasset b/Content/Blueprints/Player/CM.uasset
index 196e186d..f8f22516 100644
Binary files a/Content/Blueprints/Player/CM.uasset and b/Content/Blueprints/Player/CM.uasset differ
diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset
index 8ce3a841..c6c21878 100644
Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ
diff --git a/Content/Blueprints/Player/GameplayFunctions.uasset b/Content/Blueprints/Player/GameplayFunctions.uasset
index b2322039..be3db838 100644
Binary files a/Content/Blueprints/Player/GameplayFunctions.uasset and b/Content/Blueprints/Player/GameplayFunctions.uasset differ
diff --git a/Content/Blueprints/Player/MyPC.uasset b/Content/Blueprints/Player/MyPC.uasset
index 4fcf72c3..9b207a3e 100644
Binary files a/Content/Blueprints/Player/MyPC.uasset and b/Content/Blueprints/Player/MyPC.uasset differ
diff --git a/Content/Blueprints/Player/MyPawn.uasset b/Content/Blueprints/Player/MyPawn.uasset
index d0f0fa9a..41a4d3c1 100644
Binary files a/Content/Blueprints/Player/MyPawn.uasset and b/Content/Blueprints/Player/MyPawn.uasset differ
diff --git a/Content/Blueprints/Player/WalkingPawn.uasset b/Content/Blueprints/Player/WalkingPawn.uasset
index bcd1522d..7e032f8c 100644
Binary files a/Content/Blueprints/Player/WalkingPawn.uasset and b/Content/Blueprints/Player/WalkingPawn.uasset differ
diff --git a/Content/Blueprints/Player/getFunctions.uasset b/Content/Blueprints/Player/getFunctions.uasset
index a36d82dd..148911be 100644
Binary files a/Content/Blueprints/Player/getFunctions.uasset and b/Content/Blueprints/Player/getFunctions.uasset differ
diff --git a/Content/Blueprints/UI/Img/menu/BG.uasset b/Content/Blueprints/UI/Img/menu/BG.uasset
new file mode 100644
index 00000000..f17d61dc
Binary files /dev/null and b/Content/Blueprints/UI/Img/menu/BG.uasset differ
diff --git a/Content/Blueprints/UI/Img/temp/MainNavigation.uasset b/Content/Blueprints/UI/Img/temp/MainNavigation.uasset
new file mode 100644
index 00000000..26f73be9
Binary files /dev/null and b/Content/Blueprints/UI/Img/temp/MainNavigation.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/Elements/MenuBtn.uasset b/Content/Blueprints/UI/Widgets/Elements/MenuBtn.uasset
index 0be4bb97..5598d93e 100644
Binary files a/Content/Blueprints/UI/Widgets/Elements/MenuBtn.uasset and b/Content/Blueprints/UI/Widgets/Elements/MenuBtn.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/Elements/Tag.uasset b/Content/Blueprints/UI/Widgets/Elements/Tag.uasset
deleted file mode 100644
index 42b5567f..00000000
Binary files a/Content/Blueprints/UI/Widgets/Elements/Tag.uasset and /dev/null differ
diff --git a/Content/Blueprints/UI/Widgets/Elements/chBox.uasset b/Content/Blueprints/UI/Widgets/Elements/chBox.uasset
index 515bad4c..12651e08 100644
Binary files a/Content/Blueprints/UI/Widgets/Elements/chBox.uasset and b/Content/Blueprints/UI/Widgets/Elements/chBox.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/Elements/inputBox.uasset b/Content/Blueprints/UI/Widgets/Elements/inputBox.uasset
index d2323649..b98d3569 100644
Binary files a/Content/Blueprints/UI/Widgets/Elements/inputBox.uasset and b/Content/Blueprints/UI/Widgets/Elements/inputBox.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/Elements/list.uasset b/Content/Blueprints/UI/Widgets/Elements/list.uasset
deleted file mode 100644
index e7d067d2..00000000
Binary files a/Content/Blueprints/UI/Widgets/Elements/list.uasset and /dev/null differ
diff --git a/Content/Blueprints/UI/Widgets/Elements/listObj.uasset b/Content/Blueprints/UI/Widgets/Elements/listObj.uasset
deleted file mode 100644
index d84c8859..00000000
Binary files a/Content/Blueprints/UI/Widgets/Elements/listObj.uasset and /dev/null differ
diff --git a/Content/Blueprints/UI/Widgets/Elements/managerList.uasset b/Content/Blueprints/UI/Widgets/Elements/managerList.uasset
deleted file mode 100644
index 73ed0159..00000000
Binary files a/Content/Blueprints/UI/Widgets/Elements/managerList.uasset and /dev/null differ
diff --git a/Content/Blueprints/UI/Widgets/Elements/slider.uasset b/Content/Blueprints/UI/Widgets/Elements/slider.uasset
index a16bde1d..f86e43d1 100644
Binary files a/Content/Blueprints/UI/Widgets/Elements/slider.uasset and b/Content/Blueprints/UI/Widgets/Elements/slider.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/menu/mainMenu.uasset b/Content/Blueprints/UI/Widgets/menu/mainMenu.uasset
new file mode 100644
index 00000000..c8c6decd
Binary files /dev/null and b/Content/Blueprints/UI/Widgets/menu/mainMenu.uasset differ