More tweaks on migrating to 2.0 page.