Fix the IDs.
Adjust main menu.