Tidying up and fixing the HTML