diff --git a/ccm-core/src/com/arsdigita/ui/admin/GroupAdministrationTab.java b/ccm-core/src/com/arsdigita/ui/admin/GroupAdministrationTab.java
index 8738d141a..f6e561cbf 100755
--- a/ccm-core/src/com/arsdigita/ui/admin/GroupAdministrationTab.java
+++ b/ccm-core/src/com/arsdigita/ui/admin/GroupAdministrationTab.java
@@ -28,6 +28,7 @@ import com.arsdigita.bebop.Page;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.RequestLocal;
 import com.arsdigita.bebop.SegmentedPanel;
+import com.arsdigita.bebop.SimpleContainer;
 import com.arsdigita.bebop.Tree;
 import com.arsdigita.bebop.event.ActionEvent;
 import com.arsdigita.bebop.event.ActionListener;
@@ -121,6 +122,8 @@ class GroupAdministrationTab extends BoxPanel implements AdminConstants, ChangeL
      * Constructor
      */
     public GroupAdministrationTab() {
+        super();
+        
         setClassAttr("sidebarNavPanel");
         setAttribute("navbar-title", "Groups");
 
@@ -150,16 +153,16 @@ class GroupAdministrationTab extends BoxPanel implements AdminConstants, ChangeL
         //final LayoutPanel panel = new LayoutPanel();
         panel.setClassAttr("navbar");
 
-        //m_tree = new Tree(new GroupTreeModel());
+        //m_tree = new Tree(new GroupTreeMode());
         groupTree = new Tree(new GroupTreeModelBuilder());
         groupTree.addChangeListener(this);
         panel.add(groupTree);
         //panel.setLeft(groupTree);
 
         add(panel);
-
+        
         final SegmentedPanel rightSide = new SegmentedPanel();
-        rightSide.setClassAttr("main");
+        rightSide.setClassAttr("main");        
 
         groupInfoPanel = buildGroupInfoPanel(rightSide);
         panelList.add(groupInfoPanel);
@@ -184,8 +187,8 @@ class GroupAdministrationTab extends BoxPanel implements AdminConstants, ChangeL
 
         groupDeleteFailedPanel = buildGroupDeleteFailedPanel(rightSide);
         panelList.add(groupDeleteFailedPanel);
-
-        add(rightSide);
+        
+        panel.add(rightSide);        
         //panel.setRight(rightSide);
     }
 
diff --git a/ccm-core/src/com/arsdigita/ui/admin/UserAdministrationTab.java b/ccm-core/src/com/arsdigita/ui/admin/UserAdministrationTab.java
index 51aa60870..38df7fb69 100644
--- a/ccm-core/src/com/arsdigita/ui/admin/UserAdministrationTab.java
+++ b/ccm-core/src/com/arsdigita/ui/admin/UserAdministrationTab.java
@@ -32,7 +32,6 @@ import com.arsdigita.bebop.event.ChangeListener;
 import com.arsdigita.bebop.list.ListModel;
 import com.arsdigita.bebop.list.ListModelBuilder;
 import com.arsdigita.globalization.GlobalizedMessage;
-import com.arsdigita.toolbox.ui.LayoutPanel;
 import static com.arsdigita.ui.admin.AdminConstants.USER_NAVBAR_TITLE;
 import static com.arsdigita.ui.admin.AdminConstants.USER_TAB_SUMMARY;
 import com.arsdigita.util.Assert;