Polished UI a little more, refactored some of the javascript