Some improvements to GUI...