some work on the Gui..