small changes in Gui classes