Clean up subnav bar somewhat; still a bit quirky