changing ids to classes
merge conflicts