Updated html generation