Small fixes to UI