Started cleaning up HTML and CSS