Small changes to help clean up the view, and reduce the unecessary code in the view.html file.