adding smart image view, cleaning up event in progress somewhat