refactors JS
Merge remote-tracking branch 'origin/master' into adds_action_center
minor adjustments
Merge pull request #14 from tyne/refactors_js

Refactors js