Merge pull request #93 from zlamalp/gui

GUI: multiple fixes