ui cleanup and image-path hint