Some improvements to the UI