* clean up guiHandling a bit