Improved definition lists, badges.
Fixed conflicts