remove ul bullet and change span to link
Merge origin/master