further changes to Gui :)