First pass at badge improvements
Merge pull request #2084 from darkwing/badges-ui-rebase

First pass at badge improvements