Fix various SI/TI related things
Update ug.js
Merge branch 'master' into gh-pages
Update index.html
Merge branch 'master' into gh-pages