Added HTML-Escaping in view helper
removed redundant escaping in templates