Windows menu improved