diff -ur nagios-2.7.original/cgi/extinfo.c nagios-2.7/cgi/extinfo.c
--- nagios-2.7.original/cgi/extinfo.c	2007-02-15 16:38:45.143063000 +0000
+++ nagios-2.7/cgi/extinfo.c	2007-02-15 16:48:07.024585045 +0000
@@ -356,12 +356,15 @@
 				temp_serviceextinfo=find_serviceextinfo(host_name,service_desc);
 				if(temp_serviceextinfo!=NULL){
 					if(temp_serviceextinfo->icon_image!=NULL){
+						printf("<A HREF='");
+						print_extra_service_url(temp_serviceextinfo->host_name, temp_serviceextinfo->description,temp_serviceextinfo->notes_url);
+						printf("'>");
 						printf("<img src='%s",url_logo_images_path);
 						print_extra_service_url(temp_serviceextinfo->host_name,temp_serviceextinfo->description,temp_serviceextinfo->icon_image);
-						printf("' border=0 alt='%s' title='%s'><BR CLEAR=ALL>",(temp_serviceextinfo->icon_image_alt==NULL)?"":temp_serviceextinfo->icon_image_alt,(temp_serviceextinfo->icon_image_alt==NULL)?"":temp_serviceextinfo->icon_image_alt);
+						printf("' border=0 alt='%s' title='%s'></A><BR CLEAR=ALL>",(temp_serviceextinfo->icon_image_alt==NULL)?"":temp_serviceextinfo->icon_image_alt,(temp_serviceextinfo->icon_image_alt==NULL)?"":temp_serviceextinfo->icon_image_alt);
 						}
 					if(temp_serviceextinfo->icon_image_alt!=NULL)
-						printf("<font size=-1><i>( %s )</i><font>\n",temp_serviceextinfo->icon_image_alt);
+						printf("<font size=-1><i>( %s )</i></font>\n",temp_serviceextinfo->icon_image_alt);
 					if(temp_serviceextinfo->notes!=NULL)
 						printf("<p>%s</p>\n",temp_serviceextinfo->notes);
 					}
@@ -407,7 +411,7 @@
 
 		else if(display_type==DISPLAY_SERVICE_INFO){
 			if(temp_serviceextinfo!=NULL){
-				printf("<TABLE BORDER='0'>\n");
+				printf("<TABLE BORDER='0'><TR><TD ALIGN='right'>\n");
 				if(temp_serviceextinfo->action_url!=NULL && strcmp(temp_serviceextinfo->action_url,"")){
 					printf("<A HREF='");
 					print_extra_service_url(temp_serviceextinfo->host_name,temp_serviceextinfo->description,temp_serviceextinfo->action_url);
@@ -420,7 +424,7 @@
 					printf("' TARGET='_blank'><img src='%s%s' border=0 alt='View Additional Notes For This Service' title='View Additional Notes For This Service'></A>\n",url_images_path,NOTES_ICON);
 					printf("<BR CLEAR=ALL><FONT SIZE=-1><I>Extra Service Notes</I></FONT><BR CLEAR=ALL><BR CLEAR=ALL>\n");
 				        }
-				printf("</TABLE>\n");
+				printf("</TD></TR></TABLE>\n");
 		                }
 	                }
 
@@ -2409,11 +2413,13 @@
 	printf("Delete all comments</a></td></tr>\n");
 
 	printf("</TABLE>\n");
+	/*
 	printf("</DIV>\n");
 	printf("</P>\n");
 
 
 	printf("<P>\n");
+	*/
 	printf("<DIV ALIGN=CENTER>\n");
 	printf("<TABLE BORDER=0 CLASS='comment'>\n");
 	printf("<TR CLASS='comment'><TH CLASS='comment'>Entry Time</TH><TH CLASS='comment'>Author</TH><TH CLASS='comment'>Comment</TH><TH CLASS='comment'>Comment ID</TH><TH CLASS='comment'>Persistent</TH><TH CLASS='comment'>Type</TH><TH CLASS='comment'>Expires</TH><TH CLASS='comment'>Actions</TH></TR>\n");
@@ -2475,7 +2481,7 @@
 	if(total_comments==0)
 		printf("<TR CLASS='commentOdd'><TD CLASS='commentOdd' COLSPAN='%d'>This %s has no comments associated with it</TD></TR>",(type==HOST_COMMENT)?9:10,(type==HOST_COMMENT)?"host":"service");
 
-	printf("</TABLE>\n");
+	printf("</TABLE></DIV>\n");
 
 	return;
         }
Binary files nagios-2.5.original/cgi/extinfo.cgi and nagios-2.5/cgi/extinfo.cgi differ