Polish responsiveness of gray boxes, reorder code