Started tidying up the HTML and CSS