minor refactoring mostly views now using custom helpers that were already implemented