GUI-187

incorporated feedback