Improved badge output