Bug fix for window layout options menu issue