Aimless UI code shuffling, and some replanning.