Added/Updated templates, minor views changes.