Better organization of UI internals.