cleanup of the ui stuff to use common base