Html template improved