Merge
Changed gui