Fixing span classes