Fixed bug and changed spans to divs