ENH:improve UI