some work on ui.