Organize images and first pass at edit control