Some improvements in the GUI