margin fixes on badge
Merge branch 'dev'