further work on ui