Shaking the bugs out of the new UI stuff...