diff --git a/modules/farm/farm_crop/farm_crop.field_group.inc b/modules/farm/farm_crop/farm_crop.field_group.inc
index f7446e73a..27bb078cc 100644
--- a/modules/farm/farm_crop/farm_crop.field_group.inc
+++ b/modules/farm/farm_crop/farm_crop.field_group.inc
@@ -165,7 +165,7 @@ function farm_crop_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Files',
-    'weight' => '5',
+    'weight' => '6',
     'children' => array(
       0 => 'field_farm_files',
       1 => 'field_farm_images',
@@ -193,7 +193,7 @@ function farm_crop_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Files',
-    'weight' => '5',
+    'weight' => '6',
     'children' => array(
       0 => 'field_farm_files',
       1 => 'field_farm_images',
@@ -314,7 +314,7 @@ function farm_crop_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Inventory',
-    'weight' => '4',
+    'weight' => '5',
     'children' => array(
       0 => 'field_farm_inventory',
     ),
@@ -340,7 +340,7 @@ function farm_crop_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Inventory',
-    'weight' => '4',
+    'weight' => '5',
     'children' => array(
       0 => 'field_farm_inventory',
     ),
@@ -384,41 +384,42 @@ function farm_crop_field_group_info() {
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
-  $field_group->identifier = 'group_farm_movement|log|farm_seeding|form';
-  $field_group->group_name = 'group_farm_movement';
+  $field_group->identifier = 'group_farm_location|log|farm_seeding|form';
+  $field_group->group_name = 'group_farm_location';
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_seeding';
   $field_group->mode = 'form';
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
-    'label' => 'Movement',
-    'weight' => '3',
+    'label' => 'Location',
+    'weight' => '2',
     'children' => array(
       0 => 'field_farm_movement',
+      1 => 'group_farm_movement',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav_item',
     'format_settings' => array(
       'formatter' => '',
       'instance_settings' => array(
-        'classes' => 'group-farm-movement field-group-field_group_easy_responsive_tabs_nav_item',
+        'classes' => 'group-farm-location field-group-field_group_easy_responsive_tabs_nav_item',
         'required_fields' => 1,
       ),
     ),
   );
-  $field_groups['group_farm_movement|log|farm_seeding|form'] = $field_group;
+  $field_groups['group_farm_location|log|farm_seeding|form'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
-  $field_group->identifier = 'group_farm_movement|log|farm_transplanting|form';
-  $field_group->group_name = 'group_farm_movement';
+  $field_group->identifier = 'group_farm_location|log|farm_transplanting|form';
+  $field_group->group_name = 'group_farm_location';
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_transplanting';
   $field_group->mode = 'form';
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
-    'label' => 'Movement',
-    'weight' => '3',
+    'label' => 'Location',
+    'weight' => '2',
     'children' => array(
       0 => 'field_farm_movement',
     ),
@@ -426,12 +427,12 @@ function farm_crop_field_group_info() {
     'format_settings' => array(
       'formatter' => '',
       'instance_settings' => array(
-        'classes' => 'group-farm-movement field-group-field_group_easy_responsive_tabs_nav_item',
+        'classes' => 'group-farm-location field-group-field_group_easy_responsive_tabs_nav_item',
         'required_fields' => 1,
       ),
     ),
   );
-  $field_groups['group_farm_movement|log|farm_transplanting|form'] = $field_group;
+  $field_groups['group_farm_location|log|farm_transplanting|form'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -444,7 +445,7 @@ function farm_crop_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Quantity',
-    'weight' => '2',
+    'weight' => '3',
     'children' => array(
       0 => 'field_farm_quantity',
     ),
@@ -470,7 +471,7 @@ function farm_crop_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Quantity',
-    'weight' => '2',
+    'weight' => '3',
     'children' => array(
       0 => 'field_farm_quantity',
     ),
@@ -537,9 +538,9 @@ function farm_crop_field_group_info() {
     'children' => array(
       0 => 'group_farm_files',
       1 => 'group_farm_general',
-      2 => 'group_farm_movement',
-      3 => 'group_farm_quantity',
-      4 => 'group_farm_inventory',
+      2 => 'group_farm_quantity',
+      3 => 'group_farm_inventory',
+      4 => 'group_farm_location',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav',
     'format_settings' => array(
@@ -579,6 +580,7 @@ function farm_crop_field_group_info() {
       2 => 'group_farm_movement',
       3 => 'group_farm_quantity',
       4 => 'group_farm_inventory',
+      5 => 'group_farm_location',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav',
     'format_settings' => array(
@@ -608,7 +610,7 @@ function farm_crop_field_group_info() {
   t('General');
   t('Inventory');
   t('Lineage');
-  t('Movement');
+  t('Location');
   t('Quantity');
   t('Tabs');
 
diff --git a/modules/farm/farm_crop/farm_crop.info b/modules/farm/farm_crop/farm_crop.info
index 0c8982345..4bcfd63a0 100644
--- a/modules/farm/farm_crop/farm_crop.info
+++ b/modules/farm/farm_crop/farm_crop.info
@@ -66,8 +66,8 @@ features[field_group][] = group_farm_general|log|farm_transplanting|form
 features[field_group][] = group_farm_inventory|log|farm_seeding|form
 features[field_group][] = group_farm_inventory|log|farm_transplanting|form
 features[field_group][] = group_farm_lineage|farm_asset|planting|form
-features[field_group][] = group_farm_movement|log|farm_seeding|form
-features[field_group][] = group_farm_movement|log|farm_transplanting|form
+features[field_group][] = group_farm_location|log|farm_seeding|form
+features[field_group][] = group_farm_location|log|farm_transplanting|form
 features[field_group][] = group_farm_quantity|log|farm_seeding|form
 features[field_group][] = group_farm_quantity|log|farm_transplanting|form
 features[field_group][] = group_farm_tabs|farm_asset|planting|form
diff --git a/modules/farm/farm_equipment/farm_equipment.field_group.inc b/modules/farm/farm_equipment/farm_equipment.field_group.inc
index 44f452800..5f756ea57 100644
--- a/modules/farm/farm_equipment/farm_equipment.field_group.inc
+++ b/modules/farm/farm_equipment/farm_equipment.field_group.inc
@@ -18,12 +18,14 @@ function farm_equipment_field_group_info() {
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_maintenance';
   $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_references';
+  $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Assets',
     'weight' => '2',
     'children' => array(
       0 => 'field_farm_asset',
+      1 => 'field_farm_movement',
+      2 => 'group_farm_movement',
     ),
     'format_type' => 'fieldset',
     'format_settings' => array(
@@ -136,7 +138,7 @@ function farm_equipment_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Files',
-    'weight' => '5',
+    'weight' => '6',
     'children' => array(
       0 => 'field_farm_files',
       1 => 'field_farm_images',
@@ -225,7 +227,7 @@ function farm_equipment_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Inventory',
-    'weight' => '4',
+    'weight' => '5',
     'children' => array(
       0 => 'field_farm_inventory',
     ),
@@ -240,58 +242,6 @@ function farm_equipment_field_group_info() {
   );
   $field_groups['group_farm_inventory|log|farm_maintenance|form'] = $field_group;
 
-  $field_group = new stdClass();
-  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
-  $field_group->api_version = 1;
-  $field_group->identifier = 'group_farm_movement|log|farm_maintenance|form';
-  $field_group->group_name = 'group_farm_movement';
-  $field_group->entity_type = 'log';
-  $field_group->bundle = 'farm_maintenance';
-  $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_tabs';
-  $field_group->data = array(
-    'label' => 'Movement',
-    'weight' => '3',
-    'children' => array(
-      0 => 'field_farm_movement',
-    ),
-    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
-    'format_settings' => array(
-      'formatter' => '',
-      'instance_settings' => array(
-        'classes' => 'group-farm-movement field-group-field_group_easy_responsive_tabs_nav_item',
-        'required_fields' => 1,
-      ),
-    ),
-  );
-  $field_groups['group_farm_movement|log|farm_maintenance|form'] = $field_group;
-
-  $field_group = new stdClass();
-  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
-  $field_group->api_version = 1;
-  $field_group->identifier = 'group_farm_references|log|farm_maintenance|form';
-  $field_group->group_name = 'group_farm_references';
-  $field_group->entity_type = 'log';
-  $field_group->bundle = 'farm_maintenance';
-  $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_tabs';
-  $field_group->data = array(
-    'label' => 'References',
-    'weight' => '2',
-    'children' => array(
-      0 => 'group_farm_assets',
-    ),
-    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
-    'format_settings' => array(
-      'formatter' => '',
-      'instance_settings' => array(
-        'classes' => 'group-farm-references field-group-field_group_easy_responsive_tabs_nav_item',
-        'required_fields' => 1,
-      ),
-    ),
-  );
-  $field_groups['group_farm_references|log|farm_maintenance|form'] = $field_group;
-
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -341,10 +291,10 @@ function farm_equipment_field_group_info() {
     'label' => 'Tabs',
     'weight' => '0',
     'children' => array(
-      0 => 'group_farm_files',
-      1 => 'group_farm_general',
-      2 => 'group_farm_references',
-      3 => 'group_farm_movement',
+      0 => 'group_farm_assets',
+      1 => 'group_farm_files',
+      2 => 'group_farm_general',
+      3 => 'group_farm_references',
       4 => 'group_farm_inventory',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav',
@@ -375,8 +325,6 @@ function farm_equipment_field_group_info() {
   t('Files');
   t('General');
   t('Inventory');
-  t('Movement');
-  t('References');
   t('Tabs');
 
   return $field_groups;
diff --git a/modules/farm/farm_equipment/farm_equipment.info b/modules/farm/farm_equipment/farm_equipment.info
index c789628cb..d9b231649 100644
--- a/modules/farm/farm_equipment/farm_equipment.info
+++ b/modules/farm/farm_equipment/farm_equipment.info
@@ -47,8 +47,6 @@ features[field_group][] = group_farm_files|log|farm_maintenance|form
 features[field_group][] = group_farm_general|farm_asset|equipment|form
 features[field_group][] = group_farm_general|log|farm_maintenance|form
 features[field_group][] = group_farm_inventory|log|farm_maintenance|form
-features[field_group][] = group_farm_movement|log|farm_maintenance|form
-features[field_group][] = group_farm_references|log|farm_maintenance|form
 features[field_group][] = group_farm_tabs|farm_asset|equipment|form
 features[field_group][] = group_farm_tabs|log|farm_maintenance|form
 features[field_instance][] = farm_asset-equipment-field_farm_description
diff --git a/modules/farm/farm_livestock/farm_livestock.field_group.inc b/modules/farm/farm_livestock/farm_livestock.field_group.inc
index 280bef02b..1425d07e8 100644
--- a/modules/farm/farm_livestock/farm_livestock.field_group.inc
+++ b/modules/farm/farm_livestock/farm_livestock.field_group.inc
@@ -107,7 +107,7 @@ function farm_livestock_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Files',
-    'weight' => '4',
+    'weight' => '5',
     'children' => array(
       0 => 'field_farm_files',
       1 => 'field_farm_images',
@@ -255,7 +255,7 @@ function farm_livestock_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Inventory',
-    'weight' => '3',
+    'weight' => '4',
     'children' => array(
       0 => 'field_farm_inventory',
     ),
@@ -299,14 +299,14 @@ function farm_livestock_field_group_info() {
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
-  $field_group->identifier = 'group_farm_movement|log|farm_medical|form';
-  $field_group->group_name = 'group_farm_movement';
+  $field_group->identifier = 'group_farm_location|log|farm_medical|form';
+  $field_group->group_name = 'group_farm_location';
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_medical';
   $field_group->mode = 'form';
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
-    'label' => 'Movement',
+    'label' => 'Location',
     'weight' => '2',
     'children' => array(
       0 => 'field_farm_movement',
@@ -315,12 +315,12 @@ function farm_livestock_field_group_info() {
     'format_settings' => array(
       'formatter' => '',
       'instance_settings' => array(
-        'classes' => 'group-farm-movement field-group-field_group_easy_responsive_tabs_nav_item',
+        'classes' => 'group-farm-location field-group-field_group_easy_responsive_tabs_nav_item',
         'required_fields' => 1,
       ),
     ),
   );
-  $field_groups['group_farm_movement|log|farm_medical|form'] = $field_group;
+  $field_groups['group_farm_location|log|farm_medical|form'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -377,6 +377,7 @@ function farm_livestock_field_group_info() {
       1 => 'group_farm_general',
       2 => 'group_farm_inventory',
       3 => 'group_farm_movement',
+      4 => 'group_farm_location',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav',
     'format_settings' => array(
@@ -408,7 +409,7 @@ function farm_livestock_field_group_info() {
   t('Individual');
   t('Inventory');
   t('Lineage');
-  t('Movement');
+  t('Location');
   t('Tabs');
 
   return $field_groups;
diff --git a/modules/farm/farm_livestock/farm_livestock.info b/modules/farm/farm_livestock/farm_livestock.info
index bd2630325..662181f19 100644
--- a/modules/farm/farm_livestock/farm_livestock.info
+++ b/modules/farm/farm_livestock/farm_livestock.info
@@ -59,7 +59,7 @@ features[field_group][] = group_farm_id|farm_asset|animal|form
 features[field_group][] = group_farm_individual|farm_asset|animal|form
 features[field_group][] = group_farm_inventory|log|farm_medical|form
 features[field_group][] = group_farm_lineage|farm_asset|animal|form
-features[field_group][] = group_farm_movement|log|farm_medical|form
+features[field_group][] = group_farm_location|log|farm_medical|form
 features[field_group][] = group_farm_tabs|farm_asset|animal|form
 features[field_group][] = group_farm_tabs|log|farm_medical|form
 features[field_instance][] = farm_asset-animal-field_farm_animal_castrated
diff --git a/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc b/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc
index 7945c94e6..0a9e33e9c 100644
--- a/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc
+++ b/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc
@@ -250,7 +250,7 @@ function farm_log_activity_field_default_field_instances() {
           'view_mode' => 'full',
         ),
         'type' => 'field_collection_fields',
-        'weight' => 4,
+        'weight' => 5,
       ),
     ),
     'entity_type' => 'log',
@@ -363,7 +363,7 @@ function farm_log_activity_field_default_field_instances() {
       'module' => 'field_collection',
       'settings' => array(),
       'type' => 'field_collection_embed',
-      'weight' => 17,
+      'weight' => 15,
     ),
   );
 
@@ -396,7 +396,7 @@ function farm_log_activity_field_default_field_instances() {
       'module' => 'field_collection',
       'settings' => array(),
       'type' => 'field_collection_embed',
-      'weight' => 4,
+      'weight' => 14,
     ),
   );
 
diff --git a/modules/farm/farm_log/farm_log_activity/farm_log_activity.field_group.inc b/modules/farm/farm_log/farm_log_activity/farm_log_activity.field_group.inc
index 95387ce16..cece9dc09 100644
--- a/modules/farm/farm_log/farm_log_activity/farm_log_activity.field_group.inc
+++ b/modules/farm/farm_log/farm_log_activity/farm_log_activity.field_group.inc
@@ -18,7 +18,7 @@ function farm_log_activity_field_group_info() {
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_activity';
   $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_references';
+  $field_group->parent_name = 'group_farm_location';
   $field_group->data = array(
     'label' => 'Areas',
     'weight' => '4',
@@ -47,14 +47,16 @@ function farm_log_activity_field_group_info() {
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_activity';
   $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_references';
+  $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Assets',
     'weight' => '2',
     'children' => array(
       0 => 'field_farm_asset',
+      1 => 'field_farm_movement',
+      2 => 'field_farm_membership',
     ),
-    'format_type' => 'fieldset',
+    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
     'format_settings' => array(
       'label' => 'Assets',
       'instance_settings' => array(
@@ -137,7 +139,7 @@ function farm_log_activity_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Files',
-    'weight' => '8',
+    'weight' => '6',
     'children' => array(
       0 => 'field_farm_files',
       1 => 'field_farm_images',
@@ -193,50 +195,27 @@ function farm_log_activity_field_group_info() {
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_activity';
   $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_tabs';
+  $field_group->parent_name = 'group_farm_location';
   $field_group->data = array(
     'label' => 'Geometry',
-    'weight' => '4',
+    'weight' => '5',
     'children' => array(
       0 => 'field_farm_geofield',
     ),
-    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
+    'format_type' => 'fieldset',
     'format_settings' => array(
-      'formatter' => '',
+      'label' => 'Geometry',
       'instance_settings' => array(
-        'classes' => 'group-farm-geometry field-group-field_group_easy_responsive_tabs_nav_item',
         'required_fields' => 1,
+        'id' => '',
+        'classes' => '',
+        'description' => '',
       ),
+      'formatter' => 'collapsed',
     ),
   );
   $field_groups['group_farm_geometry|log|farm_activity|form'] = $field_group;
 
-  $field_group = new stdClass();
-  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
-  $field_group->api_version = 1;
-  $field_group->identifier = 'group_farm_group|log|farm_activity|form';
-  $field_group->group_name = 'group_farm_group';
-  $field_group->entity_type = 'log';
-  $field_group->bundle = 'farm_activity';
-  $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_tabs';
-  $field_group->data = array(
-    'label' => 'Group Membership',
-    'weight' => '6',
-    'children' => array(
-      0 => 'field_farm_membership',
-    ),
-    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
-    'format_settings' => array(
-      'formatter' => '',
-      'instance_settings' => array(
-        'classes' => 'group-farm-group field-group-field_group_easy_responsive_tabs_nav_item',
-        'required_fields' => 1,
-      ),
-    ),
-  );
-  $field_groups['group_farm_group|log|farm_activity|form'] = $field_group;
-
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -248,7 +227,7 @@ function farm_log_activity_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Inventory',
-    'weight' => '7',
+    'weight' => '5',
     'children' => array(
       0 => 'field_farm_inventory',
     ),
@@ -256,7 +235,7 @@ function farm_log_activity_field_group_info() {
     'format_settings' => array(
       'formatter' => '',
       'instance_settings' => array(
-        'classes' => 'group-farm-inventory field-group-field_group_easy_responsive_tabs_nav_item',
+        'classes' => '',
         'required_fields' => 1,
       ),
     ),
@@ -266,28 +245,29 @@ function farm_log_activity_field_group_info() {
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
-  $field_group->identifier = 'group_farm_movement|log|farm_activity|form';
-  $field_group->group_name = 'group_farm_movement';
+  $field_group->identifier = 'group_farm_location|log|farm_activity|form';
+  $field_group->group_name = 'group_farm_location';
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_activity';
   $field_group->mode = 'form';
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
-    'label' => 'Movement',
-    'weight' => '5',
+    'label' => 'Location',
+    'weight' => '3',
     'children' => array(
-      0 => 'field_farm_movement',
+      0 => 'group_farm_areas',
+      1 => 'group_farm_geometry',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav_item',
     'format_settings' => array(
       'formatter' => '',
       'instance_settings' => array(
-        'classes' => 'group-farm-movement field-group-field_group_easy_responsive_tabs_nav_item',
+        'classes' => 'group-farm-location field-group-field_group_easy_responsive_tabs_nav_item',
         'required_fields' => 1,
       ),
     ),
   );
-  $field_groups['group_farm_movement|log|farm_activity|form'] = $field_group;
+  $field_groups['group_farm_location|log|farm_activity|form'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -300,7 +280,7 @@ function farm_log_activity_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Quantity',
-    'weight' => '3',
+    'weight' => '4',
     'children' => array(
       0 => 'field_farm_quantity',
     ),
@@ -315,33 +295,6 @@ function farm_log_activity_field_group_info() {
   );
   $field_groups['group_farm_quantity|log|farm_activity|form'] = $field_group;
 
-  $field_group = new stdClass();
-  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
-  $field_group->api_version = 1;
-  $field_group->identifier = 'group_farm_references|log|farm_activity|form';
-  $field_group->group_name = 'group_farm_references';
-  $field_group->entity_type = 'log';
-  $field_group->bundle = 'farm_activity';
-  $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_tabs';
-  $field_group->data = array(
-    'label' => 'References',
-    'weight' => '2',
-    'children' => array(
-      0 => 'group_farm_areas',
-      1 => 'group_farm_assets',
-    ),
-    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
-    'format_settings' => array(
-      'formatter' => '',
-      'instance_settings' => array(
-        'classes' => 'group-farm-references field-group-field_group_easy_responsive_tabs_nav_item',
-        'required_fields' => 1,
-      ),
-    ),
-  );
-  $field_groups['group_farm_references|log|farm_activity|form'] = $field_group;
-
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -355,14 +308,12 @@ function farm_log_activity_field_group_info() {
     'label' => 'Tabs',
     'weight' => '0',
     'children' => array(
-      0 => 'group_farm_files',
-      1 => 'group_farm_general',
-      2 => 'group_farm_references',
-      3 => 'group_farm_geometry',
-      4 => 'group_farm_movement',
-      5 => 'group_farm_inventory',
-      6 => 'group_farm_group',
-      7 => 'group_farm_quantity',
+      0 => 'group_farm_assets',
+      1 => 'group_farm_files',
+      2 => 'group_farm_general',
+      3 => 'group_farm_inventory',
+      4 => 'group_farm_quantity',
+      5 => 'group_farm_location',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav',
     'format_settings' => array(
@@ -393,11 +344,9 @@ function farm_log_activity_field_group_info() {
   t('Files');
   t('General');
   t('Geometry');
-  t('Group Membership');
   t('Inventory');
-  t('Movement');
+  t('Location');
   t('Quantity');
-  t('References');
   t('Tabs');
 
   return $field_groups;
diff --git a/modules/farm/farm_log/farm_log_activity/farm_log_activity.info b/modules/farm/farm_log/farm_log_activity/farm_log_activity.info
index 3da25bf6b..0e6801a0d 100644
--- a/modules/farm/farm_log/farm_log_activity/farm_log_activity.info
+++ b/modules/farm/farm_log/farm_log_activity/farm_log_activity.info
@@ -46,11 +46,9 @@ features[field_group][] = group_farm_category|log|farm_activity|form
 features[field_group][] = group_farm_files|log|farm_activity|form
 features[field_group][] = group_farm_general|log|farm_activity|form
 features[field_group][] = group_farm_geometry|log|farm_activity|form
-features[field_group][] = group_farm_group|log|farm_activity|form
 features[field_group][] = group_farm_inventory|log|farm_activity|form
-features[field_group][] = group_farm_movement|log|farm_activity|form
+features[field_group][] = group_farm_location|log|farm_activity|form
 features[field_group][] = group_farm_quantity|log|farm_activity|form
-features[field_group][] = group_farm_references|log|farm_activity|form
 features[field_group][] = group_farm_tabs|log|farm_activity|form
 features[field_instance][] = log-farm_activity-field_farm_area
 features[field_instance][] = log-farm_activity-field_farm_asset
diff --git a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.features.field_instance.inc b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.features.field_instance.inc
index b12aa68f8..d9bfb5870 100644
--- a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.features.field_instance.inc
+++ b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.features.field_instance.inc
@@ -37,7 +37,7 @@ function farm_log_harvest_field_default_field_instances() {
       'module' => 'options',
       'settings' => array(),
       'type' => 'options_select',
-      'weight' => 12,
+      'weight' => 15,
     ),
   );
 
@@ -415,7 +415,7 @@ function farm_log_harvest_field_default_field_instances() {
       'module' => 'field_collection',
       'settings' => array(),
       'type' => 'field_collection_embed',
-      'weight' => 19,
+      'weight' => 7,
     ),
   );
 
diff --git a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.field_group.inc b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.field_group.inc
index 04406c4a8..d24848405 100644
--- a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.field_group.inc
+++ b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.field_group.inc
@@ -18,10 +18,10 @@ function farm_log_harvest_field_group_info() {
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_harvest';
   $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_references';
+  $field_group->parent_name = 'group_farm_location';
   $field_group->data = array(
     'label' => 'Areas',
-    'weight' => '3',
+    'weight' => '14',
     'children' => array(
       0 => 'field_farm_area',
     ),
@@ -47,23 +47,21 @@ function farm_log_harvest_field_group_info() {
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_harvest';
   $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_references';
+  $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Assets',
     'weight' => '2',
     'children' => array(
       0 => 'field_farm_asset',
+      1 => 'field_farm_movement',
     ),
-    'format_type' => 'fieldset',
+    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
     'format_settings' => array(
-      'label' => 'Assets',
+      'formatter' => '',
       'instance_settings' => array(
+        'classes' => '',
         'required_fields' => 1,
-        'id' => '',
-        'classes' => 'group-farm-assets field-group-fieldset',
-        'description' => '',
       ),
-      'formatter' => 'open',
     ),
   );
   $field_groups['group_farm_assets|log|farm_harvest|form'] = $field_group;
@@ -137,7 +135,7 @@ function farm_log_harvest_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Files',
-    'weight' => '7',
+    'weight' => '8',
     'children' => array(
       0 => 'field_farm_files',
       1 => 'field_farm_images',
@@ -194,20 +192,23 @@ function farm_log_harvest_field_group_info() {
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_harvest';
   $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_tabs';
+  $field_group->parent_name = 'group_farm_location';
   $field_group->data = array(
     'label' => 'Geometry',
-    'weight' => '4',
+    'weight' => '16',
     'children' => array(
       0 => 'field_farm_geofield',
     ),
-    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
+    'format_type' => 'fieldset',
     'format_settings' => array(
-      'formatter' => '',
+      'label' => 'Geometry',
       'instance_settings' => array(
-        'classes' => 'group-farm-geometry field-group-field_group_easy_responsive_tabs_nav_item',
         'required_fields' => 1,
+        'id' => '',
+        'classes' => '',
+        'description' => '',
       ),
+      'formatter' => 'collapsed',
     ),
   );
   $field_groups['group_farm_geometry|log|farm_harvest|form'] = $field_group;
@@ -223,7 +224,7 @@ function farm_log_harvest_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Inventory',
-    'weight' => '6',
+    'weight' => '7',
     'children' => array(
       0 => 'field_farm_inventory',
     ),
@@ -241,28 +242,29 @@ function farm_log_harvest_field_group_info() {
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
-  $field_group->identifier = 'group_farm_movement|log|farm_harvest|form';
-  $field_group->group_name = 'group_farm_movement';
+  $field_group->identifier = 'group_farm_location|log|farm_harvest|form';
+  $field_group->group_name = 'group_farm_location';
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_harvest';
   $field_group->mode = 'form';
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
-    'label' => 'Movement',
-    'weight' => '5',
+    'label' => 'Location',
+    'weight' => '4',
     'children' => array(
-      0 => 'field_farm_movement',
+      0 => 'group_farm_areas',
+      1 => 'group_farm_geometry',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav_item',
     'format_settings' => array(
       'formatter' => '',
       'instance_settings' => array(
-        'classes' => 'group-farm-movement field-group-field_group_easy_responsive_tabs_nav_item',
+        'classes' => 'group-farm-location field-group-field_group_easy_responsive_tabs_nav_item',
         'required_fields' => 1,
       ),
     ),
   );
-  $field_groups['group_farm_movement|log|farm_harvest|form'] = $field_group;
+  $field_groups['group_farm_location|log|farm_harvest|form'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -275,7 +277,7 @@ function farm_log_harvest_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Quantity',
-    'weight' => '3',
+    'weight' => '5',
     'children' => array(
       0 => 'field_farm_quantity',
     ),
@@ -290,33 +292,6 @@ function farm_log_harvest_field_group_info() {
   );
   $field_groups['group_farm_quantity|log|farm_harvest|form'] = $field_group;
 
-  $field_group = new stdClass();
-  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
-  $field_group->api_version = 1;
-  $field_group->identifier = 'group_farm_references|log|farm_harvest|form';
-  $field_group->group_name = 'group_farm_references';
-  $field_group->entity_type = 'log';
-  $field_group->bundle = 'farm_harvest';
-  $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_tabs';
-  $field_group->data = array(
-    'label' => 'References',
-    'weight' => '2',
-    'children' => array(
-      0 => 'group_farm_assets',
-      1 => 'group_farm_areas',
-    ),
-    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
-    'format_settings' => array(
-      'formatter' => '',
-      'instance_settings' => array(
-        'classes' => 'group-farm-references field-group-field_group_easy_responsive_tabs_nav_item',
-        'required_fields' => 1,
-      ),
-    ),
-  );
-  $field_groups['group_farm_references|log|farm_harvest|form'] = $field_group;
-
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -330,13 +305,12 @@ function farm_log_harvest_field_group_info() {
     'label' => 'Tabs',
     'weight' => '0',
     'children' => array(
-      0 => 'group_farm_files',
-      1 => 'group_farm_general',
-      2 => 'group_farm_references',
-      3 => 'group_farm_geometry',
-      4 => 'group_farm_movement',
-      5 => 'group_farm_quantity',
-      6 => 'group_farm_inventory',
+      0 => 'group_farm_assets',
+      1 => 'group_farm_files',
+      2 => 'group_farm_general',
+      3 => 'group_farm_quantity',
+      4 => 'group_farm_inventory',
+      5 => 'group_farm_location',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav',
     'format_settings' => array(
@@ -368,9 +342,8 @@ function farm_log_harvest_field_group_info() {
   t('General');
   t('Geometry');
   t('Inventory');
-  t('Movement');
+  t('Location');
   t('Quantity');
-  t('References');
   t('Tabs');
 
   return $field_groups;
diff --git a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.info b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.info
index ba296eec3..d1250d284 100644
--- a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.info
+++ b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.info
@@ -46,9 +46,8 @@ features[field_group][] = group_farm_files|log|farm_harvest|form
 features[field_group][] = group_farm_general|log|farm_harvest|form
 features[field_group][] = group_farm_geometry|log|farm_harvest|form
 features[field_group][] = group_farm_inventory|log|farm_harvest|form
-features[field_group][] = group_farm_movement|log|farm_harvest|form
+features[field_group][] = group_farm_location|log|farm_harvest|form
 features[field_group][] = group_farm_quantity|log|farm_harvest|form
-features[field_group][] = group_farm_references|log|farm_harvest|form
 features[field_group][] = group_farm_tabs|log|farm_harvest|form
 features[field_instance][] = log-farm_harvest-field_farm_area
 features[field_instance][] = log-farm_harvest-field_farm_asset
diff --git a/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc b/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc
index 640eff765..3ebfab9be 100644
--- a/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc
+++ b/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc
@@ -630,7 +630,7 @@ function farm_log_input_field_default_field_instances() {
       'module' => 'field_collection',
       'settings' => array(),
       'type' => 'field_collection_embed',
-      'weight' => 4,
+      'weight' => 5,
     ),
   );
 
diff --git a/modules/farm/farm_log/farm_log_input/farm_log_input.field_group.inc b/modules/farm/farm_log/farm_log_input/farm_log_input.field_group.inc
index 23c94c53a..3374a97ae 100644
--- a/modules/farm/farm_log/farm_log_input/farm_log_input.field_group.inc
+++ b/modules/farm/farm_log/farm_log_input/farm_log_input.field_group.inc
@@ -18,7 +18,7 @@ function farm_log_input_field_group_info() {
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_input';
   $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_references';
+  $field_group->parent_name = 'group_farm_location';
   $field_group->data = array(
     'label' => 'Areas',
     'weight' => '3',
@@ -47,23 +47,21 @@ function farm_log_input_field_group_info() {
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_input';
   $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_references';
+  $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Assets',
     'weight' => '2',
     'children' => array(
       0 => 'field_farm_asset',
+      1 => 'field_farm_movement',
     ),
-    'format_type' => 'fieldset',
+    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
     'format_settings' => array(
-      'label' => 'Assets',
+      'formatter' => '',
       'instance_settings' => array(
+        'classes' => '',
         'required_fields' => 1,
-        'id' => '',
-        'classes' => 'group-farm-assets field-group-fieldset',
-        'description' => '',
       ),
-      'formatter' => 'open',
     ),
   );
   $field_groups['group_farm_assets|log|farm_input|form'] = $field_group;
@@ -137,7 +135,7 @@ function farm_log_input_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Files',
-    'weight' => '7',
+    'weight' => '8',
     'children' => array(
       0 => 'field_farm_files',
       1 => 'field_farm_images',
@@ -199,20 +197,23 @@ function farm_log_input_field_group_info() {
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_input';
   $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_tabs';
+  $field_group->parent_name = 'group_farm_location';
   $field_group->data = array(
     'label' => 'Geometry',
     'weight' => '4',
     'children' => array(
       0 => 'field_farm_geofield',
     ),
-    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
+    'format_type' => 'fieldset',
     'format_settings' => array(
-      'formatter' => '',
+      'label' => 'Geometry',
       'instance_settings' => array(
-        'classes' => 'group-farm-geometry field-group-field_group_easy_responsive_tabs_nav_item',
         'required_fields' => 1,
+        'id' => '',
+        'classes' => '',
+        'description' => '',
       ),
+      'formatter' => 'collapsed',
     ),
   );
   $field_groups['group_farm_geometry|log|farm_input|form'] = $field_group;
@@ -228,7 +229,7 @@ function farm_log_input_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Inventory',
-    'weight' => '6',
+    'weight' => '7',
     'children' => array(
       0 => 'field_farm_inventory',
     ),
@@ -246,28 +247,29 @@ function farm_log_input_field_group_info() {
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
-  $field_group->identifier = 'group_farm_movement|log|farm_input|form';
-  $field_group->group_name = 'group_farm_movement';
+  $field_group->identifier = 'group_farm_location|log|farm_input|form';
+  $field_group->group_name = 'group_farm_location';
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_input';
   $field_group->mode = 'form';
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
-    'label' => 'Movement',
-    'weight' => '5',
+    'label' => 'Location',
+    'weight' => '4',
     'children' => array(
-      0 => 'field_farm_movement',
+      0 => 'group_farm_areas',
+      1 => 'group_farm_geometry',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav_item',
     'format_settings' => array(
       'formatter' => '',
       'instance_settings' => array(
-        'classes' => 'group-farm-movement field-group-field_group_easy_responsive_tabs_nav_item',
+        'classes' => 'group-farm-location field-group-field_group_easy_responsive_tabs_nav_item',
         'required_fields' => 1,
       ),
     ),
   );
-  $field_groups['group_farm_movement|log|farm_input|form'] = $field_group;
+  $field_groups['group_farm_location|log|farm_input|form'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -280,7 +282,7 @@ function farm_log_input_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Quantity',
-    'weight' => '3',
+    'weight' => '5',
     'children' => array(
       0 => 'field_farm_quantity',
     ),
@@ -295,33 +297,6 @@ function farm_log_input_field_group_info() {
   );
   $field_groups['group_farm_quantity|log|farm_input|form'] = $field_group;
 
-  $field_group = new stdClass();
-  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
-  $field_group->api_version = 1;
-  $field_group->identifier = 'group_farm_references|log|farm_input|form';
-  $field_group->group_name = 'group_farm_references';
-  $field_group->entity_type = 'log';
-  $field_group->bundle = 'farm_input';
-  $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_tabs';
-  $field_group->data = array(
-    'label' => 'References',
-    'weight' => '2',
-    'children' => array(
-      0 => 'group_farm_areas',
-      1 => 'group_farm_assets',
-    ),
-    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
-    'format_settings' => array(
-      'formatter' => '',
-      'instance_settings' => array(
-        'classes' => 'group-farm-references field-group-field_group_easy_responsive_tabs_nav_item',
-        'required_fields' => 1,
-      ),
-    ),
-  );
-  $field_groups['group_farm_references|log|farm_input|form'] = $field_group;
-
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -335,13 +310,13 @@ function farm_log_input_field_group_info() {
     'label' => 'Tabs',
     'weight' => '0',
     'children' => array(
-      0 => 'group_farm_files',
-      1 => 'group_farm_general',
-      2 => 'group_farm_references',
-      3 => 'group_farm_geometry',
-      4 => 'group_farm_movement',
-      5 => 'group_farm_quantity',
-      6 => 'group_farm_inventory',
+      0 => 'group_farm_assets',
+      1 => 'group_farm_files',
+      2 => 'group_farm_general',
+      3 => 'group_farm_references',
+      4 => 'group_farm_quantity',
+      5 => 'group_farm_inventory',
+      6 => 'group_farm_location',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav',
     'format_settings' => array(
@@ -373,9 +348,8 @@ function farm_log_input_field_group_info() {
   t('General');
   t('Geometry');
   t('Inventory');
-  t('Movement');
+  t('Location');
   t('Quantity');
-  t('References');
   t('Tabs');
 
   return $field_groups;
diff --git a/modules/farm/farm_log/farm_log_input/farm_log_input.info b/modules/farm/farm_log/farm_log_input/farm_log_input.info
index 3844a8db9..9db8b2d55 100644
--- a/modules/farm/farm_log/farm_log_input/farm_log_input.info
+++ b/modules/farm/farm_log/farm_log_input/farm_log_input.info
@@ -54,9 +54,8 @@ features[field_group][] = group_farm_files|log|farm_input|form
 features[field_group][] = group_farm_general|log|farm_input|form
 features[field_group][] = group_farm_geometry|log|farm_input|form
 features[field_group][] = group_farm_inventory|log|farm_input|form
-features[field_group][] = group_farm_movement|log|farm_input|form
+features[field_group][] = group_farm_location|log|farm_input|form
 features[field_group][] = group_farm_quantity|log|farm_input|form
-features[field_group][] = group_farm_references|log|farm_input|form
 features[field_group][] = group_farm_tabs|log|farm_input|form
 features[field_instance][] = log-farm_input-field_farm_area
 features[field_instance][] = log-farm_input-field_farm_asset
diff --git a/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc b/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc
index d6313b249..ffd45169f 100644
--- a/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc
+++ b/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc
@@ -358,7 +358,7 @@ function farm_log_observation_field_default_field_instances() {
       'module' => 'field_collection',
       'settings' => array(),
       'type' => 'field_collection_embed',
-      'weight' => 12,
+      'weight' => 4,
     ),
   );
 
@@ -391,7 +391,7 @@ function farm_log_observation_field_default_field_instances() {
       'module' => 'field_collection',
       'settings' => array(),
       'type' => 'field_collection_embed',
-      'weight' => 9,
+      'weight' => 3,
     ),
   );
 
diff --git a/modules/farm/farm_log/farm_log_observation/farm_log_observation.field_group.inc b/modules/farm/farm_log/farm_log_observation/farm_log_observation.field_group.inc
index 2036dafbd..62f925ddd 100644
--- a/modules/farm/farm_log/farm_log_observation/farm_log_observation.field_group.inc
+++ b/modules/farm/farm_log/farm_log_observation/farm_log_observation.field_group.inc
@@ -18,7 +18,7 @@ function farm_log_observation_field_group_info() {
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_observation';
   $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_references';
+  $field_group->parent_name = 'group_farm_location';
   $field_group->data = array(
     'label' => 'Areas',
     'weight' => '7',
@@ -47,12 +47,14 @@ function farm_log_observation_field_group_info() {
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_observation';
   $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_references';
+  $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Assets',
-    'weight' => '6',
+    'weight' => '7',
     'children' => array(
       0 => 'field_farm_asset',
+      1 => 'field_farm_movement',
+      2 => 'field_farm_membership',
     ),
     'format_type' => 'fieldset',
     'format_settings' => array(
@@ -137,7 +139,7 @@ function farm_log_observation_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Files',
-    'weight' => '14',
+    'weight' => '15',
     'children' => array(
       0 => 'field_farm_files',
       1 => 'field_farm_images',
@@ -191,50 +193,27 @@ function farm_log_observation_field_group_info() {
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_observation';
   $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_tabs';
+  $field_group->parent_name = 'group_farm_location';
   $field_group->data = array(
     'label' => 'Geometry',
-    'weight' => '9',
+    'weight' => '8',
     'children' => array(
       0 => 'field_farm_geofield',
     ),
-    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
+    'format_type' => 'fieldset',
     'format_settings' => array(
-      'formatter' => '',
+      'label' => 'Geometry',
       'instance_settings' => array(
-        'classes' => '',
         'required_fields' => 1,
+        'id' => '',
+        'classes' => '',
+        'description' => '',
       ),
+      'formatter' => 'collapsed',
     ),
   );
   $field_groups['group_farm_geometry|log|farm_observation|form'] = $field_group;
 
-  $field_group = new stdClass();
-  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
-  $field_group->api_version = 1;
-  $field_group->identifier = 'group_farm_group|log|farm_observation|form';
-  $field_group->group_name = 'group_farm_group';
-  $field_group->entity_type = 'log';
-  $field_group->bundle = 'farm_observation';
-  $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_tabs';
-  $field_group->data = array(
-    'label' => 'Group Membership',
-    'weight' => '11',
-    'children' => array(
-      0 => 'field_farm_membership',
-    ),
-    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
-    'format_settings' => array(
-      'formatter' => '',
-      'instance_settings' => array(
-        'classes' => 'group-farm-group field-group-field_group_easy_responsive_tabs_nav_item',
-        'required_fields' => 1,
-      ),
-    ),
-  );
-  $field_groups['group_farm_group|log|farm_observation|form'] = $field_group;
-
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -246,7 +225,7 @@ function farm_log_observation_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Inventory',
-    'weight' => '13',
+    'weight' => '14',
     'children' => array(
       0 => 'field_farm_inventory',
     ),
@@ -264,28 +243,29 @@ function farm_log_observation_field_group_info() {
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
-  $field_group->identifier = 'group_farm_movement|log|farm_observation|form';
-  $field_group->group_name = 'group_farm_movement';
+  $field_group->identifier = 'group_farm_location|log|farm_observation|form';
+  $field_group->group_name = 'group_farm_location';
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_observation';
   $field_group->mode = 'form';
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
-    'label' => 'Movement',
-    'weight' => '10',
+    'label' => 'Location',
+    'weight' => '9',
     'children' => array(
-      0 => 'field_farm_movement',
+      0 => 'group_farm_areas',
+      1 => 'group_farm_geometry',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav_item',
     'format_settings' => array(
       'formatter' => '',
       'instance_settings' => array(
-        'classes' => '',
+        'classes' => 'group-farm-location field-group-field_group_easy_responsive_tabs_nav_item',
         'required_fields' => 1,
       ),
     ),
   );
-  $field_groups['group_farm_movement|log|farm_observation|form'] = $field_group;
+  $field_groups['group_farm_location|log|farm_observation|form'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -298,7 +278,7 @@ function farm_log_observation_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Quantity',
-    'weight' => '8',
+    'weight' => '10',
     'children' => array(
       0 => 'field_farm_quantity',
     ),
@@ -313,33 +293,6 @@ function farm_log_observation_field_group_info() {
   );
   $field_groups['group_farm_quantity|log|farm_observation|form'] = $field_group;
 
-  $field_group = new stdClass();
-  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
-  $field_group->api_version = 1;
-  $field_group->identifier = 'group_farm_references|log|farm_observation|form';
-  $field_group->group_name = 'group_farm_references';
-  $field_group->entity_type = 'log';
-  $field_group->bundle = 'farm_observation';
-  $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_tabs';
-  $field_group->data = array(
-    'label' => 'References',
-    'weight' => '7',
-    'children' => array(
-      0 => 'group_farm_areas',
-      1 => 'group_farm_assets',
-    ),
-    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
-    'format_settings' => array(
-      'formatter' => '',
-      'instance_settings' => array(
-        'classes' => '',
-        'required_fields' => 1,
-      ),
-    ),
-  );
-  $field_groups['group_farm_references|log|farm_observation|form'] = $field_group;
-
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -355,12 +308,10 @@ function farm_log_observation_field_group_info() {
     'children' => array(
       0 => 'group_farm_files',
       1 => 'group_farm_general',
-      2 => 'group_farm_references',
-      3 => 'group_farm_movement',
-      4 => 'group_farm_geometry',
-      5 => 'group_farm_quantity',
-      6 => 'group_farm_inventory',
-      7 => 'group_farm_group',
+      2 => 'group_farm_assets',
+      3 => 'group_farm_quantity',
+      4 => 'group_farm_inventory',
+      5 => 'group_farm_location',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav',
     'format_settings' => array(
@@ -391,11 +342,9 @@ function farm_log_observation_field_group_info() {
   t('Files');
   t('General');
   t('Geometry');
-  t('Group Membership');
   t('Inventory');
-  t('Movement');
+  t('Location');
   t('Quantity');
-  t('References');
   t('Tabs');
 
   return $field_groups;
diff --git a/modules/farm/farm_log/farm_log_observation/farm_log_observation.info b/modules/farm/farm_log/farm_log_observation/farm_log_observation.info
index 9ca62a652..8ce707de3 100644
--- a/modules/farm/farm_log/farm_log_observation/farm_log_observation.info
+++ b/modules/farm/farm_log/farm_log_observation/farm_log_observation.info
@@ -46,11 +46,9 @@ features[field_group][] = group_farm_category|log|farm_observation|form
 features[field_group][] = group_farm_files|log|farm_observation|form
 features[field_group][] = group_farm_general|log|farm_observation|form
 features[field_group][] = group_farm_geometry|log|farm_observation|form
-features[field_group][] = group_farm_group|log|farm_observation|form
 features[field_group][] = group_farm_inventory|log|farm_observation|form
-features[field_group][] = group_farm_movement|log|farm_observation|form
+features[field_group][] = group_farm_location|log|farm_observation|form
 features[field_group][] = group_farm_quantity|log|farm_observation|form
-features[field_group][] = group_farm_references|log|farm_observation|form
 features[field_group][] = group_farm_tabs|log|farm_observation|form
 features[field_instance][] = log-farm_observation-field_farm_area
 features[field_instance][] = log-farm_observation-field_farm_asset
diff --git a/modules/farm/farm_log/farm_log_sale/farm_log_sale.field_group.inc b/modules/farm/farm_log/farm_log_sale/farm_log_sale.field_group.inc
index 891499738..9890611cf 100644
--- a/modules/farm/farm_log/farm_log_sale/farm_log_sale.field_group.inc
+++ b/modules/farm/farm_log/farm_log_sale/farm_log_sale.field_group.inc
@@ -18,23 +18,20 @@ function farm_log_sale_field_group_info() {
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_sale';
   $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_references';
+  $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Assets',
-    'weight' => '3',
+    'weight' => '2',
     'children' => array(
       0 => 'field_farm_asset',
     ),
-    'format_type' => 'fieldset',
+    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
     'format_settings' => array(
-      'label' => 'Assets',
+      'formatter' => '',
       'instance_settings' => array(
+        'classes' => '',
         'required_fields' => 1,
-        'id' => '',
-        'classes' => 'group-farm-assets field-group-fieldset',
-        'description' => '',
       ),
-      'formatter' => 'open',
     ),
   );
   $field_groups['group_farm_assets|log|farm_sale|form'] = $field_group;
@@ -188,32 +185,6 @@ function farm_log_sale_field_group_info() {
   );
   $field_groups['group_farm_inventory|log|farm_sale|form'] = $field_group;
 
-  $field_group = new stdClass();
-  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
-  $field_group->api_version = 1;
-  $field_group->identifier = 'group_farm_references|log|farm_sale|form';
-  $field_group->group_name = 'group_farm_references';
-  $field_group->entity_type = 'log';
-  $field_group->bundle = 'farm_sale';
-  $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_tabs';
-  $field_group->data = array(
-    'label' => 'References',
-    'weight' => '2',
-    'children' => array(
-      0 => 'group_farm_assets',
-    ),
-    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
-    'format_settings' => array(
-      'formatter' => '',
-      'instance_settings' => array(
-        'classes' => 'group-farm-references field-group-field_group_easy_responsive_tabs_nav_item',
-        'required_fields' => 1,
-      ),
-    ),
-  );
-  $field_groups['group_farm_references|log|farm_sale|form'] = $field_group;
-
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -228,9 +199,10 @@ function farm_log_sale_field_group_info() {
     'weight' => '0',
     'children' => array(
       0 => 'group_farm_general',
-      1 => 'group_farm_attachments',
-      2 => 'group_farm_references',
-      3 => 'group_farm_inventory',
+      1 => 'group_farm_assets',
+      2 => 'group_farm_attachments',
+      3 => 'group_farm_references',
+      4 => 'group_farm_inventory',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav',
     'format_settings' => array(
@@ -260,7 +232,6 @@ function farm_log_sale_field_group_info() {
   t('Files');
   t('General');
   t('Inventory');
-  t('References');
   t('Tabs');
 
   return $field_groups;
diff --git a/modules/farm/farm_log/farm_log_sale/farm_log_sale.info b/modules/farm/farm_log/farm_log_sale/farm_log_sale.info
index 1e8e256ea..0f8ab0906 100644
--- a/modules/farm/farm_log/farm_log_sale/farm_log_sale.info
+++ b/modules/farm/farm_log/farm_log_sale/farm_log_sale.info
@@ -39,7 +39,6 @@ features[field_group][] = group_farm_attachments|log|farm_sale|form
 features[field_group][] = group_farm_category|log|farm_sale|form
 features[field_group][] = group_farm_general|log|farm_sale|form
 features[field_group][] = group_farm_inventory|log|farm_sale|form
-features[field_group][] = group_farm_references|log|farm_sale|form
 features[field_group][] = group_farm_tabs|log|farm_sale|form
 features[field_instance][] = log-farm_sale-field_farm_asset
 features[field_instance][] = log-farm_sale-field_farm_customer
diff --git a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.field_group.inc b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.field_group.inc
index adc448491..66dba8fe0 100644
--- a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.field_group.inc
+++ b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.field_group.inc
@@ -131,14 +131,14 @@ function farm_soil_test_field_group_info() {
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
-  $field_group->identifier = 'group_farm_soil|log|farm_soil_test|form';
-  $field_group->group_name = 'group_farm_soil';
+  $field_group->identifier = 'group_farm_location|log|farm_soil_test|form';
+  $field_group->group_name = 'group_farm_location';
   $field_group->entity_type = 'log';
   $field_group->bundle = 'farm_soil_test';
   $field_group->mode = 'form';
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
-    'label' => 'Soil information',
+    'label' => 'Location',
     'weight' => '2',
     'children' => array(
       0 => 'field_farm_area',
@@ -149,12 +149,12 @@ function farm_soil_test_field_group_info() {
     'format_settings' => array(
       'formatter' => '',
       'instance_settings' => array(
-        'classes' => '',
+        'classes' => 'group-farm-location field-group-field_group_easy_responsive_tabs_nav_item',
         'required_fields' => 1,
       ),
     ),
   );
-  $field_groups['group_farm_soil|log|farm_soil_test|form'] = $field_group;
+  $field_groups['group_farm_location|log|farm_soil_test|form'] = $field_group;
 
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
@@ -172,6 +172,7 @@ function farm_soil_test_field_group_info() {
       0 => 'group_farm_files',
       1 => 'group_farm_general',
       2 => 'group_farm_soil',
+      3 => 'group_farm_location',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav',
     'format_settings' => array(
@@ -199,7 +200,7 @@ function farm_soil_test_field_group_info() {
   t('Category');
   t('Files');
   t('General');
-  t('Soil information');
+  t('Location');
   t('Tabs');
 
   return $field_groups;
diff --git a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.info b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.info
index c9e38a24b..399de8c05 100644
--- a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.info
+++ b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.info
@@ -34,7 +34,7 @@ features[field_group][] = group_farm_assignment|log|farm_soil_test|form
 features[field_group][] = group_farm_category|log|farm_soil_test|form
 features[field_group][] = group_farm_files|log|farm_soil_test|form
 features[field_group][] = group_farm_general|log|farm_soil_test|form
-features[field_group][] = group_farm_soil|log|farm_soil_test|form
+features[field_group][] = group_farm_location|log|farm_soil_test|form
 features[field_group][] = group_farm_tabs|log|farm_soil_test|form
 features[field_instance][] = log-farm_soil_test-field_farm_area
 features[field_instance][] = log-farm_soil_test-field_farm_files
diff --git a/modules/farm/farm_water/farm_water_test/farm_water_test.field_group.inc b/modules/farm/farm_water/farm_water_test/farm_water_test.field_group.inc
index 04314cb6d..f5fd34245 100644
--- a/modules/farm/farm_water/farm_water_test/farm_water_test.field_group.inc
+++ b/modules/farm/farm_water/farm_water_test/farm_water_test.field_group.inc
@@ -79,7 +79,7 @@ function farm_water_test_field_group_info() {
   $field_group->parent_name = 'group_farm_tabs';
   $field_group->data = array(
     'label' => 'Files',
-    'weight' => '3',
+    'weight' => '4',
     'children' => array(
       0 => 'field_farm_files',
       1 => 'field_farm_images',
@@ -128,6 +128,33 @@ function farm_water_test_field_group_info() {
   );
   $field_groups['group_farm_general|log|farm_water_test|form'] = $field_group;
 
+  $field_group = new stdClass();
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_farm_location|log|farm_water_test|form';
+  $field_group->group_name = 'group_farm_location';
+  $field_group->entity_type = 'log';
+  $field_group->bundle = 'farm_water_test';
+  $field_group->mode = 'form';
+  $field_group->parent_name = 'group_farm_tabs';
+  $field_group->data = array(
+    'label' => 'Location',
+    'weight' => '2',
+    'children' => array(
+      0 => 'field_farm_area',
+      1 => 'field_farm_geofield',
+    ),
+    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
+    'format_settings' => array(
+      'formatter' => '',
+      'instance_settings' => array(
+        'classes' => 'group-farm-location field-group-field_group_easy_responsive_tabs_nav_item',
+        'required_fields' => 1,
+      ),
+    ),
+  );
+  $field_groups['group_farm_location|log|farm_water_test|form'] = $field_group;
+
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -144,6 +171,7 @@ function farm_water_test_field_group_info() {
       0 => 'group_farm_files',
       1 => 'group_farm_general',
       2 => 'group_farm_water',
+      3 => 'group_farm_location',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav',
     'format_settings' => array(
@@ -165,41 +193,14 @@ function farm_water_test_field_group_info() {
   );
   $field_groups['group_farm_tabs|log|farm_water_test|form'] = $field_group;
 
-  $field_group = new stdClass();
-  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
-  $field_group->api_version = 1;
-  $field_group->identifier = 'group_farm_water|log|farm_water_test|form';
-  $field_group->group_name = 'group_farm_water';
-  $field_group->entity_type = 'log';
-  $field_group->bundle = 'farm_water_test';
-  $field_group->mode = 'form';
-  $field_group->parent_name = 'group_farm_tabs';
-  $field_group->data = array(
-    'label' => 'Water information',
-    'weight' => '2',
-    'children' => array(
-      0 => 'field_farm_area',
-      1 => 'field_farm_geofield',
-    ),
-    'format_type' => 'field_group_easy_responsive_tabs_nav_item',
-    'format_settings' => array(
-      'formatter' => '',
-      'instance_settings' => array(
-        'classes' => '',
-        'required_fields' => 1,
-      ),
-    ),
-  );
-  $field_groups['group_farm_water|log|farm_water_test|form'] = $field_group;
-
   // Translatables
   // Included for use with string extractors like potx.
   t('Assignment');
   t('Category');
   t('Files');
   t('General');
+  t('Location');
   t('Tabs');
-  t('Water information');
 
   return $field_groups;
 }
diff --git a/modules/farm/farm_water/farm_water_test/farm_water_test.info b/modules/farm/farm_water/farm_water_test/farm_water_test.info
index 6a207b022..f0ea4e3b2 100644
--- a/modules/farm/farm_water/farm_water_test/farm_water_test.info
+++ b/modules/farm/farm_water/farm_water_test/farm_water_test.info
@@ -33,8 +33,8 @@ features[field_group][] = group_farm_assignment|log|farm_water_test|form
 features[field_group][] = group_farm_category|log|farm_water_test|form
 features[field_group][] = group_farm_files|log|farm_water_test|form
 features[field_group][] = group_farm_general|log|farm_water_test|form
+features[field_group][] = group_farm_location|log|farm_water_test|form
 features[field_group][] = group_farm_tabs|log|farm_water_test|form
-features[field_group][] = group_farm_water|log|farm_water_test|form
 features[field_instance][] = log-farm_water_test-field_farm_area
 features[field_instance][] = log-farm_water_test-field_farm_files
 features[field_instance][] = log-farm_water_test-field_farm_geofield