Changed the PlayerMenu to work with the functions as added upstream, as opposed to my own hotfixes.