changed a few divs back to spans