Combines Track and Stop into one view. Cleans up unnecessary controllers in services.js

...heme