Fixed issues with HTML