#1055 Fix for bugs, improve edit image dialog