fixes #406 and refactor part of the website creation