Fixed errors related to classes and ID's