Final fixes in html layout