overhaul choice window stuff