Templates

Broke apart the large single template and view model into smaller files.

A few changes for adding fields accidentally got put in this branch as well.