Major refactor of output and add hyperlinks