gui buttons added
merge conflict