Cleaned up view and template
This was a relatively quick fix