Main Menu revamp