--- a/displayContract.php
+++ b/displayContract.php
@@ -7,15 +7,30 @@
 WHERE  CNID = '%d'", mysql_real_escape_string($_REQUEST['CNID']));
 
 $result = mysql_query($query);
-echo "<pre>";
 while ($row = mysql_fetch_array($result, MYSQL_ASSOC)) {
 setlocale(LC_MONETARY, 'en_US');
-$value = number_format(doubleval($row['value']),2);
-echo(print_r(array_filter($row),true));
+foreach (array_filter($row) as $key => $value) {
+	echo "<b>$key</b>&nbsp;";
+switch ($key) {
+case "supplierName":
+case "supplierABN":
+	echo '<a href="displaySupplier.php?supplier='.$row['supplierABN'].'-'.urlencode($row['supplierName']).'">'.$value."</a>";
+	break;
+case "agencyName":
+	echo '<a href="displayAgency.php?agency='.urlencode($value).'">'.$value."</a>";
+	break;
+case "value":
+	echo "$".number_format(doubleval($value),2);
+	break;
+default:
+	echo str_replace("  ","<br>",$value);
 }
-echo "</pre>";
+echo "<br>";
+}
+}
 echo '<a href="https://www.tenders.gov.au/?event=public.advancedsearch.keyword&keyword=CN'.$_REQUEST['CNID'].'"> View original record @ tenders.gov.au</a>';
 
 mysql_free_result($result);
 include_footer();
-?>
+?>
+