more improvements to UI