updating link and styles
merge conflicts