merged and updated a html issues