Small fixes in UI