Small refactoring inside View helpers
Merge pull request #164 from AntonShevchuk/master

Fixed #158 (View helpers refactoring)