Added hyperlink and fixed headers