Fixed link and small addition attributes