More improvements to UI