Fixes in HTML markup