Some improvements on the gui