--- a/getAgency.php
+++ b/getAgency.php
@@ -1,31 +1,31 @@
 <?php
 
 include_once('include/common.inc.php');
-
 
 function displayValue($key, $value, $mode) {
     global $db, $schemas;
     if ($mode == "view") {
-if (strpos($key, "_") === 0 || $key== "metadata") return;
+        if (strpos($key, "_") === 0 || $key == "metadata")
+            return;
         echo "<tr>";
 
         echo "<td>";
         if (isset($schemas['agency']["properties"][$key])) {
-             echo $schemas['agency']["properties"][$key]['x-title'] . "<br><small>" . $schemas['agency']["properties"][$key]['description']."</small>";
-        }
-         echo                "</td><td>";
+            echo $schemas['agency']["properties"][$key]['x-title'] . "<br><small>" . $schemas['agency']["properties"][$key]['description'] . "</small>";
+        }
+        echo "</td><td>";
         if (is_array($value)) {
             echo "<ol>";
             foreach ($value as $subkey => $subvalue) {
-                 
-                    echo "<li ";
-                    if (isset($schemas['agency']["properties"][$key]['x-property'])) {
+
+                echo "<li ";
+                if (isset($schemas['agency']["properties"][$key]['x-property'])) {
                     echo ' property="' . $schemas['agency']["properties"][$key]['x-property'] . '" ';
-                }    if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) {
+                } if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) {
                     echo ' itemprop="' . $schemas['agency']["properties"][$key]['x-itemprop'] . '" ';
                 }
                 echo " >";
-                
+
                 echo "$subvalue</li>";
             }
             echo "</ol></td></tr>";
@@ -35,11 +35,15 @@
             } else {
                 echo "<span>";
             }
+
             if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
-                echo "<a ".($key == 'website' ? 'itemprop="url"':'')." href='$value'>$value</a>";
-                          } else {
-                echo "$value</span>";
-            }
+                echo "<a " . ($key == 'website' ? 'itemprop="url"' : '') . " href='$value'>$value</a>";
+            } else if ($key == 'abn') {
+                echo "<a href='http://www.abr.business.gov.au/SearchByAbn.aspx?SearchText=$value'>$value</a>";
+            } else {
+                echo "$value";
+            }
+            echo "</span>";
         }
         echo "</td></tr>";
     }
@@ -69,8 +73,7 @@
             } else {
                 echo "<label>$key</label><input  class='input-text' type='text' id='$key' name='$key' value='$value'/>";
                 if ((strpos($key, "URL") > 0 || $key == 'website') && $value != "") {
-                    echo "<a ".($key == 'website' ? 'itemprop="url"':'')." href='$value'>view</a>";
-                        
+                    echo "<a " . ($key == 'website' ? 'itemprop="url"' : '') . " href='$value'>view</a>";
                 }
                 if ($key == 'abn') {
                     echo "<a href='http://www.abr.business.gov.au/SearchByAbn.aspx?SearchText=$value'>view abn</a>";
@@ -102,7 +105,6 @@
                 $row[$defaultField] = Array($value);
                 $row[$defaultField][] = "";
                 $row[$defaultField][] = "";
-                
             }
         }
     }
@@ -149,7 +151,7 @@
 
     $mode = "view";
     $rowArray = object_to_array($obj);
-ksort($rowArray);
+    ksort($rowArray);
     if ($mode == "edit") {
         $row = addDefaultFields($rowArray);
     } else {
@@ -182,45 +184,45 @@
             };
         </script>
         <form id="editform" class="nice" method="post">
-            <?php
-
-        }
-        foreach ($row as $key => $value) {
-            echo displayValue($key, $value, $mode);
-        }
-        if ($mode == "view") {
-            echo "</table></div>";
-        }
-        if ($mode == "edit") {
-            echo '<input id="submitbutton" type="submit"/></form>';
-        }
-    } else {
+        <?php
+
+    }
+    foreach ($row as $key => $value) {
+        echo displayValue($key, $value, $mode);
+    }
+    if ($mode == "view") {
+        echo "</table></div>";
+    }
+    if ($mode == "edit") {
+        echo '<input id="submitbutton" type="submit"/></form>';
+    }
+} else {
 // show all list
-        include_header('Agencies');
-        try {
-            /* $rows = $db->get_view("app", "showNamesABNs")->rows;
-              //print_r($rows);
-              foreach ($rows as $row) {
-              //   print_r($row);
-              echo '<li><a href="getAgency.php?id=' . $row->key . '">' .
-              (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn)
-              . '</a></li>';
-              } */
-            $rows = $db->get_view("app", "byCanonicalName")->rows;
-            //print_r($rows);
-            echo '<ul>';
-            foreach ($rows as $row) {
-                //   print_r($row);
-                echo '<li itemscope itemtype="http://schema.org/GovernmentOrganization" typeof="schema:GovernmentOrganization foaf:Organization" about="getAgency.php?id=' . $row->value->_id . '">
+    include_header('Agencies');
+    try {
+        /* $rows = $db->get_view("app", "showNamesABNs")->rows;
+          //print_r($rows);
+          foreach ($rows as $row) {
+          //   print_r($row);
+          echo '<li><a href="getAgency.php?id=' . $row->key . '">' .
+          (isset($row->value->name) && $row->value->name != "" ? $row->value->name : "NO NAME " . $row->value->abn)
+          . '</a></li>';
+          } */
+        $rows = $db->get_view("app", "byCanonicalName")->rows;
+        //print_r($rows);
+        echo '<ul>';
+        foreach ($rows as $row) {
+            //   print_r($row);
+            echo '<li itemscope itemtype="http://schema.org/GovernmentOrganization" typeof="schema:GovernmentOrganization foaf:Organization" about="getAgency.php?id=' . $row->value->_id . '">
 <a href="getAgency.php?id=' . $row->value->_id . '" rel="schema:url foaf:page" property="schema:name foaf:name" itemprop="url"><span itemprop="name">' .
-                $row->value->name
-                . '</span></a></li>';
-            }
-            echo "</ul>";
-        } catch (SetteeRestClientException $e) {
-            setteErrorHandler($e);
-        }
-    }
-    include_footer();
-    ?>
-
+            $row->value->name
+            . '</span></a></li>';
+        }
+        echo "</ul>";
+    } catch (SetteeRestClientException $e) {
+        setteErrorHandler($e);
+    }
+}
+include_footer();
+?>
+