Properly restored UpdateMenuEntryLocations method to MenuScreen. fixes #1
Fixed main menu back navigation. fixes #2