Remove more of the custom ui code. Everything is preserved in the other branch.