So far this is one of the few Arrange categories I don't like :( Not sure when I'll be back to improve this, but I will eventually.