UI tweaks, and image handling