Index: CRM/Mailing/Menu.php
===================================================================
--- CRM/Mailing/Menu.php	(revision 5743)
+++ CRM/Mailing/Menu.php	(working copy)
@@ -44,7 +44,7 @@
                              'path'    => 'civicrm/mailing',
                              'title'   => ts('CiviMail'),
                              'access'  => CRM_Utils_System::checkPermission( 'access CiviMail' ),
-                             'type'    => CRM_Utils_Menu::CALLBACK,
+                             'type'    => CRM_Utils_Menu::NORMAL_ITEM,
                              'crmType' => CRM_Utils_Menu::NORMAL_ITEM,  
                              'weight'  => 600,
                              ),
@@ -53,7 +53,7 @@
                              'path'    => 'civicrm/mailing/component',
                              'title'   => ts('Mailing Header / Footer'),
                              'access'  => CRM_Utils_System::checkPermission( 'access CiviMail' ),
-                             'type'    => CRM_Utils_Menu::CALLBACK,
+                             'type'    => CRM_Utils_Menu::NORMAL_ITEM,
                              'crmType' => CRM_Utils_Menu::NORMAL_ITEM,  
                              'weight'  => 610,
                              ),
@@ -62,7 +62,7 @@
                              'path'    => 'civicrm/mailing/send',
                              'title'   => ts('Send Mailing'),
                              'access'  => CRM_Utils_System::checkPermission( 'access CiviMail' ),
-                             'type'    => CRM_Utils_Menu::CALLBACK,
+                             'type'    => CRM_Utils_Menu::NORMAL_ITEM,
                              'crmType' => CRM_Utils_Menu::NORMAL_ITEM,  
                              'weight'  => 620,
                              ),
@@ -71,7 +71,7 @@
                              'path'    => 'civicrm/mailing/browse',
                              'title'   => ts( 'Browse Sent Mailings' ),
                              'access'  => CRM_Utils_System::checkPermission( 'access CiviMail' ),
-                             'type'    => CRM_Utils_Menu::CALLBACK, 
+                             'type'    => CRM_Utils_Menu::NORMAL_ITEM, 
                              'crmType' => CRM_Utils_Menu::NORMAL_ITEM,  
                              'weight'  => 630, 
                              ),
Index: CRM/Utils/Menu.php
===================================================================
--- CRM/Utils/Menu.php	(revision 5743)
+++ CRM/Utils/Menu.php	(working copy)
@@ -102,9 +102,10 @@
                             'path'    => 'civicrm/admin',
                             'title'   => ts('Administer CiviCRM'),
                             'qs'      => 'reset=1',
+                            'query'   => 'reset=1',
                             'access'  => CRM_Utils_System::checkPermission('administer CiviCRM') &&
                                          CRM_Utils_System::checkPermission( 'access CiviCRM' ),
-                            'type'    => self::CALLBACK,
+                            'type'    => self::NORMAL_ITEM,
                             'crmType' => self::NORMAL_ITEM,
                             'weight'  => 40,
                             ),
@@ -330,7 +331,8 @@
                             'path'    => 'civicrm/contact/search/basic',
                             'title'   => ts('Find Contacts'),
                             'qs'      => 'reset=1',
-                            'type'    => self::CALLBACK,
+                            'query'   => 'reset=1',
+                            'type'    => self::NORMAL_ITEM,
                             'crmType' => self::DEFAULT_LOCAL_TASK | self::NORMAL_ITEM,
                             'access'  => CRM_Utils_System::checkPermission( 'access CiviCRM' ),
                             'weight'  => 0
@@ -348,9 +350,10 @@
                             'path'   => 'civicrm/contact/addI',
                             'title'  => ts('New Individual'),
                             'qs'     => 'reset=1',
+                            'query'  => 'c_type=Individual&reset=1',
                             'access' => CRM_Utils_System::checkPermission('add contacts') &&
                                         CRM_Utils_System::checkPermission( 'access CiviCRM' ),
-                            'type'   => self::CALLBACK,
+                            'type'   => self::NORMAL_ITEM,
                             'crmType'=> self::CALLBACK,
                             'weight' => 1
                             ),
@@ -359,9 +362,10 @@
                             'path'   => 'civicrm/contact/addO',
                             'title'  => ts('New Organization'),
                             'qs'     => 'reset=1',
+                            'query'  => 'c_type=Organization&reset=1',
                             'access' => CRM_Utils_System::checkPermission('add contacts') &&
                                         CRM_Utils_System::checkPermission( 'access CiviCRM' ),
-                            'type'   => self::CALLBACK,
+                            'type'   => self::NORMAL_ITEM,
                             'crmType'=> self::CALLBACK,
                             'weight' => 1
                             ),
@@ -370,9 +374,10 @@
                             'path'   => 'civicrm/contact/addH',
                             'title'  => ts('New Household'),
                             'qs'     => 'reset=1',
+                            'query'  => 'c_type=Household&reset=1',
                             'access' => CRM_Utils_System::checkPermission('add contacts') &&
                                         CRM_Utils_System::checkPermission( 'access CiviCRM' ),
-                            'type'   => self::CALLBACK,
+                            'type'   => self::NORMAL_ITEM,
                             'crmType'=> self::CALLBACK,
                             'weight' => 1
                             ),
@@ -451,7 +456,8 @@
                             'path'   => 'civicrm/group',
                             'title'  => ts('Manage Groups'),
                             'qs'     => 'reset=1',
-                            'type'   => self::CALLBACK,
+                            'query'  => 'reset=1',
+                            'type'   => self::NORMAL_ITEM,
                             'crmType'=> self::NORMAL_ITEM,
                             'access' => CRM_Utils_System::checkPermission( 'access CiviCRM' ),
                             'weight' => 20,
@@ -469,7 +475,7 @@
                             'title'   => ts('Create New Group'),
                             'access' => CRM_Utils_System::checkPermission('edit groups') &&
                             CRM_Utils_System::checkPermission( 'access CiviCRM' ),
-                            'type'    => self::CALLBACK,
+                            'type'    => self::NORMAL_ITEM,
                             'crmType' => self::CALLBACK,
                             'weight'  => 0,
                             ),
@@ -478,29 +484,32 @@
                             'path'   => 'civicrm/import',
                             'title'  => ts( 'Import' ),
                             'qs'     => 'reset=1',
+                            'query'  => 'reset=1',
                             'access' => CRM_Utils_System::checkPermission('administer CiviCRM') &&
                                         CRM_Utils_System::checkPermission( 'access CiviCRM' ),
-                            'type'   =>  CRM_Utils_Menu::CALLBACK,
+                            'type'   =>  CRM_Utils_Menu::NORMAL_ITEM,
                             'crmType'=>  CRM_Utils_Menu::NORMAL_ITEM,
                             'weight' =>  400,
                             ),
                       array( 
                              'path'    => 'civicrm/import/contact',
                              'qs'      => 'reset=1',
+                             'query'   => 'reset=1',
                              'title'   => ts( 'Contacts' ), 
                              'access'  => CRM_Utils_System::checkPermission('administer CiviCRM') &&
                                           CRM_Utils_System::checkPermission( 'access CiviCRM' ), 
-                             'type'    => CRM_Utils_Menu::CALLBACK,  
+                             'type'    => CRM_Utils_Menu::NORMAL_ITEM,  
                              'crmType' => CRM_Utils_Menu::NORMAL_ITEM,  
                              'weight'  => 410,
                              ),
                        array( 
                              'path'    => 'civicrm/import/activityHistory', 
                              'qs'      => 'reset=1',
+                             'query'   => 'reset=1',
                              'title'   => ts( 'Activity History' ), 
                              'access'  => CRM_Utils_System::checkPermission('administer CiviCRM') &&
                                           CRM_Utils_System::checkPermission( 'access CiviCRM' ),
-                             'type'    => CRM_Utils_Menu::CALLBACK,  
+                             'type'    => CRM_Utils_Menu::NORMAL_ITEM,  
                              'crmType' => CRM_Utils_Menu::NORMAL_ITEM,  
                              'weight'  => 420,  
                              ),