Merged gui in master branch