diff --git a/location.theme b/location.theme
index 00926fb..0de6a6b 100644
--- a/location.theme
+++ b/location.theme
@@ -188,15 +188,23 @@ function theme_location_form(&$form) {
     if ($form[$field_name]['#type'] == 'markup') {
       $row[] = array('data' => $form[$field_name]['#value'], 'colspan' => 2);
     }
+    elseif (isset($form[$field_name]['gmap'])) {
+      $row[] = array(
+        'data' => drupal_render($form[$field_name]),
+        'align' => 'left',
+        'colspan' => 2,
+      );
+      $rows[] = array('data' => $row);
+    }
     elseif ($form[$field_name]['#type'] != 'hidden') {
       $required = !empty($form[$field_name]['#required']) ? '<span class="form-required" title="'. t('This field is required.') .'">*</span>' : '';
-      $row[] = array('align' => 'right', 'data' => '<div class="form-item"><label'. ($form[$field_name]['#id'] ? ' for="'. $form[$field_name]['#id'] .'" ' : '') .'>'. filter_xss_admin($form[$field_name]['#title']) .": $required</label></div>");
+      $row[] = array('align' => 'right', 'valign' => 'top', 'data' => '<div class="form-item"><label'. ($form[$field_name]['#id'] ? ' for="'. $form[$field_name]['#id'] .'" ' : '') .'>'. filter_xss_admin($form[$field_name]['#title']) .": $required</label></div>");
       unset($form[$field_name]['#title']);
       $description = $form[$field_name]['#description'];
       $row[] = array('align' => 'left', 'data' => drupal_render($form[$field_name]));
       $rows[] = array(
         'data' => $row,
-        'class' => 'odd'
+        //'class' => 'odd' - theme_table() makes class= even/odd
       );
     }
   }