More improvements in UI.