Refactor main menu bar