Boat load of design changes for UI testing.