added buttons to modal
Merge branch 'master' into modal
merging modal buttons