Added fixes to UI