Tidied up the main HTML a bit