Fixes in UI