--- location.inc	2006-10-09 17:05:45.000000000 -0400
+++ location.inc~	2006-10-09 16:58:23.000000000 -0400
@@ -319,7 +319,7 @@ function location_form($fields = array()
 
   if (in_array('name', $fields)) {
     $form['name'] = array(
-        '#prefix' => '<div id="location-name" class="container-inline">',
+        '#prefix' => '<div id="location_name" class="container-inline">',
         '#suffix' => "</div>\n",
         '#type' => 'textfield',
         '#title' => t('Location name'),
@@ -333,7 +333,7 @@ function location_form($fields = array()
   }
   if (in_array('street', $fields)) {
     $form['street'] = array(
-        '#prefix' => '<div id="location-address" class="container-inline">',
+        '#prefix' => '<div id="location_address" class="container-inline">',
         '#suffix' => "</div>\n",
         '#type' => 'textfield',
         '#title' => t('Street'),
@@ -343,7 +343,7 @@ function location_form($fields = array()
         '#required' => in_array('street', $required_fields)
         );
     $form['additional'] = array(
-        '#prefix' => '<div id="location-additional" class="container-inline">',
+        '#prefix' => '<div id="location_additional" class="container-inline">',
         '#suffix' => "</div>\n",
         '#type' => 'textfield',
         '#title' => t('Additional'),
@@ -354,7 +354,7 @@ function location_form($fields = array()
   }
   if (in_array('city', $fields)) {
     $form['city'] = array(
-        '#prefix' => '<div id="location-city" class="container-inline">',
+        '#prefix' => '<div id="location_city" class="container-inline">',
         '#suffix' => "</div>\n",
         '#type' => 'textfield',
         '#title' => t('City'),
@@ -375,13 +375,13 @@ function location_form($fields = array()
     }
     else {
       $form['province'] = _location_province_select_options(isset($prefilled_values['province']) ? $prefilled_values['province'] : '', in_array('province', $required_fields), in_array('country', array_keys($suppressed_values)) ? $suppressed_values['country'] : NULL);
-      $form['province']['#prefix'] = '<div id="location-province" class="container-inline">';
+      $form['province']['#prefix'] = '<div id="location_province" class="container-inline">';
       $form['province']['#suffix'] = "</div>\n";
     }
   }
   if (in_array('postal_code', $fields)) {
     $form['postal_code'] = array(
-        '#prefix' => '<div id="location-postal_code" class="container-inline">',
+        '#prefix' => '<div id="location_postal_code" class="container-inline">',
         '#suffix' => "</div>\n",
         '#type' => 'textfield',
         '#title' => t('Postal code'),
@@ -400,7 +400,7 @@ function location_form($fields = array()
     }
     else {
       $form['country'] = _location_country_select_options(isset($prefilled_values['country']) ? $prefilled_values['country'] : '', in_array('country', $required_fields), $function);
-      $form['country']['#prefix'] = '<div id="location-country" class="container-inline">';
+      $form['country']['#prefix'] = '<div id="location_country" class="container-inline">';
       $form['country']['#suffix'] = "</div>\n";
     }
   }
@@ -418,16 +418,14 @@ function location_latlon_form($descripti
   }
   
   $form['latitude'] = array(
-      '#prefix' => '<div id="location-latitude" class="container-inline">',
+      '#prefix' => '<div class="container-inline">',
       '#type' => 'textfield',
       '#title' => t('Latitude'),
       '#default_value' => isset($prefilled_values['latitude']) ? $prefilled_values['latitude'] : '',
       '#size' => 64,
-      '#maxlength' => 64,
-      '#suffix' => '</div>'
+      '#maxlength' => 64
       );
   $form['longitude'] = array(
-      '#prefix' => '<div id="location-longitude" class="container-inline">',
       '#type' => 'textfield',
       '#title' => t('Longitude'),
       '#default_value' => isset($prefilled_values['longitude']) ? $prefilled_values['longitude'] : '',