various improvements in UI