diff --git a/uc_store/uc_store.admin.inc b/uc_store/uc_store.admin.inc
index 60d0b7e..73152ef 100644
--- a/uc_store/uc_store.admin.inc
+++ b/uc_store/uc_store.admin.inc
@@ -56,14 +56,12 @@ function uc_store_admin() {
         case 'error':   $icon = 'error.gif'; break;
         default:        $icon = 'info.gif';
       }
+      $icon = theme('image', array('path' => drupal_get_path('module', 'uc_store') . '/images/' . $icon));
 
       $rows[] = array(
-        'data' => array(
-          array('data' => theme('image', array('path' => drupal_get_path('module', 'uc_store') . '/images/' . $icon))),
-          array('data' => '<strong>' . $message['title'] . '</strong>', 'nowrap' => 'nowrap'),
-          array('data' => $message['desc'], 'width' => '100%')
-        ),
-        'valign' => 'top',
+        array('data' => $icon, 'class' => array('icon')),
+        array('data' => $message['title'], 'class' => array('title')),
+        array('data' => $message['desc'], 'class' => array('message')),
       );
     }
 
@@ -71,6 +69,7 @@ function uc_store_admin() {
       '#theme' => 'table',
       '#caption' => '<h2>' . t('Store status') . '</h2>',
       '#rows' => $rows,
+      '#attributes' => array('class' => array('uc-store-status')),
     );
   }
 
diff --git a/uc_store/uc_store.api.php b/uc_store/uc_store.api.php
index edb867e..8689326 100644
--- a/uc_store/uc_store.api.php
+++ b/uc_store/uc_store.api.php
@@ -28,10 +28,8 @@ function hook_tapir_table_alter(&$table, $table_id) {
       $node = node_load($table['#parameters'][1][$key]);
 
       $table[$key]['designer'] = array(
-        '#value' => l($node->designer, 'collections/' . $node->designer_tid),
-        '#cell_attributes' => array(
-          'nowrap' => 'nowrap',
-        ),
+        '#markup' => l($node->designer, 'collections/' . $node->designer_tid),
+        '#cell_attributes' => array('class' => array('designer')),
       );
     }
   }
diff --git a/uc_store/uc_store.css b/uc_store/uc_store.css
index b5a2f18..ea8df3b 100644
--- a/uc_store/uc_store.css
+++ b/uc_store/uc_store.css
@@ -33,6 +33,19 @@
   width: 0px;
 }
 
+.uc-store-status td {
+  vertical-align: top;
+}
+
+.uc-store-status td.title {
+  font-weight: bold;
+  white-space: nowrap;
+}
+
+.uc-store-status td.message {
+  width: 100%;
+}
+
 /**
  * CSS rules for address fields.
  */