More view wiring and fixing.
Renaming