menu re-organization