Improved output of template views and removed unused code in helper