Improve site build script and html templates