filling in the links, adjusting class names