some fixes in UI