diff --git a/src/controller/channel/Channel.java b/src/controller/channel/Channel.java
index dedd7573..c7d946cc 100644
--- a/src/controller/channel/Channel.java
+++ b/src/controller/channel/Channel.java
@@ -792,7 +792,6 @@ public class Channel extends Configuration
 	
 	private void setupLogging()
 	{
-		mLog.debug( "Setting up logging ..." );
 		if( mProcessingChain != null )
 		{
 			String channelName = getChannelName();
@@ -800,9 +799,6 @@ public class Channel extends Configuration
 			List<Module> loggers = mResourceManager.getEventLogManager()
 					.getLoggers( mEventLogConfiguration, channelName );
 			
-			mLog.debug( "Created [" + loggers.size() + "] loggers for [" + 
-					channelName + "]" );
-
 			if( !loggers.isEmpty() )
 			{
 				mProcessingChain.addModules( loggers );
diff --git a/src/module/decode/mpt1327/MPT1327DecoderPanel.java b/src/module/decode/mpt1327/MPT1327DecoderPanel.java
index 1288d3b4..d367d382 100644
--- a/src/module/decode/mpt1327/MPT1327DecoderPanel.java
+++ b/src/module/decode/mpt1327/MPT1327DecoderPanel.java
@@ -118,18 +118,30 @@ public class MPT1327DecoderPanel extends DecoderPanel
 			add( mFromTalkgroupAliasLabel, "wrap" );
 		}
 	}
-	
+
 	private void setAliasLabel( final JLabel label, final Alias alias )
+	{
+		setAliasLabel( label, alias, true );
+	}
+	
+	private void setAliasLabel( final JLabel label, final Alias alias, boolean includeIcon )
 	{
 		if( alias != null )
 		{
 			label.setText( alias.getName() );
-			
-			String iconName = alias.getIconName();
-			
-			if( iconName != null )
+
+			if( includeIcon )
 			{
-				label.setIcon( mSettingsManager.getImageIcon( iconName, 12 ) );
+				String iconName = alias.getIconName();
+				
+				if( iconName != null )
+				{
+					label.setIcon( mSettingsManager.getImageIcon( iconName, 12 ) );
+				}
+				else
+				{
+					label.setIcon( null );
+				}
 			}
 			else
 			{
@@ -157,7 +169,7 @@ public class MPT1327DecoderPanel extends DecoderPanel
 				{
 					case CHANNEL_SITE_NUMBER:
 						mSiteOrToTalkgroup.setText( String.valueOf( state.getSite() ) );
-						setAliasLabel( mSiteOrToTalkgroupAlias, state.getSiteAlias() );
+						setAliasLabel( mSiteOrToTalkgroupAlias, state.getSiteAlias(), false );
 						repaint();
 						break;
 					case TO_TALKGROUP:
diff --git a/src/module/decode/state/ChannelStatePanel.java b/src/module/decode/state/ChannelStatePanel.java
index 15addcb5..3210c967 100644
--- a/src/module/decode/state/ChannelStatePanel.java
+++ b/src/module/decode/state/ChannelStatePanel.java
@@ -27,6 +27,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import playlist.PlaylistManager;
+import record.RecorderType;
+import record.config.RecordConfiguration;
 import sample.Listener;
 import settings.ColorSetting;
 import settings.ColorSetting.ColorSettingName;
@@ -69,6 +71,10 @@ public class ChannelStatePanel extends JPanel
 
     private JLabel mStateLabel;
     private JLabel mSourceLabel;
+    private JLabel mOptionsLabel;
+    
+    private JLabel mSystemLabel;
+    private JLabel mSiteLabel;
     private JLabel mChannelLabel;
 
     private PlaylistManager mPlaylistManager;
@@ -109,7 +115,22 @@ public class ChannelStatePanel extends JPanel
 	{
     	getColors();
 
-    	setLayout( new MigLayout( "insets 3 2 2 2", "[grow,fill]", "[]0[]0[]") );
+    	setLayout( new MigLayout( "insets 1 1 1 1", "[grow,fill]", "[]0[]0[]") );
+		
+		mSystemLabel = new JLabel( mChannel.getSystem().getName() );
+		mSystemLabel.setFont( mFontDetails );
+		mSystemLabel.setForeground( mColorLabelDetails );
+		add( mSystemLabel );
+		
+		mSiteLabel = new JLabel( mChannel.getSite().getName() );
+		mSiteLabel.setFont( mFontDetails );
+		mSiteLabel.setForeground( mColorLabelDetails );
+		add( mSiteLabel );
+
+		mChannelLabel = new JLabel( mChannel.getName() );
+		mChannelLabel.setFont( mFontDetails );
+		mChannelLabel.setForeground( mColorLabelDetails );
+		add( mChannelLabel, "wrap" );
 		
 		mStateLabel = new JLabel( mChannel.getChannelState().getState()
 				.getDisplayValue() );
@@ -122,10 +143,32 @@ public class ChannelStatePanel extends JPanel
 		mSourceLabel.setForeground( mColorLabelDetails );
 		add( mSourceLabel );
 		
-		mChannelLabel = new JLabel( mChannel.getChannelDisplayName() );
-		mChannelLabel.setFont( mFontDetails );
-		mChannelLabel.setForeground( mColorLabelDetails );
-		add( mChannelLabel, "wrap" );
+		StringBuilder sb = new StringBuilder();
+
+		if( !mChannel.getEventLogConfiguration().getLoggers().isEmpty() )
+		{
+			sb.append( "LOG " );
+		}
+		
+		RecordConfiguration recordConfig = mChannel.getRecordConfiguration();
+		
+		if( recordConfig.getRecorders().contains( RecorderType.AUDIO ) )
+		{
+			sb.append( "AUDIO " );
+		}
+		
+		if( recordConfig.getRecorders().contains( RecorderType.BASEBAND ) ||
+			recordConfig.getRecorders().contains( RecorderType.TRAFFIC_BASEBAND ) )
+		{
+			sb.append( "BASEBAND" );
+		}
+		
+		mOptionsLabel = new JLabel( sb.toString() );
+		mOptionsLabel.setFont( mFontDetails );
+		mOptionsLabel.setForeground( mColorLabelAuxDecoder );
+		add( mOptionsLabel, "wrap" );
+
+//		add( new JSeparator( JSeparator.HORIZONTAL ), "span,growx" );
 	}
 	
 	public Channel getChannel()