clean up all the spans and divs
fixed the most visible errors; not sure about others