More progress on mobile menu, some refinements to desktop menu.