More view helper refactoring