Fixed minor issues and reorganized the menu structure.