some fixes to UI