Custom Main Menu Part 2: Improvements