Change some incorrect IDs to classes