a bit more cleaning up in the gui