FinishedMenuSystem and Added mapping for 2nd controller
Fixed a conflict with the editor settings