Refactored the website