Some improvements in the gui.