ADD: convert badges to links