Work (mostly) on 2.0 ui pages

Tried to do some cleanup and switched pages to use extends
Actually strip whitespace: http://twig.sensiolabs.org/doc/templates.html#whitespace-control