More improvements in UI