add round class to button
fix tests
Merge remote-tracking branch 'origin/dev' into dev