Some fixes in html