Lumping nav items back together for now