diff --git a/core/modules/node/node.admin.css b/core/modules/node/node.admin.css
index 5777b1f..97353e1 100644
--- a/core/modules/node/node.admin.css
+++ b/core/modules/node/node.admin.css
@@ -10,3 +10,136 @@
 .revision-current {
   background: #ffc;
 }
+
+/**
+ * Styles for the new node add/edit form.
+ */
+#edit-primary {
+  float: left;
+  width: 66%;
+}
+
+.overlay {
+  background: #f00;
+}
+
+#edit-secondary {
+  float: left;
+  width: 33%;
+  height: 1000px;
+  position: relative;
+  /* background: url(../../misc/sidebar-bg.gif) repeat-y; */
+  background-color: #FAFAFA;
+  top: -104px;
+  left: 42px;
+  padding-top: 10px;
+}
+
+#edit-secondary .node-summary {
+  padding-left: 10px;
+}
+
+#edit-secondary .button-duplicate {
+  margin-left: 10px;
+}
+
+.form-actions {
+  clear: both;
+}
+
+.description {
+  font-style: italic;
+  font-family: serif;
+}
+
+#edit-title {
+  width: 65%;
+}
+
+fieldset#edit-additional-settings {
+  margin: 0;
+}
+
+#edit-additional-settings fieldset.collapsed {
+  /* background: url(../../misc/sidebar-bg.gif) repeat-y; */
+  background-color: #FAFAFA;
+}
+
+#edit-additional-settings fieldset {
+  /* background: url(../../misc/fieldset-expanded-bg.gif) repeat-y; */
+  background-color: #e2e2e2;
+}
+
+.fieldset-legend .summary {
+  display: none;
+}
+
+.js fieldset.collapsible > legend .fieldset-legend {
+  background: url(../../misc/menu-expanded.png) 90% 65% no-repeat; /* LTR */
+  padding-left: 15px; /* LTR */
+  display: block;
+  width: 100%;
+}
+.js fieldset.collapsed > legend .fieldset-legend {
+  background-image: url(../../misc/menu-collapsed.png); /* LTR */
+  background-position: 90% 65%; /* LTR */
+  display: block;
+  width: 100%;
+}
+
+.js fieldset.collapsed > legend .fieldset-legend a,
+.js fieldset.collapsible > legend .fieldset-legend a {
+  display: block;
+  text-transform: none;
+  font-weight: bold;
+  width: 95%;
+}
+
+.js fieldset.collapsed > legend .fieldset-legend a {
+  font-weight: normal;
+}
+
+fieldset .form-wrapper {
+  margin: 0;
+}
+
+#edit-additional-settings, #edit-additional-settings > div.fieldset-wrapper {
+  padding: 0;
+}
+
+.node-form {
+  color: #464646;
+}
+
+ul.tips, div.description, .form-item div.description {
+  color: #464646;
+}
+
+.page-node-edit #overlay-content {
+  padding: 0;
+}
+
+.overlay #page {
+  padding: 0;
+}
+
+#edit-path-alias {
+  width: 90%;
+}
+
+.node-summary {
+  margin-top: 0;
+  padding-top: 0;
+  margin-bottom: 10px;
+}
+
+.node-summary p {
+  margin-top: -10px;
+  padding-top: 0;
+  font-size: 90%;
+}
+
+.node-summary ul, .node-summary li {
+  list-style: none;
+  margin-left: -20px;
+}
\ No newline at end of file
diff --git a/core/modules/node/node.js b/core/modules/node/node.js
index ebf68eb..72da581 100644
--- a/core/modules/node/node.js
+++ b/core/modules/node/node.js
@@ -40,4 +40,18 @@ Drupal.behaviors.nodeFieldsetSummaries = {
   }
 };
 
+Drupal.behaviors.submitField = {
+  attach: function (context) {
+    var buttons = '';
+    // Get the current action buttons and build out duplicates.
+    $('.node-actions input').each(function() {
+      buttons += '<input type="button" class="form-submit button-duplicate" value="' + $(this).val() + '" onClick="document.getElementById(\'' + $(this).attr('id') + '\').click();" />'; 
+    });
+    // Add the buttons to the added fields.  But only if they don't yet exist.
+    if ($('.button-duplicate').length == 0) {
+      $('.submit-field-buttons').prepend(buttons);
+    }
+  }
+}
+
 })(jQuery);
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index b5ed7e8..9a5c051 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -164,6 +164,10 @@ function node_theme() {
     'node_recent_content' => array(
       'variables' => array('node' => NULL),
     ),
+    'node_edit_accordion' => array(
+      'template' => 'accordion',
+      'variables' => array('title' => NULL),
+    ),
   );
 }
 
@@ -4201,4 +4205,4 @@ function node_language_delete($language) {
     ->fields(array('langcode' => ''))
     ->condition('langcode', $language->langcode)
     ->execute();
-}
+}
\ No newline at end of file
diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc
index 4e94b26..7973f3e 100644
--- a/core/modules/node/node.pages.inc
+++ b/core/modules/node/node.pages.inc
@@ -28,10 +28,12 @@ function node_page_edit($node) {
  */
 function node_add_page() {
   $item = menu_get_item();
+
   $content = system_admin_menu_block($item);
   // Bypass the node/add listing if only one content type is available.
   if (count($content) == 1) {
     $item = array_shift($content);
+    dpm($item['href']);
     drupal_goto($item['href']);
   }
   return theme('node_add_list', array('content' => $content));
@@ -118,6 +120,15 @@ function node_form_validate($form, &$form_state) {
 function node_form($form, &$form_state, $node) {
   global $user;
 
+  // Wrap main form components in a div
+  $form['edit_primary'] = array(
+    '#type' => 'markup',
+    '#prefix' => '<div id="edit-primary">',
+    '#suffix' => '</div>',
+    '#attached' => array(
+      'css' => array(drupal_get_path('module', 'node') . '/node.admin.css'),
+    ),
+  );
   // During initial form build, add the node entity to the form state for use
   // during form building and processing. During a rebuild, use what is in the
   // form state.
@@ -151,6 +162,7 @@ function node_form($form, &$form_state, $node) {
     $form[$key] = array(
       '#type' => 'value',
       '#value' => isset($node->$key) ? $node->$key : NULL,
+      '#group' => 'edit_primary',
     );
   }
 
@@ -158,6 +170,7 @@ function node_form($form, &$form_state, $node) {
   $form['changed'] = array(
     '#type' => 'hidden',
     '#default_value' => isset($node->changed) ? $node->changed : NULL,
+    '#group' => 'edit_primary',
   );
   // Invoke hook_form() to get the node-specific bits. Can't use node_invoke(),
   // because hook_form() needs to be able to receive $form_state by reference.
@@ -167,6 +180,7 @@ function node_form($form, &$form_state, $node) {
   if (function_exists($function) && ($extra = $function($node, $form_state))) {
     $form = array_merge_recursive($form, $extra);
   }
+  $form['title']['#group'] = 'edit_primary';
   // If the node type has a title, and the node type form defined no special
   // weight for it, we default to a weight of -5 for consistency.
   if (isset($form['title']) && !isset($form['title']['#weight'])) {
@@ -175,6 +189,7 @@ function node_form($form, &$form_state, $node) {
   // @todo D8: Remove. Modules should access the node using $form_state['node'].
   $form['#node'] = $node;
 
+
   if (variable_get('node_type_language_' . $node->type, 0) && module_exists('language')) {
     $languages = language_list(TRUE);
     $language_options = array();
@@ -187,6 +202,7 @@ function node_form($form, &$form_state, $node) {
       '#default_value' => (isset($node->langcode) ? $node->langcode : ''),
       '#options' => $language_options,
       '#empty_value' => LANGUAGE_NOT_SPECIFIED,
+      '#group' => 'edit_primary',
     );
   }
   else {
@@ -195,12 +211,31 @@ function node_form($form, &$form_state, $node) {
       // New nodes without multilingual support get the default language, old
       // nodes keep their language if language.module is not available.
       '#value' => !isset($form['#node']->nid) ? language_default()->langcode : $node->langcode,
+      '#group' => 'edit_primary',
     );
   }
-
+  if (isset($node->title)) {
+    if (isset($node->status) && $node->status == 1) {
+      $published = t('published');
+    } else {
+      $published = t('not published');
+    }
+  
+    $node_summary = '<div class="node-summary"><h3>' . $published . '</h3>';
+    $node_summary .= '<p><em>Last saved ' . format_date($node->changed) . '</em></p>';
+    $node_summary .= '<ul><li><strong>Author</strong> ' . $node->name . '</li>';
+    $node_summary .= '<li><strong>URL</strong> ' . drupal_get_path_alias('node/' . $node->nid) . '</li>';
+    
+    $node_summary .= '</ul></div>';
+  } else {
+    $node_summary = '';
+  }
+  
   $form['additional_settings'] = array(
-    '#type' => 'vertical_tabs',
+    '#type' => 'fieldset',
     '#weight' => 99,
+    '#prefix' => '<div id="edit-secondary" class="clearfix"><div class="submit-field-buttons"></div>' . $node_summary,
+    '#suffix' => '</div>',
   );
 
   // Add a log field if the "Create new revision" option is checked, or if the
@@ -271,6 +306,7 @@ function node_form($form, &$form_state, $node) {
     '#type' => 'textfield',
     '#title' => t('Authored by'),
     '#maxlength' => 60,
+    '#size' => 40,
     '#autocomplete_path' => 'user/autocomplete',
     '#default_value' => !empty($node->name) ? $node->name : '',
     '#weight' => -1,
@@ -280,6 +316,7 @@ function node_form($form, &$form_state, $node) {
     '#type' => 'textfield',
     '#title' => t('Authored on'),
     '#maxlength' => 25,
+    '#size' => 40,
     '#description' => t('Format: %time. The date format is YYYY-MM-DD and %timezone is the time zone offset from UTC. Leave blank to use the time of form submission.', array('%time' => !empty($node->date) ? date_format(date_create($node->date), 'Y-m-d H:i:s O') : format_date($node->created, 'custom', 'Y-m-d H:i:s O'), '%timezone' => !empty($node->date) ? date_format(date_create($node->date), 'O') : format_date($node->created, 'custom', 'O'))),
     '#default_value' => !empty($node->date) ? $node->date : '',
   );
@@ -298,7 +335,7 @@ function node_form($form, &$form_state, $node) {
     '#attached' => array(
       'js' => array(drupal_get_path('module', 'node') . '/node.js'),
     ),
-    '#weight' => 95,
+    '#weight' => -95,
   );
   $form['options']['status'] = array(
     '#type' => 'checkbox',
@@ -317,7 +354,8 @@ function node_form($form, &$form_state, $node) {
   );
 
   // Add the buttons.
-  $form['actions'] = array('#type' => 'actions');
+  $form['actions'] = array('#type' => 'actions',);
+  $form['actions']['#attributes']['class'][] = 'node-actions';
   $form['actions']['submit'] = array(
     '#type' => 'submit',
     '#access' => variable_get('node_preview_' . $node->type, DRUPAL_OPTIONAL) != DRUPAL_REQUIRED || (!form_get_errors() && isset($form_state['node_preview'])),
@@ -330,14 +368,14 @@ function node_form($form, &$form_state, $node) {
     '#type' => 'submit',
     '#value' => t('Preview'),
     '#weight' => 10,
-    '#submit' => array('node_form_build_preview'),
+    '#submit' => array('node_form_build_preview'),  
   );
   if (!empty($node->nid) && node_access('delete', $node)) {
     $form['actions']['delete'] = array(
       '#type' => 'submit',
       '#value' => t('Delete'),
       '#weight' => 15,
-      '#submit' => array('node_form_delete_submit'),
+      '#submit' => array('node_form_delete_submit'),      
     );
   }
   // This form uses a button-level #submit handler for the form's main submit
@@ -352,7 +390,7 @@ function node_form($form, &$form_state, $node) {
   }
   $form += array('#submit' => array());
 
-  field_attach_form('node', $node, $form, $form_state, $node->langcode);
+  field_attach_form('node', $node, $form['edit_primary'], $form_state, $node->langcode);
   return $form;
 }