Add a few changes in the html generation