Updated endMenu
Merge branch 'John'