Refactor main menu and avoid blank links