Main menu is up, code cleanup