2 files changed, 8 insertions, 6 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 3b1a0c1..3f7a7da 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2203,11 +2203,12 @@ void KABCore::addActionsManually()
   mActionSetFormattedName->plug( changeMenu );
   mActionRemoveVoice->plug( changeMenu );
-  // settings menu
+  // settingsmings menu
 //US special menuentry to configure the addressbook resources. On KDE
 // you do that through the control center !!!
-  mActionConfigResources->plug( settingsMenu );
-  settingsMenu->insertSeparator();
+  // settingsMenu->insertSeparator();
 
-  mActionConfigKAddressbook->plug( settingsMenu );
+  mActionConfigKAddressbook->plug( settingsMenu, 0 );
+  mActionConfigResources->plug( settingsMenu,1 );
+  settingsMenu->insertSeparator(2);
 
   if ( mIsPart ) {
diff --git a/libkdepim/categoryeditdialog_base.cpp b/libkdepim/categoryeditdialog_base.cpp
index 2390bbd..1908576 100644
--- a/libkdepim/categoryeditdialog_base.cpp
+++ b/libkdepim/categoryeditdialog_base.cpp
@@ -37,5 +37,5 @@ CategoryEditDialog_base::CategoryEditDialog_base( QWidget* parent, const char* n
     mEdit = new QLineEdit( this, "mEdit" );
 
-    CategoryEditDialog_baseLayout->addMultiCellWidget( mEdit, 1, 1, 0, 1 );
+    CategoryEditDialog_baseLayout->addMultiCellWidget( mEdit, 1, 1, 0, 0 );
 
     Layout13 = new QHBoxLayout( 0, 0, 6, "Layout13"); 
@@ -69,5 +69,6 @@ CategoryEditDialog_base::CategoryEditDialog_base( QWidget* parent, const char* n
 
     mButtonAdd = new QPushButton( this, "mButtonAdd" );
-    layout103->addWidget( mButtonAdd );
+    CategoryEditDialog_baseLayout->addMultiCellWidget(mButtonAdd , 1, 1, 1, 1 );
+    //layout103->addWidget( mButtonAdd );
 
     mButtonModify = new QPushButton( this, "mButtonModify" );