diff --git a/project_issue.field_group.inc b/project_issue.field_group.inc
index 9a677fc..72f7375 100644
--- a/project_issue.field_group.inc
+++ b/project_issue.field_group.inc
@@ -52,10 +52,9 @@ function project_issue_field_group_info() {
     'label' => 'Issue settings',
     'weight' => '1',
     'children' => array(
-      0 => 'field_project',
-      1 => 'group_issue_status',
-      2 => 'group_issue_project_settings',
-      3 => 'group_issue_settings',
+      0 => 'title',
+      1 => 'group_issue_project_settings',
+      2 => 'group_issue_settings',
     ),
     'format_type' => 'fieldset',
     'format_settings' => array(
@@ -72,39 +71,6 @@ function project_issue_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_issue_status|node|project_issue|form';
-  $field_group->group_name = 'group_issue_status';
-  $field_group->entity_type = 'node';
-  $field_group->bundle = 'project_issue';
-  $field_group->mode = 'form';
-  $field_group->parent_name = 'group_issue_metadata';
-  $field_group->data = array(
-    'label' => 'Issue status',
-    'weight' => '5',
-    'children' => array(
-      0 => 'field_issue_status',
-      1 => 'field_issue_assigned',
-    ),
-    'format_type' => 'div',
-    'format_settings' => array(
-      'label' => 'Issue status',
-      'instance_settings' => array(
-        'required_fields' => 1,
-        'classes' => 'container-inline',
-        'description' => '',
-        'show_label' => '0',
-        'label_element' => 'h3',
-        'effect' => 'none',
-        'speed' => 'none',
-      ),
-      'formatter' => 'open',
-    ),
-  );
-  $field_groups['group_issue_status|node|project_issue|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_issue_project_settings|node|project_issue|form';
   $field_group->group_name = 'group_issue_project_settings';
   $field_group->entity_type = 'node';
@@ -115,8 +81,10 @@ function project_issue_field_group_info() {
     'label' => 'Project settings',
     'weight' => '6',
     'children' => array(
-      0 => 'field_issue_version',
-      1 => 'field_issue_component',
+      0 => 'field_project',
+      1 => 'field_issue_version',
+      2 => 'field_issue_component',
+      3 => 'field_issue_assigned',
     ),
     'format_type' => 'div',
     'format_settings' => array(
@@ -150,6 +118,7 @@ function project_issue_field_group_info() {
     'children' => array(
       0 => 'field_issue_category',
       1 => 'field_issue_priority',
+      2 => 'field_issue_status',
     ),
     'format_type' => 'div',
     'format_settings' => array(
@@ -176,7 +145,7 @@ function project_issue_field_group_info() {
   $field_group->entity_type = 'node';
   $field_group->bundle = 'project_issue';
   $field_group->mode = 'form';
-  $field_group->parent_name = 'group_issue_metadata';
+  $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'Issue relations',
     'weight' => '4',