Refine menu bar; rework category model