cleaned up some of the files and updated the template view