Main menu restructure