Refactored out the new custom html renderer