Mucked around with badges

Getting the player badge to show up in the right place, and making sure
badges are being removed and re-applied