Minor improvements in the UI