diff --git a/storm.css b/storm.css
index 6042f2b..48088dc 100644
--- a/storm.css
+++ b/storm.css
@@ -127,66 +127,66 @@ float: left;
 width: 50%;
 }
 
-dt.stormcomponent {
+div.stormcomponent {
 padding-left: 40px;
 padding-top: 10px;
 height: 40px;
 }
 
-dt.stormcomponent a {
+div.stormcomponent a {
 font-weight: bold;
 margin-right: 5px;
 }
 
-dt#stormorganizations {
+div#stormorganizations {
 background: transparent url(images/organizations.png) no-repeat top left;
 }
 
-dt#stormprojects {
+div#stormprojects {
 background: transparent url(images/projects.png) no-repeat top left;
 }
 
-dt#stormtasks {
+div#stormtasks {
 background: transparent url(images/tasks.png) no-repeat top left;
 }
 
-dt#stormtickets {
+div#stormtickets {
 background: transparent url(images/tickets.png) no-repeat top left;
 }
 
-dt#stormpeople {
+div#stormpeople {
 background: transparent url(images/people.png) no-repeat top left;
 }
 
-dt#stormteammembers {
+div#stormteammembers {
 background: transparent url(images/teammembers.png) no-repeat top left;
 }
 
-dt#stormknowledgebase {
+div#stormknowledgebase {
 background: transparent url(images/knowledgebase.png) no-repeat top left;
 }
 
-dt#stormtimetrackings {
+div#stormtimetrackings {
 background: transparent url(images/timetrackings.png) no-repeat top left;
 }
 
-dt#stormnotes {
+div#stormnotes {
 background: transparent url(images/notes.png) no-repeat top left;
 }
 
-dt#storminvoices {
+div#storminvoices {
 background: transparent url(images/invoices.png) no-repeat top left;
 }
 
-dt#stormexpenses {
+div#stormexpenses {
 background: transparent url(images/expenses.png) no-repeat top left;
 }
 
-dt#stormattributes {
+div#stormattributes {
 background: transparent url(images/attributes.png) no-repeat top left;
 }
 
-dt#stormconfiguration {
+div#stormconfiguration {
 background: transparent url(images/configuration.png) no-repeat top left;
 }
 
diff --git a/storm.theme.inc b/storm.theme.inc
index 813a6ad..7120db8 100644
--- a/storm.theme.inc
+++ b/storm.theme.inc
@@ -94,99 +94,97 @@ function theme_storm_view_item($label, $value) {
 
 function theme_storm_dashboard() {
   $o = '<div id="stormdashboard">';
-  $o .= '<div class="stormdashboard">';
-  $o .= '<dl class="stormdashboard">';
+  $o .= '<div class="stormdashboard" id="dashboard-left">';
   if (module_exists('stormorganization')) {
-    $o .= '<dt class="stormcomponent" id="stormorganizations">'. l(t('Organizations'), 'storm/organizations');
+    $o .= '<div class="stormcomponent" id="stormorganizations">'. l(t('Organizations'), 'storm/organizations');
     $i = new stdClass();
     $i->type = 'stormorganization';
     $o .= storm_icon_add_node($i, $_GET);
-    $o .= '</dt>';
+    $o .= '</div>';
   }
   if (module_exists('stormperson')) {
-    $o .= '<dt class="stormcomponent" id="stormpeople">'. l(t('People'), 'storm/people');
+    $o .= '<div class="stormcomponent" id="stormpeople">'. l(t('People'), 'storm/people');
     $i = new stdClass();
     $i->type = 'stormperson';
     $o .= storm_icon_add_node($i, $_GET);
-    $o .= '</dt>';
+    $o .= '</div>';
   }
   if (module_exists('stormteammember')) {
-    $o .= '<dt class="stormcomponent" id="stormteammembers">'. l(t('Team members'), 'storm/teammembers');
+    $o .= '<div class="stormcomponent" id="stormteammembers">'. l(t('Team members'), 'storm/teammembers');
     $i = new stdClass();
     $i->type = 'stormteammember';
     $o .= storm_icon_add('storm/teammembers/add', $i, $_GET);
-    $o .= '</dt>';
+    $o .= '</div>';
   }
   if (module_exists('stormproject')) {
-    $o .= '<dt class="stormcomponent" id="stormprojects">'. l(t('Projects'), 'storm/projects');
+    $o .= '<div class="stormcomponent" id="stormprojects">'. l(t('Projects'), 'storm/projects');
     $i = new stdClass();
     $i->type = 'stormproject';
     $o .= storm_icon_add_node($i, $_GET);
-    $o .= '</dt>';
+    $o .= '</div>';
   }
   if (module_exists('stormtask')) {
-    $o .= '<dt class="stormcomponent" id="stormtasks">'. l(t('Tasks'), 'storm/tasks');
+    $o .= '<div class="stormcomponent" id="stormtasks">'. l(t('Tasks'), 'storm/tasks');
     $i = new stdClass();
     $i->type = 'stormtask';
     $o .= storm_icon_add_node($i, $_GET);
-    $o .= '</dt>';
+    $o .= '</div>';
   }
   if (module_exists('stormticket')) {
-    $o .= '<dt class="stormcomponent" id="stormtickets">'. l(t('Tickets'), 'storm/tickets');
+    $o .= '<div class="stormcomponent" id="stormtickets">'. l(t('Tickets'), 'storm/tickets');
     $i = new stdClass();
     $i->type = 'stormticket';
     $o .= storm_icon_add_node($i, $_GET);
-    $o .= '</dt>';
+    $o .= '</div>';
   }
   if (module_exists('stormtimetracking')) {
-    $o .= '<dt class="stormcomponent" id="stormtimetrackings">'. l(t('Timetrackings'), 'storm/timetrackings');
+    $o .= '<div class="stormcomponent" id="stormtimetrackings">'. l(t('Timetrackings'), 'storm/timetrackings');
     $i = new stdClass();
     $i->type = 'stormtimetracking';
     $o .= storm_icon_add_node($i, $_GET);
-    $o .= '</dt>';
+    $o .= '</div>';
   }
   $o .= '</div>';
 
-  $o .= '<div class="stormdashboard">';
+  $o .= '<div class="stormdashboard" id="dashboard-right">';
   if (module_exists('stormnote')) {
-    $o .= '<dt class="stormcomponent" id="stormnotes">'. l(t('Notes'), 'storm/notes');
+    $o .= '<div class="stormcomponent" id="stormnotes">'. l(t('Notes'), 'storm/notes');
     $i = new stdClass();
     $i->type = 'stormnote';
     $o .= storm_icon_add_node($i, $_GET);
-    $o .= '</dt>';
+    $o .= '</div>';
   }
 
   if (module_exists('storminvoice')) {
-    $o .= '<dt class="stormcomponent" id="storminvoices">'. l(t('Invoices'), 'storm/invoices');
+    $o .= '<div class="stormcomponent" id="storminvoices">'. l(t('Invoices'), 'storm/invoices');
     $i = new stdClass();
     $i->type = 'storminvoice';
     $o .= storm_icon_add_node($i, $_GET);
-    $o .= '</dt>';
+    $o .= '</div>';
   }
 
   if (module_exists('stormexpense')) {
-    $o .= '<dt class="stormcomponent" id="stormexpenses">'. l(t('Expenses'), 'storm/expenses');
+    $o .= '<div class="stormcomponent" id="stormexpenses">'. l(t('Expenses'), 'storm/expenses');
     $i = new stdClass();
     $i->type = 'stormexpense';
     $o .= storm_icon_add_node($i, $_GET);
-    $o .= '</dt>';
+    $o .= '</div>';
   }
   if (module_exists('stormknowledgebase')) {
-    $o .= '<dt class="stormcomponent" id="stormknowledgebase">'. l(t('Knowledge base'), 'storm/knowledgebase');
+    $o .= '<div class="stormcomponent" id="stormknowledgebase">'. l(t('Knowledge base'), 'storm/knowledgebase');
     $i = new stdClass();
     $i->type = 'stormknowledgebase';
     $o .= storm_icon_add_node($i, $_GET);
-    $o .= '</dt>';
+    $o .= '</div>';
   }
   if (module_exists('stormattribute')) {
-    $o .= '<dt class="stormcomponent" id="stormattributes">'. l(t('Attributes'), 'storm/attributes');
+    $o .= '<div class="stormcomponent" id="stormattributes">'. l(t('Attributes'), 'storm/attributes');
     $i = new stdClass();
     $i->type = 'stormattribute';
     $o .= storm_icon_add('storm/attributes/add', $i, $_GET);
-    $o .= '</dt>';
+    $o .= '</div>';
   }
-  $o .= '<dt class="stormcomponent" id="stormconfiguration">'. l(t('Configuration'), 'admin/storm') .'</dt>';
-  $o .= '</dl>';
+  $o .= '<div class="stormcomponent" id="stormconfiguration">'. l(t('Configuration'), 'admin/storm') .'</div>';
   $o .= '</div>';
   $o .= '</div>';
   return $o;