Updated Badges

Let's see if these are any better then.