Fix span classes