Massive cleanup in views, using short echo tags and removing shortcut helpers