Fixed the image edit

All set, but have questions on some edge cases