New badged generator
Fix fields label
Final badge fix