GUI main and result view change
Merge origin/master