Few fixes to UI