Updated Main Menu functionality