Some improvements to the gui.