Lots of view related stuff.
Cleaning up (formatting whitespace...)