GUI fixes, {code-word} fixes