Merge pull request #33 from david-allen-tessella/refactoring_removing_html_from_views

Refactoring removing html from views