diff --git a/modules/storm/storm.css b/modules/storm/storm.css
index 72ac83e..f5e42b5 100644
--- a/modules/storm/storm.css
+++ b/modules/storm/storm.css
@@ -68,24 +68,22 @@ ul.storm_quick_shortcuts li a {
   color: #ffffff;
 }
 
-form.stormcomponent_node_form #edit-preview {
-  display: none;
-}
-
-tr.formgroup {
-  background-color: #ffffff !important;
-  border: none !important;
-}
-
 .stormcomponent {
   padding-left: 40px;
   padding-top: 5px;
-  height: 40px;
+  min-height: 40px;
 }
 .stormcomponent a {
   font-weight: bold;
   margin-right: 4px;
 }
+.stormcomponent > ul li {
+  line-height: 1.2em;
+}
+.stormcomponent > ul li a {
+  font-size: 88%;
+  font-weight: normal;
+}
 
 #stormorganization-item {
   background: transparent url(images/organizations.png) no-repeat top left;
diff --git a/modules/storm/stormexpense/stormexpense.theme.inc b/modules/storm/stormexpense/stormexpense.theme.inc
index ad2e9a6..2292547 100644
--- a/modules/storm/stormexpense/stormexpense.theme.inc
+++ b/modules/storm/stormexpense/stormexpense.theme.inc
@@ -129,6 +129,27 @@ function theme_stormexpense_view($node, $teaser = FALSE, $page = FALSE) {
     '#weight' => 4,
   );
 
+  $node->content['group1']['author'] = array(
+    '#prefix' => '<div class="author">',
+    '#suffix' => '</div>',
+    '#value' => theme('storm_view_item', t('Submitted by'), theme('username', $node)),
+    '#weight' => 5,
+  );
+  $node->content['group1']['created'] = array(
+    '#prefix' => '<div class="created">',
+    '#suffix' => '</div>',
+    '#value' => theme('storm_view_item', t('Created'), format_date($node->created, 'small')),
+    '#weight' => 6,
+  );
+  if ($node->changed != $node->created) {
+    $node->content['group1']['modified'] = array(
+      '#prefix' => '<div class="modified">',
+      '#suffix' => '</div>',
+      '#value' => theme('storm_view_item', t('Modified'), format_date($node->changed, 'small')),
+      '#weight' => 7,
+    );
+  }
+
   $node->content['group2'] = array(
     '#prefix' => '<div class="stormfields">',
     '#suffix' => '</div>',
@@ -195,32 +216,6 @@ function theme_stormexpense_view($node, $teaser = FALSE, $page = FALSE) {
     );
   }
 
-  $node->content['group_item'] = array(
-    '#prefix' => '<div class="stormfields">',
-    '#suffix' => '</div>',
-    '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group_item') : -20,
-  );
-  $node->content['group_item']['author'] = array(
-    '#prefix' => '<div class="author">',
-    '#suffix' => '</div>',
-    '#value' => theme('storm_view_item', t('Submitted by'), theme('username', $node)),
-    '#weight' => 1,
-  );
-  $node->content['group_item']['created'] = array(
-    '#prefix' => '<div class="created">',
-    '#suffix' => '</div>',
-    '#value' => theme('storm_view_item', t('Created'), format_date($node->created, 'small')),
-    '#weight' => 2,
-  );
-  if ($node->changed != $node->created) {
-    $node->content['group_item']['modified'] = array(
-      '#prefix' => '<div class="modified">',
-      '#suffix' => '</div>',
-      '#value' => theme('storm_view_item', t('Modified'), format_date($node->changed, 'small')),
-      '#weight' => 3,
-    );
-  }
-
   $node->content['body_field'] = array(
     '#prefix' => '<div class="stormbody">',
     '#suffix' => '</div>',
diff --git a/themes/zuitedesk/css/suitedesk.css b/themes/zuitedesk/css/suitedesk.css
index ff2cbb2..4d2de78 100644
--- a/themes/zuitedesk/css/suitedesk.css
+++ b/themes/zuitedesk/css/suitedesk.css
@@ -342,7 +342,7 @@ div.stormdashboard {
 }
 div.stormdashboard dt.stormcomponent {
   background-color: #e2e2e2 !important;
-  background-position: 8px 6px !important;
+  background-position: 8px 8px !important;
   margin: 0 3px 6px;
   padding: 10px 0 10px 50px;
   white-space: nowrap;
@@ -1588,6 +1588,14 @@ table.formgroup_access .description {
   margin-top: .75em;
 }
 
+form.stormcomponent_node_form #edit-preview {
+  display: none;
+}
+tr.formgroup {
+  background-color: #ffffff !important;
+  border: none !important;
+}
+
 /*
  * "SuiteDesk Invoice" node.
  */