Work (mostly) on 2.0 ui pages

Tried to do some cleanup and switched pages to use extends
Yep, I think you can blame my comment on not fully knowing Twig syntax as well as I should