Rearrange + fix main menu code