Refactoring views to use helpers