Templating, styling updates, structural updates

Lots and lots of progress made.