Bug fixes in UI