More work on the website, all tests pass