Anything UI related that breaks is now my fault; apologies in advance. svn path=/trunk/; revision=5415