Fixed view finder interface
Merge pull request #4539 from GrahamCampbell/4.2-views

[4.2] Fixed View Finder interface