Move closing span tag to fix the generated html a bit