more improvements in UI