More UI things.
Yet more UI things. I think it's done now.