Small fixes in the UI