Some work on options window