Added a span with nowrap to fix the overlaping issue.