addresses some warning when generating site
improves site code generation
Merge pull request #166 from paddatrapper/improve-site-code

Improve site code