Refactored some of the JS components. This completes some groundwork for the new features we are working on.