Usability tweaks to overlay handling