Make borders round
Merge branch 'master' into dev