--- a/getAgency.php
+++ b/getAgency.php
@@ -4,12 +4,13 @@
 
 function displayValue($key, $value, $mode) {
     global $db, $schemas;
+    $ignoreKeys = Array("metadata" ,"metaTags", "statistics","rtkURLs","rtkDescriptions");
     if ($mode == "view") {
-        if (strpos($key, "_") === 0 || $key == "metadata")
+        if (strpos($key, "_") === 0 || in_array($key,$ignoreKeys))
             return;
         echo "<tr>";
 
-        echo "<td>";
+        echo "<td class='$key'>";
         if (isset($schemas['agency']["properties"][$key])) {
             echo $schemas['agency']["properties"][$key]['x-title'] . "<br><small>" . $schemas['agency']["properties"][$key]['description'] . "</small>";
         }
@@ -119,7 +120,7 @@
 // edit?
 
     $obj = $db->get($_REQUEST['id']);
-    include_header($obj->name);
+    include_header(isset($obj->name) ? $obj->name : "");
 //print_r($row);
     if (sizeof($_POST) > 0) {
 //print_r($_POST);
@@ -159,8 +160,38 @@
     }
 
     if ($mode == "view") {
-        echo '<div itemscope itemtype="http://schema.org/GovernmentOrganization" typeof="schema:GovernmentOrganization" about="#' . $row['_id'] . '"><table width="100%">';
-        echo '<tr> <td colspan="2"><h3 itemprop="name">' . $row['name'] . "</h3></td></tr>";
+            echo ' <div class="container-fluid">
+      <div class="row-fluid">
+        <div class="span3">
+          <div class="well sidebar-nav">
+            <ul class="nav nav-list">
+              <li class="nav-header">Statistics</li>';
+            
+             if (isset($row['statistics']['employees'])) {
+                echo '<div><i class="icon-user" style="float:left"></i><p style="margin-left:16px;">';
+                $keys = array_keys($row['statistics']['employees']);
+                $lastkey = $keys[count($keys)-1];
+                echo $row['statistics']['employees'][$lastkey]['value'].' employees <small>('.$lastkey.')</small>';
+                echo '</div>';
+            }
+        if (isset($row['statistics']['budget'])) {
+            echo '<div><i class="icon-shopping-cart" style="float:left"></i><p style="margin-left:16px;">';
+            $keys = array_keys($row['statistics']['budget']);
+            $lastkey = $keys[count($keys)-1];
+            echo "$".number_format(floatval($row['statistics']['budget'][$lastkey]['value'])).' <small>('.$lastkey.' budget)</small>';
+            echo '</div>';
+        }
+    echo '  </ul>
+          </div><!--/.well -->
+        </div><!--/span-->
+        <div class="span9">';
+        echo '<div itemscope itemtype="http://schema.org/GovernmentOrganization" typeof="schema:GovernmentOrganization" about="#' . $row['_id'] . '">';
+        echo '<div class="hero-unit">
+            <h1 itemprop="name">' . $row['name'] . '</h1>';
+            if (isset($row['description'])) {
+                echo '<p>'.$row['description'].'</p>';
+            }
+        echo '</div><table width="100%">';
         echo "<tr><th>Field Name</th><th>Field Value</th></tr>";
     }
     if ($mode == "edit") {
@@ -192,6 +223,10 @@
     }
     if ($mode == "view") {
         echo "</table></div>";
+              echo '         </div><!--/span-->
+          </div><!--/row-->
+        </div><!--/span-->
+      </div><!--/row-->';
     }
     if ($mode == "edit") {
         echo '<input id="submitbutton" type="submit"/></form>';
@@ -199,30 +234,45 @@
 } else {
 // show all list
     include_header('Agencies');
+    echo ' <div class="container-fluid">
+      <div class="row-fluid">
+        <div class="span3">
+          <div class="well sidebar-nav">
+            <ul class="nav nav-list">
+              <li class="nav-header">Sidebar</li>';
+    echo '  </ul>
+          </div><!--/.well -->
+        </div><!--/span-->
+        <div class="span9">
+          <div class="hero-unit">
+            <h1>Australian Government Agencies</h1>
+            <p>Explore collected information about Australian Government Agencies below.</p>
+
+          </div>
+          <div class="row-fluid">
+            <div class="span4">';
     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) {
+        $rowCount = count($rows);
+        foreach ($rows as $i => $row) {
+            if ($i % ($rowCount/3) == 0 && $i != 0 && $i != $rowCount -2 ) echo '</div><div class="span4">';
             //   print_r($row);
-            echo '<li itemscope itemtype="http://schema.org/GovernmentOrganization" typeof="schema:GovernmentOrganization foaf:Organization" about="getAgency.php?id=' . $row->value->_id . '">
+            echo '<span 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>";
+            (isset($row->value->name) ? $row->value->name : "ERROR NAME MISSING") 
+            . '</span></a></span><br><br>';
+        }
+      
     } catch (SetteeRestClientException $e) {
         setteErrorHandler($e);
     }
+      echo '         </div><!--/span-->
+          </div><!--/row-->
+        </div><!--/span-->
+      </div><!--/row-->';
 }
+
 include_footer();
 ?>