Some improvements in the user interface