diff --git a/src/details.php b/src/details.php
index 93a9842..7266fe3 100644
--- a/src/details.php
+++ b/src/details.php
@@ -168,94 +168,107 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['uid_current'
 			$counter = 0;
 			foreach($content['fields'] as $mycolkey => $myfield)
 			{
-//				// Default copy value into array!
-//				$content['fields'][$mycolkey]['FieldValue'] = $logArray[$mycolkey];
-
-				// --- Set CSS Class
-				if ( $counter % 2 == 0 )
-					$content['fields'][$mycolkey]['cssclass'] = "line1";
-				else
-					$content['fields'][$mycolkey]['cssclass'] = "line2";
-				// --- 
-
-				// Set defaults
-				$content['fields'][$mycolkey]['fieldbgcolor'] = "";
-				$content['fields'][$mycolkey]['hasdetails'] = "false";
-
-				if ( $content['fields'][$mycolkey]['FieldType'] == FILTER_TYPE_DATE )
+				if ( isset($logArray[$mycolkey]) && ( is_array($logArray[$mycolkey]) || (is_string($logArray[$mycolkey]) && strlen($logArray[$mycolkey]) > 0)) )
 				{
-					$content['fields'][$mycolkey]['fieldvalue'] = GetFormatedDate($logArray[$mycolkey]); 
-					// TODO: Show more!
-				}
-				else if ( $content['fields'][$mycolkey]['FieldType'] == FILTER_TYPE_NUMBER )
-				{
-					$content['fields'][$mycolkey]['fieldvalue'] = $logArray[$mycolkey];
+					$content['fields'][$mycolkey]['fieldenabled'] = true;
 
-					// Special style classes and colours for SYSLOG_FACILITY
-					if ( $mycolkey == SYSLOG_FACILITY )
-					{
-						if ( isset($logArray[$mycolkey][SYSLOG_FACILITY]) && strlen($logArray[$mycolkey][SYSLOG_FACILITY]) > 0)
-						{
-							$content['fields'][$mycolkey]['fieldbgcolor'] = 'bgcolor="' . $facility_colors[ $logArray[SYSLOG_FACILITY] ] . '" ';
-							$content['fields'][$mycolkey]['cssclass'] = "lineColouredBlack";
+	//				// Default copy value into array!
+	//				$content['fields'][$mycolkey]['FieldValue'] = $logArray[$mycolkey];
 
-							// Set Human readable Facility!
-							$content['fields'][$mycolkey]['fieldvalue'] = GetFacilityDisplayName( $logArray[$mycolkey] );
-						}
-						else
-						{
-							// Use default colour!
-							$content['fields'][$mycolkey]['fieldbgcolor'] = 'bgcolor="' . $facility_colors[SYSLOG_LOCAL0] . '" ';
-						}
-					}
-					else if ( $mycolkey == SYSLOG_SEVERITY )
-					{
-						if ( isset($logArray[$mycolkey][SYSLOG_SEVERITY]) && strlen($logArray[$mycolkey][SYSLOG_SEVERITY]) > 0)
-						{
-							$content['fields'][$mycolkey]['fieldbgcolor'] = 'bgcolor="' . $severity_colors[ $logArray[SYSLOG_SEVERITY] ] . '" ';
-							$content['fields'][$mycolkey]['cssclass'] = "lineColouredWhite";
+					// --- Set CSS Class
+					if ( $counter % 2 == 0 )
+						$content['fields'][$mycolkey]['cssclass'] = "line1";
+					else
+						$content['fields'][$mycolkey]['cssclass'] = "line2";
 
-							// Set Human readable Facility!
-							$content['fields'][$mycolkey]['fieldvalue'] = GetSeverityDisplayName( $logArray[$mycolkey] );
-						}
-						else
-						{
-							// Use default colour!
-							$content['fields'][$mycolkey]['fieldbgcolor'] = 'bgcolor="' . $severity_colors[SYSLOG_INFO] . '" ';
-						}
-					}
-					else if ( $mycolkey == SYSLOG_MESSAGETYPE )
-					{
-						if ( isset($logArray[$mycolkey][SYSLOG_MESSAGETYPE]) )
-						{
-							$content['fields'][$mycolkey]['fieldbgcolor'] = 'bgcolor="' . $msgtype_colors[ $logArray[SYSLOG_MESSAGETYPE] ] . '" ';
-							$content['fields'][$mycolkey]['cssclass'] = "lineColouredBlack";
-
-							// Set Human readable Facility!
-							$content['fields'][$mycolkey]['fieldvalue'] = GetMessageTypeDisplayName( $logArray[$mycolkey] );
-						}
-						else
-						{
-							// Use default colour!
-							$content['fields'][$mycolkey]['fieldbgcolor'] = 'bgcolor="' . $msgtype_colors[IUT_Unknown] . '" ';
-						}
-						
-					}
-				}
-				else if ( $content['fields'][$mycolkey]['FieldType'] == FILTER_TYPE_STRING )
-				{
-					if ( $mycolkey == SYSLOG_MESSAGE )
-						$content['fields'][$mycolkey]['fieldvalue'] = ReplaceLineBreaksInString( GetStringWithHTMLCodes($logArray[$mycolkey]) );
-					else	// kindly copy!
-						$content['fields'][$mycolkey]['fieldvalue'] = ReplaceLineBreaksInString( $logArray[$mycolkey] );
-
-					// --- HOOK here to add context links!
-					AddContextLinks($content['fields'][$mycolkey]['fieldvalue']);
+					if ( $mycolkey == SYSLOG_MESSAGE)
+						$content['fields'][$mycolkey]['menucssclass'] = "cellmenu1_naked";
+					else
+						$content['fields'][$mycolkey]['menucssclass'] = "cellmenu1";
 					// --- 
-				}
 
-				// Increment helpcounter
-				$counter++;
+					// Set defaults
+					$content['fields'][$mycolkey]['fieldbgcolor'] = "";
+					$content['fields'][$mycolkey]['hasdetails'] = "false";
+
+					if ( $content['fields'][$mycolkey]['FieldType'] == FILTER_TYPE_DATE )
+					{
+						$content['fields'][$mycolkey]['fieldvalue'] = GetFormatedDate($logArray[$mycolkey]); 
+						// TODO: Show more!
+					}
+					else if ( $content['fields'][$mycolkey]['FieldType'] == FILTER_TYPE_NUMBER )
+					{
+						$content['fields'][$mycolkey]['fieldvalue'] = $logArray[$mycolkey];
+
+						// Special style classes and colours for SYSLOG_FACILITY
+						if ( $mycolkey == SYSLOG_FACILITY )
+						{
+							if ( isset($logArray[$mycolkey][SYSLOG_FACILITY]) && strlen($logArray[$mycolkey][SYSLOG_FACILITY]) > 0)
+							{
+								$content['fields'][$mycolkey]['fieldbgcolor'] = 'bgcolor="' . $facility_colors[ $logArray[SYSLOG_FACILITY] ] . '" ';
+								$content['fields'][$mycolkey]['cssclass'] = "lineColouredBlack";
+
+								// Set Human readable Facility!
+								$content['fields'][$mycolkey]['fieldvalue'] = GetFacilityDisplayName( $logArray[$mycolkey] );
+							}
+							else
+							{
+								// Use default colour!
+								$content['fields'][$mycolkey]['fieldbgcolor'] = 'bgcolor="' . $facility_colors[SYSLOG_LOCAL0] . '" ';
+							}
+						}
+						else if ( $mycolkey == SYSLOG_SEVERITY )
+						{
+							if ( isset($logArray[$mycolkey][SYSLOG_SEVERITY]) && strlen($logArray[$mycolkey][SYSLOG_SEVERITY]) > 0)
+							{
+								$content['fields'][$mycolkey]['fieldbgcolor'] = 'bgcolor="' . $severity_colors[ $logArray[SYSLOG_SEVERITY] ] . '" ';
+								$content['fields'][$mycolkey]['cssclass'] = "lineColouredWhite";
+
+								// Set Human readable Facility!
+								$content['fields'][$mycolkey]['fieldvalue'] = GetSeverityDisplayName( $logArray[$mycolkey] );
+							}
+							else
+							{
+								// Use default colour!
+								$content['fields'][$mycolkey]['fieldbgcolor'] = 'bgcolor="' . $severity_colors[SYSLOG_INFO] . '" ';
+							}
+						}
+						else if ( $mycolkey == SYSLOG_MESSAGETYPE )
+						{
+							if ( isset($logArray[$mycolkey][SYSLOG_MESSAGETYPE]) )
+							{
+								$content['fields'][$mycolkey]['fieldbgcolor'] = 'bgcolor="' . $msgtype_colors[ $logArray[SYSLOG_MESSAGETYPE] ] . '" ';
+								$content['fields'][$mycolkey]['cssclass'] = "lineColouredBlack";
+
+								// Set Human readable Facility!
+								$content['fields'][$mycolkey]['fieldvalue'] = GetMessageTypeDisplayName( $logArray[$mycolkey] );
+							}
+							else
+							{
+								// Use default colour!
+								$content['fields'][$mycolkey]['fieldbgcolor'] = 'bgcolor="' . $msgtype_colors[IUT_Unknown] . '" ';
+							}
+							
+						}
+					}
+					else if ( $content['fields'][$mycolkey]['FieldType'] == FILTER_TYPE_STRING )
+					{
+						if ( $mycolkey == SYSLOG_MESSAGE )
+							$content['fields'][$mycolkey]['fieldvalue'] = ReplaceLineBreaksInString( GetStringWithHTMLCodes($logArray[$mycolkey]) );
+						else	// kindly copy!
+							$content['fields'][$mycolkey]['fieldvalue'] = ReplaceLineBreaksInString( $logArray[$mycolkey] );
+
+						// --- HOOK here to add context links!
+						AddContextLinks($content['fields'][$mycolkey]['fieldvalue']);
+						// --- 
+					}
+
+					// Increment helpcounter
+					$counter++;
+				}
+				else
+					$content['fields'][$mycolkey]['fieldenabled'] = false;
+
 			}
 
 //print_r ( $content['fields'] );
diff --git a/src/templates/details.html b/src/templates/details.html
index eb80a7d..43ce3b3 100644
--- a/src/templates/details.html
+++ b/src/templates/details.html
@@ -70,8 +70,9 @@
 	<!-- IF messageenabled="true" -->
 	<table width="100%" cellpadding="0" cellspacing="1" border="0" align="center" class="with_border_alternate">
 	<!-- BEGIN fields -->
+	<!-- IF fieldenabled="true" -->
 	<tr>
-		<td width="200" class="cellmenu1" align="left" nowrap>
+		<td width="200" class="{menucssclass}" align="left" nowrap>
 			<B>{FieldCaption}</B>
 		</td>
 		<td width="100%" align="{FieldAlign}" class="{cssclass}" {fieldbgcolor} valign="top">
@@ -80,6 +81,7 @@
 		{fieldvalue}
 		</td>
 	</tr>
+	<!-- ENDIF fieldenabled="true" -->
 	<!-- END fields -->
 	</table>
 	<!-- ENDIF messageenabled="true" -->
diff --git a/src/templates/include_menu.html b/src/templates/include_menu.html
index f0bf7ad..27da9a8 100644
--- a/src/templates/include_menu.html
+++ b/src/templates/include_menu.html
@@ -16,7 +16,6 @@
 				<li class="topmenu2"><a class="topmenu2_link" href="http://wiki.rsyslog.com/index.php/PhpLogCon_FAQ" target="phplogcon_help"><img align="left" src="{MENU_BULLET_YELLOW}" width="16" height="16" vspace="0">{LN_MENU_WIKI}</a></li>
 				<li class="topmenu2"><a class="topmenu2_link" href="http://www.phplogcon.org/doc-professional_services.html" target="phplogcon_help"><img align="left" src="{MENU_BULLET_YELLOW}" width="16" height="16" vspace="0">{LN_MENU_PROSERVICES}</a></li>
 			</ul>
-
 		  </li>
 		</ul></div>
 	</td>