cleanup and fixed minor things to image view