refactor site.js
Merge branch 'icaaq-refactored-site-js'