Bug mentioned by neojski fixed

some minor changes in GUI (to prevent unexpected bugs)