--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/ModuleSelection.java	Tue Jul 24 11:12:46 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/ModuleSelection.java	Tue Jul 24 11:26:15 2018 +0200
@@ -221,7 +221,6 @@
             final  ModuleGroup group = groupEntry.getKey();
             final List<Module> groupModule = groupEntry.getValue();
             
-            
             final RadioGroupItem moduleRadio = new RadioGroupItem("modulegroup" + count++);
             moduleRadio.setShowTitle(false);
             moduleRadio.setWrap(false);
@@ -254,16 +253,21 @@
             if( group.showGroupFrame() )
             {
                 final HLayout layout = new HLayout();
+                layout.setIsGroup(true);
+                layout.setGroupTitle(group.toString());
+                layout.setWidth("250");
 
+                /* push elements to right */
                 final LayoutSpacer spacer = new LayoutSpacer();
-                // so text is on the same level as other items (with radio-icon), lets hope 25px is always right
-                spacer.setWidth(25);
+                spacer.setWidth("*");
                 layout.addMember(spacer);
 
-                final Label label = new Label(group.toString());
-                layout.addMember(label);
+                layout.addMember(groupForm);
 
-                layout.addMember(groupForm);
+                /* put leave a bit space on the right side */
+                final LayoutSpacer spacer2 = new LayoutSpacer();
+                spacer2.setWidth("15");
+                layout.addMember(spacer2);
                 
                 groupPanel = layout;
             }