Merge pull request #341 from kula1922/hotfix/gui-bugs

Gui bugs