refactored hmtl templates