ref #4028 - GUI fixes