Badge page improved. Code a little better
Merge pull request #1 from christriddle/master

Badge page improved. Code a little better