Some improvements in the UI