Removed some badges, reodered the rest