further work on the UI