html & helpers refactoring