Hygiene: Refactor main menu code

Change-Id: I9b6ae95b6145eb8c9cfe2868ab49112b77ee1b2a
Merge "Hygiene: Refactor main menu code"