diff --git a/e107_plugins/tree_menu/config.php b/e107_plugins/tree_menu/config.php
index c57b211a4..7375aa85f 100644
--- a/e107_plugins/tree_menu/config.php
+++ b/e107_plugins/tree_menu/config.php
@@ -2,30 +2,17 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Copyright (C) 2008-2013 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
  * Plugin Administration - Tree menu
  *
- * $Source: /cvs_backup/e107_0.8/e107_plugins/tree_menu/config.php,v $
- * $Revision$
- * $Date$
- * $Author$
+ * $URL$
+ * $Id$
  *
 */
 
-/**
- *	e107 Tree menu plugin
- *
- *	Provides alternative menu style
- *
- *	@package	e107_plugins
- *	@subpackage	online
- *	@version 	$Id$;
- *
- */
-
 $eplug_admin = TRUE;
 require_once('../../class2.php');
 include_lan(e_PLUGIN.'tree_menu/languages/'.e_LANGUAGE.'.php');
@@ -36,6 +23,8 @@ if (!getperms('4'))
 	exit ;
 }
 require_once(e_ADMIN.'auth.php');
+$mes = e107::getMessage();
+$frm = e107::getForm();
 
 $menu_pref = e107::getConfig('menu')->getPref('');
 
@@ -59,43 +48,38 @@ if (isset($_POST['update_menu']))
 		}
 		$menuPref->save(false, true, false);
 	}
-	$ns->tablerender("", "<div style='text-align:center'><b>".TREE_L3."</b></div>");
+	$ns->tablerender($caption, $mes->render() . $text);
 }
 	
 $text = "
-	<form method='post' action='".e_SELF."?".e_QUERY."' name='menu_conf_form'>
-	<table style='".ADMIN_WIDTH."' class='fborder' >
-	 
-	<tr>
-	<td style='width: 50%;' class='forumheader3'>".TREE_L6."</td>
-	<td style='width: 50%;' class='forumheader3'><input class='tbox' type='text' name='tm_class1' size='40' value='".$menu_pref['tm_class1']."' maxlength='20' /></td>
-	</tr>
+<form method='post' action='".e_SELF."?".e_QUERY."' name='menu_conf_form'>
+<table class='table adminform'>
+	<colgroup span='2'>
+		<col class='col-label' />
+		<col class='col-control' />
+	</colgroup>
+<tr>
+	<td>".TREE_L6."</td>
+	<td><input class='tbox' type='text' name='tm_class1' size='40' value='".$menu_pref['tm_class1']."' maxlength='20' /></td>
+</tr>
+<tr>
+	<td>".TREE_L7."</td>
+	<td><input class='tbox' type='text' name='tm_class2' size='40' value='".$menu_pref['tm_class2']."' maxlength='20' /></td>
+</tr>
+<tr>
+	<td>".TREE_L8."</td>
+	<td><input class='tbox' type='text' name='tm_class3' size='40' value='".$menu_pref['tm_class3']."' maxlength='20' /></td>
+</tr>
+<tr>
+	<td>".TREE_L9."</td>
+	<td>".$frm->radio_switch('tm_spacer', $menu_pref['tm_spacer'], LAN_YES, LAN_NO)."</td>
+</tr>
+</table>
+<div class='buttons-bar center'>
+	".$frm->admin_button('update_menu', LAN_UPDATE, 'update')."
+</div>
+</form>";
 
-	<tr>
-	<td style='width: 50%;' class='forumheader3'>".TREE_L7."</td>
-	<td style='width: 50%;' class='forumheader3'><input class='tbox' type='text' name='tm_class2' size='40' value='".$menu_pref['tm_class2']."' maxlength='20' /></td>
-	</tr>
-
-	<tr>
-	<td style='width: 50%;' class='forumheader3'>".TREE_L8."</td>
-	<td style='width: 50%;' class='forumheader3'><input class='tbox' type='text' name='tm_class3' size='40' value='".$menu_pref['tm_class3']."' maxlength='20' /></td>
-	</tr>
-
-	<tr>
-	<td style='width:50%' class='forumheader3'>".TREE_L9."</td>
-	<td style='width:50%; text-align:right' class='forumheader3'>
-	<input type='radio' name='tm_spacer' value='1'".($menu_pref['tm_spacer'] ? " checked='checked'" : "")." /> ".TREE_L4."&nbsp;&nbsp;
-	<input type='radio' name='tm_spacer' value='0'".(!$menu_pref['tm_spacer'] ? " checked='checked'" : "")." /> ".TREE_L5."
-	</td>
-	</tr>
-
-	
-	<tr>
-	<td colspan='2' class='forumheader' style='text-align:center'><input class='button' type='submit' name='update_menu' value='".TREE_L2."' /></td>
-	</tr>
-	</table>
-	</form>
-	</div>";
 $ns->tablerender(TREE_L1, $text);
 	
 require_once(e_ADMIN."footer.php");
diff --git a/e107_plugins/tree_menu/languages/English.php b/e107_plugins/tree_menu/languages/English.php
index a5ee06ce2..5877b5151 100644
--- a/e107_plugins/tree_menu/languages/English.php
+++ b/e107_plugins/tree_menu/languages/English.php
@@ -2,23 +2,20 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Copyright (C) 2008-2013 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
+ * $URL$
+ * $Id$
  *
- *
- * $Source: /cvs_backup/e107_0.8/e107_plugins/tree_menu/languages/English.php,v $
- * $Revision$
- * $Date$
- * $Author$
- */
+*/
 
-define("TREE_L1", "Configure Tree Menu");
-define("TREE_L2", "Update Tree Menu Settings");
-define("TREE_L3", "Tree Menu configuration saved.");
-define("TREE_L4", "On");
-define("TREE_L5", "Off");
+define("TREE_L1", "Tree Menu");
+//define("TREE_L2", "Update Tree Menu Settings");
+//define("TREE_L3", "Tree Menu configuration saved.");
+//define("TREE_L4", "On");
+//define("TREE_L5", "Off");
 define("TREE_L6", "CSS class to use for non-openable links");
 define("TREE_L7", "CSS class to use for openable links");
 define("TREE_L8", "CSS class to use for opened links");