More work on the structure of the website