Minor update - moved view routing stuff back into controllers for now.

Minor reformatting.  Fixed a few bugs - next task, understand what I'm doing wrong when sending OrbitMode preset data.