Tidied up html code
Work on tests