Use span instead of code&text