Merge pull request #197 from uwescience/ui-js-fixes

Ui js fixes
Merge branch 'master' into production