Fixes in the UI