Improved html template