Tech Debt: Overhaul the Unite menus