move more things in the lib-ui.