Add overlay windows handling