changed some more ids to classes