fix gui
Merge remote-tracking branch 'origin/wolfia' into mj