#83 - fixed order, added some badges