Made controllers for each view, moved some stuff around. Should be easie...

...r to document this way