Some fixes to UI