further improvements on the GUI handling