Use button group for tools
Merge branch 'develop'