changed some id's and class names