changes due to new gui structure