HTML and CSS improvements