Feature/better badges

@tolry @DavidBadura