diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index f663387..ab5f46f 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -151,9 +151,6 @@ function node_theme() {
       'render element' => 'elements',
       'template' => 'node',
     ),
-    'node_search_admin' => array(
-      'render element' => 'form',
-    ),
     'node_add_list' => array(
       'variables' => array('content' => NULL),
       'file' => 'node.pages.inc',
@@ -1343,20 +1340,30 @@ function node_search_admin() {
     '#type' => 'details',
     '#title' => t('Content ranking'),
   );
-  $form['content_ranking']['#theme'] = 'node_search_admin';
+
   $form['content_ranking']['info'] = array(
-    '#value' => '<em>' . t('The following numbers control which properties the content search should favor when ordering the results. Higher numbers mean more influence, zero means the property is ignored. Changing these numbers does not require the search index to be rebuilt. Changes take effect immediately.') . '</em>'
+    '#markup' => '<em>' . t('The following numbers control which properties the content search should favor when ordering the results. Higher numbers mean more influence, zero means the property is ignored. Changing these numbers does not require the search index to be rebuilt. Changes take effect immediately.') . '</em>'
+  );
+
+  $form['content_ranking']['factors'] = array(
+    '#type' => 'table',
+    '#header' => array(t('Factor'), t('Weight')),
   );
 
   // Note: reversed to reflect that higher number = higher ranking.
   $options = drupal_map_assoc(range(0, 10));
   foreach (module_invoke_all('ranking') as $var => $values) {
-    $form['content_ranking']['factors']['node_rank_' . $var] = array(
+    $row = array();
+    $row['factor'] = array('#markup' => $values['title']);
+    $row['node_rank_' . $var] = array(
       '#title' => $values['title'],
+      '#title_display' => 'invisible',
       '#type' => 'select',
       '#options' => $options,
+      '#tree' => FALSE,
       '#default_value' => variable_get('node_rank_' . $var, 0),
     );
+    $form['content_ranking']['factors'][] = $row;
   }
   return $form;
 }
@@ -1525,24 +1532,24 @@ function node_user_predelete($account) {
  * @see node_search_admin()
  * @ingroup themeable
  */
-function theme_node_search_admin($variables) {
-  $form = $variables['form'];
-
-  $output = drupal_render($form['info']);
-
-  $header = array(t('Factor'), t('Weight'));
-  foreach (element_children($form['factors']) as $key) {
-    $row = array();
-    $row[] = $form['factors'][$key]['#title'];
-    $form['factors'][$key]['#title_display'] = 'invisible';
-    $row[] = drupal_render($form['factors'][$key]);
-    $rows[] = $row;
-  }
-  $output .= theme('table', array('header' => $header, 'rows' => $rows));
-
-  $output .= drupal_render_children($form);
-  return $output;
-}
+//function theme_node_search_admin($variables) {
+//  $form = $variables['form'];
+//
+//  $output = drupal_render($form['info']);
+//
+//  $header = array();
+//  foreach (element_children($form['factors']) as $key) {
+//    $row = array();
+//    $row[] = $form['factors'][$key]['#title'];
+//    $form['factors'][$key]['#title_display'] = 'invisible';
+//    $row[] = drupal_render($form['factors'][$key]);
+//    $rows[] = $row;
+//  }
+//  $output .= theme('table', array('header' => $header, 'rows' => $rows));
+//
+//  $output .= drupal_render_children($form);
+//  return $output;
+//}
 
 /**
  * Access callback: Checks node revision access.