#1018: Added display windows