ISSUE-92 Fix hard coded references
ISSUE-93 fix some hardcoded href links
ISSUE-93 fix some hardcoded href links