Merge in Image Processing Fixes/UI Fixes