Update to Javascript through debugging

Moving some things around to help flow.
Merge branch 'refs/heads/jf/#62_UI_Updates' into schwa_upload