diff --git a/includes/project_issue_node_type.inc b/includes/project_issue_node_type.inc
index d1e3958..bbe3f88 100644
--- a/includes/project_issue_node_type.inc
+++ b/includes/project_issue_node_type.inc
@@ -121,7 +121,7 @@ function _project_issue_create_issue_node_type() {
       'module' => 'options',
       'settings' => array(),
       'type' => 'options_select',
-      'weight' => '-3',
+      'weight' => 0,
     ),
   );
   if (!field_info_instance('node', 'field_issue_status', 'project_issue')) {
@@ -200,7 +200,7 @@ function _project_issue_create_issue_node_type() {
       'module' => 'options',
       'settings' => array(),
       'type' => 'options_select',
-      'weight' => '-3',
+      'weight' => 0,
     ),
   );
   if (!field_info_instance('node', 'field_issue_priority', 'project_issue')) {
@@ -273,7 +273,7 @@ function _project_issue_create_issue_node_type() {
       'module' => 'options',
       'settings' => array(),
       'type' => 'options_select',
-      'weight' => '-3',
+      'weight' => 0,
     ),
   );
   if (!field_info_instance('node', 'field_issue_category', 'project_issue')) {
@@ -343,7 +343,7 @@ function _project_issue_create_issue_node_type() {
       'module' => 'options',
       'settings' => array(),
       'type' => 'options_select',
-      'weight' => '-3',
+      'weight' => 0,
     ),
   );
   if (!field_info_instance('node', 'field_issue_component', 'project_issue')) {
@@ -394,7 +394,7 @@ function _project_issue_create_issue_node_type() {
           'link' => FALSE,
         ),
         'type' => 'entityreference_label',
-        'weight' => '5',
+        'weight' => 5,
       ),
       'teaser' => array(
         'label' => 'above',
@@ -409,7 +409,7 @@ function _project_issue_create_issue_node_type() {
           'link' => FALSE,
         ),
         'type' => 'entityreference_label',
-        'weight' => '5',
+        'weight' => 5,
       ),
     ),
     'entity_type' => 'node',
@@ -424,7 +424,7 @@ function _project_issue_create_issue_node_type() {
       'module' => 'options',
       'settings' => array(),
       'type' => 'options_select',
-      'weight' => '-2',
+      'weight' => 0,
       /// @todo: We need an allowed values callback to restrict the options.
     ),
   );
@@ -492,7 +492,7 @@ function _project_issue_create_issue_node_type() {
           'link' => FALSE,
         ),
         'type' => 'entityreference_label',
-        'weight' => '0',
+        'weight' => 0,
       ),
     ),
     'settings' => array(
@@ -520,7 +520,7 @@ function _project_issue_create_issue_node_type() {
     'type' => 'entityreference',
     'module' => 'entityreference',
     'widget' => array(
-      'weight' => -1,
+      'weight' => 0,
       'type' => 'entityreference_autocomplete',
       'active' => 1,
       'settings' => array(
@@ -558,7 +558,7 @@ function _project_issue_create_issue_node_type() {
     'bundle' => 'project_issue',
     'label' => $t('Files'),
     'widget' => array(
-      'weight' => 0,
+      'weight' => 2,
       'type' => 'file_generic',
       'module' => 'file',
       'active' => 1,
@@ -624,7 +624,7 @@ function _project_issue_create_issue_node_type() {
   $instance = array(
     'label' => $t('Issue changes'),
     'widget' => array(
-      'weight' => '1',
+      'weight' => 1,
       'type' => 'field_extrawidgets_hidden',
       'active' => 1,
       'settings' => array(
@@ -697,7 +697,7 @@ function _project_issue_create_issue_node_type() {
   $instance = array(
     'label' => 'Parent issue',
     'widget' => array(
-      'weight' => '6',
+      'weight' => 6,
       'type' => 'entityreference_autocomplete',
       'active' => 1,
       'settings' => array(
@@ -713,7 +713,7 @@ function _project_issue_create_issue_node_type() {
       'default' => array(
         'label' => 'above',
         'type' => 'issue_id',
-        'weight' => '6',
+        'weight' => 6,
         'settings' => array(),
       ),
       'teaser' => array(
@@ -771,7 +771,7 @@ function _project_issue_create_issue_node_type() {
   $instance = array(
     'label' => 'Related issues',
     'widget' => array(
-      'weight' => '7',
+      'weight' => 7,
       'type' => 'entityreference_autocomplete',
       'active' => 1,
       'settings' => array(
@@ -787,7 +787,7 @@ function _project_issue_create_issue_node_type() {
       'default' => array(
         'label' => 'above',
         'type' => 'issue_id',
-        'weight' => '7',
+        'weight' => 7,
         'settings' => array(),
       ),
       'teaser' => array(
diff --git a/project_issue.field_group.inc b/project_issue.field_group.inc
index 9a677fc..967a2ff 100644
--- a/project_issue.field_group.inc
+++ b/project_issue.field_group.inc
@@ -52,10 +52,8 @@ 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 => 'group_issue_project_settings',
+      1 => 'group_issue_settings',
     ),
     'format_type' => 'fieldset',
     'format_settings' => array(
@@ -72,39 +70,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 +80,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 +117,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 +144,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',