--- logotool.old.module	2006-07-27 19:12:30.000000000 +0200
+++ logotool.module	2007-02-15 00:05:08.865700200 +0100
@@ -29,16 +29,32 @@ function logotool_perm() {
 function logotool_menu($may_cache) {
   $items = array();
   if ($may_cache) {
+    $access = user_access('administer logotool');
     $items[] = array('path' => 'logotool/logo',
       'callback' => 'logotool_logo',
       'access' => TRUE,
       'type' => MENU_CALLBACK
     );
+    $items[] = array('title' => 'logotool',
+      'path' => 'admin/settings/logotool',
+      'callback' => 'logotool_admin_settings',
+      'access' => $access,
+      'type' => MENU_NORMAL_ITEM
+    );
+    $items[] = array(
+      'path' => 'admin/settings/logotool/settings',
+      'title' => t('settings'),
+      'access' => $access, 
+      'weight' => 0,
+      'callback' => 'logotool_admin_settings',
+      'type' => MENU_DEFAULT_LOCAL_TASK,
+    );
     $items[] = array('title' => 'logotool info',
       'path' => 'admin/settings/logotool/logos',
       'callback' => 'logotool_logos',
-      'access' => user_access('administer logotool'),
-      'type' => MENU_NORMAL_ITEM
+      'access' => $access,
+      'weight' => 10,
+      'type' => MENU_LOCAL_TASK
     );
   }
   return $items;
@@ -47,7 +63,7 @@ function logotool_menu($may_cache) {
 /**
  * Implementation of hook_settings
  */
-function logotool_settings() {
+function logotool_admin_settings() {
   $form['logo1'] = array(
     '#type' => 'fieldset',
     '#title' => t('Logo Tool Settings:'),
@@ -84,7 +100,7 @@ function logotool_settings() {
     '#title' => t('Specific logos for specific pages'),
     '#default_value' => variable_get('logotool_pages', ''),
     '#cols' => 45,
-    '#rows' => 50,
+    '#rows' => 10,
     '#description' => t('Specify here pages which will have a specific logo, any pages not specified
       will display the default/ main logo.<br>Structure your entries like this:
       <p><strong>node/1|logo1.jpg<br />node/2|logo5.jpg<br />admin*|admin.png</strong></p>
@@ -111,7 +127,7 @@ function logotool_settings() {
     }
     logotool_check();
   }
-  return $form;
+  return system_settings_form('logotool-admin-settings',$form);
 } // logotool_settings
 
 /**
@@ -229,12 +245,12 @@ function logotool_logos() {
       preg_match_all("/(.*)\|$file/", variable_get('logotool_pages', ''), $match);
       $count = count($match['0']);
       if (!$count) {
-        $list[] = array(array('data' => $a->basename), array('data' => ''), array('data' => '<img src="/logotool/logo?logo='.$a->basename.'">', 'align' => 'center'));
+        $list[] = array(array('data' => $a->basename), array('data' => ''), array('data' => '<img src="'.url('logotool/logo','logo='.$a->basename).'">', 'align' => 'center'));
       }
       unset($flag);
       foreach ($match[0] as $no => $m) {
         if (!$flag) {
-          $list[] = array(array('data' => $a->basename, 'rowspan' => $count), array('data' => $match[1][$no]), array('data' => '<img src="/logotool/logo?logo='.$a->basename.'">', 'align' => 'center', 'rowspan' => $count));
+          $list[] = array(array('data' => $a->basename, 'rowspan' => $count), array('data' => $match[1][$no]), array('data' => '<img src="'.url('logotool/logo','logo='.$a->basename).'">', 'align' => 'center', 'rowspan' => $count));
           $flag = TRUE;
         }
         else {