Re-weorked hyperlinks issueID #11