More work on PlayerMenu