Add badges
Word wrap