Badge page improved. Code a little better