fixes in UI