Gui facelift

JavaDoc missing