Improve site generation