Added and tidied up HTML