improved menu structure