GUI fixes, {code-word} fixes
Merge pull request #2 from fReztek/master

GUI fixes, {code-word} fixes