diff --git a/src/controller/channel/ChannelEditor.java b/src/controller/channel/ChannelEditor.java
index 2e77fcab..8836a2da 100644
--- a/src/controller/channel/ChannelEditor.java
+++ b/src/controller/channel/ChannelEditor.java
@@ -52,7 +52,7 @@ public class ChannelEditor extends JPanel
 
 	private final static Logger mLog = LoggerFactory.getLogger( ChannelEditor.class );
 
-	private ChannelConfigurationEditor mNameConfigurationEditor;
+	private NameConfigurationEditor mNameConfigurationEditor;
     private DecodeComponentEditor mDecodeEditor;
     private AuxDecodeComponentEditor mAuxDecodeEditor;
     private EventLogComponentEditor mEventLogEditor;
diff --git a/src/module/decode/AuxDecodeComponentEditor.java b/src/module/decode/AuxDecodeComponentEditor.java
index 46ba84fb..62e3c292 100644
--- a/src/module/decode/AuxDecodeComponentEditor.java
+++ b/src/module/decode/AuxDecodeComponentEditor.java
@@ -23,6 +23,7 @@ import java.util.List;
 
 import javax.swing.JCheckBox;
 
+import net.miginfocom.swing.MigLayout;
 import module.decode.config.AuxDecodeConfiguration;
 import controller.channel.Channel;
 import controller.channel.ChannelConfigurationEditor;
@@ -38,6 +39,8 @@ public class AuxDecodeComponentEditor extends ChannelConfigurationEditor
     
 	public AuxDecodeComponentEditor()
 	{
+		setLayout( new MigLayout( "fill,wrap 1", "[]", "[][][][][grow]" ) );
+
 		List<DecoderType> decoders = DecoderType.getAuxDecoders();
 		
 		Collections.sort( decoders );
@@ -46,7 +49,7 @@ public class AuxDecodeComponentEditor extends ChannelConfigurationEditor
 		{
 			AuxDecoderCheckBox control = new AuxDecoderCheckBox( decoder );
 			
-			add( control, "wrap" );
+			add( control );
 
 			mControls.add( control );
 		}
diff --git a/src/module/log/EventLogComponentEditor.java b/src/module/log/EventLogComponentEditor.java
index f746b83d..07b7625e 100644
--- a/src/module/log/EventLogComponentEditor.java
+++ b/src/module/log/EventLogComponentEditor.java
@@ -21,6 +21,7 @@ import java.util.List;
 
 import javax.swing.JCheckBox;
 
+import net.miginfocom.swing.MigLayout;
 import module.log.config.EventLogConfiguration;
 import controller.channel.Channel;
 import controller.channel.ChannelConfigurationEditor;
@@ -38,9 +39,11 @@ public class EventLogComponentEditor extends ChannelConfigurationEditor
 
     public EventLogComponentEditor()
 	{
-		add( mBinaryLogger, "span" );
-		add( mDecodedLogger, "span" );
-		add( mCallEventLogger, "span" );
+		setLayout( new MigLayout( "fill,wrap 1", "[]", "[][][][grow]" ) );
+
+		add( mBinaryLogger );
+		add( mDecodedLogger );
+		add( mCallEventLogger );
 	}
 
     /**
diff --git a/src/record/RecordComponentEditor.java b/src/record/RecordComponentEditor.java
index 5873534d..8b12c08a 100644
--- a/src/record/RecordComponentEditor.java
+++ b/src/record/RecordComponentEditor.java
@@ -21,6 +21,7 @@ import java.util.List;
 
 import javax.swing.JCheckBox;
 
+import net.miginfocom.swing.MigLayout;
 import record.config.RecordConfiguration;
 import controller.channel.Channel;
 import controller.channel.ChannelConfigurationEditor;
@@ -38,9 +39,11 @@ public class RecordComponentEditor extends ChannelConfigurationEditor
     
     public RecordComponentEditor()
 	{
-		add( mAudioRecorder, "span" );
-		add( mBasebandRecorder, "span" );
-		add( mTrafficBasebandRecorder, "span" );
+		setLayout( new MigLayout( "fill,wrap 1", "[]", "[][][][grow]" ) );
+		
+		add( mAudioRecorder );
+		add( mBasebandRecorder );
+		add( mTrafficBasebandRecorder );
 	}
 
 	@Override