Tidied most of the HTML/JS