small fixes to the UI. ID-185