Updated html generator