Added link to author badge
Improved badge names
Proper fix for badges conditional