Minor formatting and style issues to files
Renamed template vars to match views.py