[gui] changes after code review