More fixes to UI