Resolving badge removal/misalignment problems
Fixing deletion error
Merge pull request #722 from andrewhayward/675-holy-badges-batman

Resolving badge removal/misalignment problems