Work (mostly) on 2.0 ui pages

Tried to do some cleanup and switched pages to use extends