main image view changes, tests and associated changes in models