Fixed a couple things to finish up the Mode/View refactor

Basically done with the Mode/View refactor now.

I see some other things eventually that need to be handled and that is encapsulating the global state of tracks, devices etc.