further work on enhanced UI generation