Revert "Try use links instead of span"

This reverts commit c815ace90f70b8456f85c88ed8f15edd1a5a54ba.