Templates

This branch isn't terribly focused. It's just a bunch of changes to templates and views and stuff.