Changed some ids to classes