Bug mentioned by nojski fixed
some minor changes in GUI (to prevent unexpected bugs)
Merge pull request #28 from dokaptur/minor-changes

Bug mentioned by neojski fixed