New pull request from Jacob

Refactors some code, fixes bootstrap links, changes app.js path name, creates  main control.