Refactor the website