Updated HTML and CSS further