Fixed null image error
fix dialog view
Fixed image grabber. Need to clean up.
Fixed merge conflicts