Fixed the menu structure