a lot of minor changes in new gui