Feature/refactor view helpers

Refactored several view helpers.