! fix for span. and change to div

i think div is better in here.

Signed-off-by: hhy89 <hhy89@hotmail.com>
change back to span

i think div is better then span in here :'(

Signed-off-by: hhy89 <hhy89@hotmail.com>
Merge pull request #2416 from hhy89/patch-7

! fix for span. and change to div