diff --git a/e107_admin/admin.php b/e107_admin/admin.php
index d9d41a368..0a8fda2f1 100644
--- a/e107_admin/admin.php
+++ b/e107_admin/admin.php
@@ -327,6 +327,7 @@ function getPluginLinks($iconSize = E_16_PLUGMANAGER, $linkStyle = 'adminb')
 	global $sql, $tp;
 	
 	$plug_id = array();
+	$plugin_array = array();
 	e107::getDb()->db_Select("plugin", "*", "plugin_installflag = 1"); // Grab plugin IDs. 
 	while ($row = e107::getDb()->db_Fetch())
 	{
diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php
index 3fc59bad6..7e4d4650a 100644
--- a/e107_admin/includes/infopanel.php
+++ b/e107_admin/includes/infopanel.php
@@ -1,29 +1,25 @@
 <?php
 /*
- + ----------------------------------------------------------------------------+
- |     e107 website system
- |
- |     Copyright (C) 2008-2009 e107 Inc (e107.org)
- |     http://e107.org
- |
- |
- |     Released under the terms and conditions of the
- |     GNU General Public License (http://gnu.org).
- |
- |     $Source: /cvs_backup/e107_0.8/e107_admin/includes/infopanel.php,v $
- |     $Revision$
- |     $Date$
- |     $Author$
- +----------------------------------------------------------------------------+
+ * e107 website system
+ *
+ * Copyright (C) 2008-2010 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ * Info panel admin view
+ *
+ * $URL$
+ * $Id$
  */
+
 if (!defined('e107_INIT'))
 {
 	exit;
 }
-require_once (e_HANDLER."message_handler.php");
-$emessage = &eMessage::getInstance();
-require_once (e_HANDLER."form_handler.php");
-$frm = new e_form(true);
+//require_once (e_HANDLER."message_handler.php");
+$emessage = e107::getMessage();
+// require_once (e_HANDLER."form_handler.php");
+$frm = e107::getForm();
 //enable inner tabindex counter
 
 if (isset($_POST['submit-mye107']) || varset($_POST['submit-mymenus']))