Update for better html code generation