Buttons added with clickhandler
Merge branch 'master' into temp