View-related refactoring.
Several changes due to break everything.