More 2.0 changes.
Started on a migrating to 2.0 page.