Rework option window