major update to menu structure