rework manage menu to be more usable