Some HTML code tweaks