cleanup the ui - half done