Updates to templates and views.
Fix merge conflicts in urls.py.