diff --git a/app/assets/stylesheets/darkswarm/active_table.css.sass b/app/assets/stylesheets/darkswarm/active_table.css.sass
index 7219eecfb2..0b8c9122fa 100644
--- a/app/assets/stylesheets/darkswarm/active_table.css.sass
+++ b/app/assets/stylesheets/darkswarm/active_table.css.sass
@@ -4,6 +4,8 @@
   margin: 2em 0em
   .active_table_row
     padding: 0.8em 0.5em  
-    &:hover, &:active, &:focus
-      background: white
-      border: 1px solid $clr-strong
+    display: block
+    &.closed
+      &:hover, &:active, &:focus
+        background: white
+        border: 1px solid $clr-strong
diff --git a/app/assets/stylesheets/darkswarm/hub_node.css.sass b/app/assets/stylesheets/darkswarm/hub_node.css.sass
index b5ccf489ef..1fd4aed440 100644
--- a/app/assets/stylesheets/darkswarm/hub_node.css.sass
+++ b/app/assets/stylesheets/darkswarm/hub_node.css.sass
@@ -1,12 +1,29 @@
-hub.active_table_row // Inherits from active_table
-  border: 1px solid transparent
+@import 'branding'
+
+hub
   display: block
-  & > .row
-    //padding-top: 12px
-    //padding-bottom: 12px
-  &, & > a.row
-    display: block
   &.open
-    border: 1px solid pink
-    a.row .columns
-      border-bottom: 1px solid pink
+    border: 1px solid $clr-strong
+    p
+      padding-top: 1em
+    .active_table_row:first-child
+      border-bottom: 1px solid $clr-strong
+    .active_table_row:last-child
+      padding: 0
+      background-color: $clr-strong
+      &:hover
+        background-color: $clr-bright
+      a
+        display: block
+        padding: 0.8em 0.5em
+        margin: 0 -0.9375rem
+        &, & * 
+          color: white
+
+  .active_table_row // Inherits from active_table
+    border: 1px solid transparent
+    &, & > a.row
+      display: block
+      //border: 1px solid pink
+      //a.row .columns
+        //border-bottom: 1px solid pink
diff --git a/app/assets/stylesheets/darkswarm/lists.css.sass b/app/assets/stylesheets/darkswarm/lists.css.sass
new file mode 100644
index 0000000000..244d0dd862
--- /dev/null
+++ b/app/assets/stylesheets/darkswarm/lists.css.sass
@@ -0,0 +1,7 @@
+
+body ol
+  list-style-type: none
+  margin-left: 0em
+  padding-top: 1em
+  li
+    margin-left: 0
diff --git a/app/views/darkswarm/index.html.haml b/app/views/darkswarm/index.html.haml
index f4567f1d61..a07200ab79 100644
--- a/app/views/darkswarm/index.html.haml
+++ b/app/views/darkswarm/index.html.haml
@@ -30,35 +30,48 @@
   .row{bindonce: true}
     .small-12.columns
       .active_table
-        %hub.active_table_row{"ng-repeat" => "hub in filteredHubs = (hubs | filterHubs:query)",
+
+        %hub.row{"ng-repeat" => "hub in filteredHubs = (hubs | filterHubs:query)",
         "ng-class" => "{'open' : open}"} 
-          %a.row{"ng-click" => "open = !open"}
-            .columns.small-4
-              %strong {{ hub.name }}
-            .columns.small-3
-              {{ hub.address.city }}
-            .columns.small-1
-              {{ hub.address.state }}
-            .columns.small-3
-              Orders closing when?
-            .columns.small-1
-              %i{"ng-class" => "{'fi-arrow-down' : !open, 'fi-arrow-up' : open}"} 
-
-          .row{"ng-if" => "open"}
-            .columns.small-4
-              %strong Shop for
-            .columns.small-4
-              %strong Delivery options
-              .pickup{"bo-if" => "hub.pickup"} Pickup
-              .delivery{"bo-if" => "hub.delivery"} Delivery
-            .columns.small-4
-              %strong Our producers
-
-          .row{"ng-if" => "open"}
-            .columns.small-12
-              %a{"bo-href" => "hub.path"} 
-                Shop at 
+          .small-12.columns
+            .row.active_table_row{"ng-click" => "open = !open", "ng-class" => "{'closed' : !open}"}
+              .columns.small-4
                 %strong {{ hub.name }}
+              .columns.small-3
+                {{ hub.address.city }}
+              .columns.small-1
+                {{ hub.address.state | uppercase }}
+              .columns.small-3
+                Orders closing when?
+              .columns.small-1.text-right
+                %i{"ng-class" => "{'fi-arrow-down' : !open, 'fi-arrow-up' : open}"} 
+
+            .row.active_table_row{"ng-if" => "open"}
+              .columns.small-4
+                %strong Shop for
+                %p
+                  Organics, Test data, Food boxes, fruit, kittens, Meat & Fish, Drinks 
+              .columns.small-4
+                %strong Delivery options
+                %ol
+                  %li.pickup{"bo-if" => "hub.pickup"} Pickup
+                  %li.delivery{"bo-if" => "hub.delivery"} Delivery
+              .columns.small-4
+                %strong Our producers
+                %ol
+                  %li Fake Name Forever
+                  %li The Constant Gardener
+                  %li Shiny Olives
+                  %li Love in a Time of War
+
+            .row.active_table_row{"ng-if" => "open"}
+              .columns.small-11
+                %a{"bo-href" => "hub.path"} 
+                  Shop at 
+                  %strong {{ hub.name }}
+              .columns.small-1.text-right
+                %a{"bo-href" => "hub.path"} 
+                  %i.fi-arrow-right
 
     .small-12.columns
       .row{"ng-show" => "filteredHubs.length == 0"}