--- a/modules/dnd_test/dnd_test.module	Fri Mar 13 19:34:05 2009 -0500
+++ b/modules/dnd_test/dnd_test.module	Tue Mar 17 06:25:47 2009 -0500
@@ -7,7 +7,7 @@
   $items = array();
   $items['dnd-test/library'] = array(
     'title' => 'Drag and drop test library',
-    'page callback' => 'dnd_test_library',
+    'page callback' => 'dnd_test_dnd_library',
     'access arguments' => array('access dnd test library'),
   );
   return $items;
@@ -27,11 +27,11 @@
  */
 function dnd_test_form_alter(&$form, &$form_state) {
   if ($form['#id'] == 'node-form' && $form['type']['#value'] == 'page') {
-    drupal_add_css(drupal_get_path('module', 'dnd_test') .'/dnd_test.css');
     $form['body_field']['body']['#dnd-enabled'] = TRUE;
     $form['body_field']['body']['#dnd-settings'] = array(
       'drop_selector' => '#edit-body-dnd-library .drop',
-      'url' => 'dnd-test/library',
+      'callback' => 'dnd_test_dnd_library',
+      'url' => 'dnd-test/library/?json',
     );
     $form['body_field']['body']['#rows'] = 28;
   }
@@ -54,26 +54,16 @@
       'arguments' => array('i' => NULL),
       'template'  => 'dnd-library-preview',
     ),
-    'dnd_library_header' => array(
-      'arguments' => array('page' => NULL),
-      'template'  => 'dnd-library-header',
-    ),
   );
 }
 
 /**
- * Page callback that returns some JSON
+ * Overloaded page callback.
  */
-function dnd_test_library() {
-  $page = ($_GET['page']) ? $_GET['page'] : 1;
-  $test_library = dnd_test_generate_library($page);
-  return drupal_json(array(
-    'header'  => theme('dnd_library_header', $page),
-    'library' => $test_library['library'],
-    'editor_representations' => $test_library['editor_representations'],
-    'library_previews' => $test_library['library_previews'],
-    'footer'  => '<div class="pager">'. l(t('1'), 'dnd-test/library') . ' '. l(t('2'), 'dnd-test/library', array('query' => array('page' => 2))) .'</div>',
-  ));
+function dnd_test_dnd_library($element = NULL) {
+  $page = (array_key_exists('page', $_GET)) ? $_GET['page'] : 1;
+  drupal_add_css(drupal_get_path('module', 'dnd_test') .'/dnd_test.css');
+  drupal_json(dnd_test_generate_library($page));
 }
 
 /**
@@ -83,7 +73,7 @@
   $start = ($page * $limit) - ($limit); 
   $end   = $page * $limit;
 
-  $library = '';
+  $library = theme('dnd_library_header', $page);
   $editor_representations = array();
   $library_previews = array();
   for ($i=$start + 1; $i < $end + 1; $i++) {