diff --git a/html/images/observer-logo.jpg b/html/images/observer-logo.jpg
index 42c1d5adf..e539da324 100644
Binary files a/html/images/observer-logo.jpg and b/html/images/observer-logo.jpg differ
diff --git a/includes/discovery/cisco-cdp.inc.php b/includes/discovery/cisco-cdp.inc.php
index 7bdb814c8..5d8b13543 100755
--- a/includes/discovery/cisco-cdp.inc.php
+++ b/includes/discovery/cisco-cdp.inc.php
@@ -1,15 +1,14 @@
 <?php
 
-  $community = $device['community'];
-
-  echo("CISCO-CDP-MIB: ");
+$community = $device['community'];
 
+echo("CISCO-CDP-MIB: ");
    
-  unset($cdp_array);
-  $cdp_array = snmpwalk_cache_twopart_oid("cdpCache", $device, $cdp_array, "CISCO-CDP-MIB");
-
-  $cdp_array = $cdp_array[$device[device_id]];
+unset($cdp_array);
+$cdp_array = snmpwalk_cache_twopart_oid("cdpCache", $device, $cdp_array, "CISCO-CDP-MIB");
+$cdp_array = $cdp_array[$device[device_id]];
 
+if($cdp_array) {
   unset($cdp_links);
   foreach( array_keys($cdp_array) as $key) { 
     $interface = mysql_fetch_array(mysql_query("SELECT * FROM `interfaces` WHERE device_id = '".$device['device_id']."' AND `ifIndex` = '".$key."'"));
@@ -19,11 +18,10 @@
       if($device['hostname'] && $interface['ifDescr'] && $cdp_entry_array['cdpCacheDeviceId'] && $cdp_entry_array['cdpCacheDevicePort']){
         $cdp_links .= $device['hostname'] . "," . $interface['ifDescr'] . "," . $cdp_entry_array['cdpCacheDeviceId'] . "," . $cdp_entry_array['cdpCacheDevicePort'] . "\n";
       }
-    }    
+    }     
   }
-
-  #echo("$cdp_links");
-
+}
+if($cdp_links) {
   foreach ( explode("\n" ,$cdp_links) as $link ) {
     if ($link == "") { break; }
     list($src_host,$src_if, $dst_host, $dst_if) = explode(",", $link);
@@ -65,5 +63,7 @@
 
     } 
   }
+} else { echo ("No Entries"); }
   echo("\n");
+
 ?>
diff --git a/includes/discovery/cmp-mib.php b/includes/discovery/cmp-mib.php
index e93b9f05a..64dd46486 100755
--- a/includes/discovery/cmp-mib.php
+++ b/includes/discovery/cmp-mib.php
@@ -1,6 +1,6 @@
 <?php
 
-echo("ciscoMemoryPool : ");
+echo("OLD-CISCO-MEMORY-POOL: ");
 
 $cmp_oids = array('ciscoMemoryPoolName','ciscoMemoryPoolAlternate','ciscoMemoryPoolValid','ciscoMemoryPoolUsed','ciscoMemoryPoolFree','ciscoMemoryPoolLargestFree');