diff --git a/e107_plugins/comment_menu/config.php b/e107_plugins/comment_menu/config.php
index 41c1fac37..af3792afa 100644
--- a/e107_plugins/comment_menu/config.php
+++ b/e107_plugins/comment_menu/config.php
@@ -2,18 +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 - Comment menu
  *
- * $Source: /cvs_backup/e107_0.8/e107_plugins/comment_menu/config.php,v $
- * $Revision$
- * $Date$
- * $Author$
  *
-*/
+ * $URL$
+ * $Id$
+ */
+
 $eplug_admin = TRUE;
 require_once("../../class2.php");
 require_once(e_HANDLER."userclass_class.php");
@@ -25,8 +24,12 @@ if (!getperms("1"))
 	exit() ;
 }
 require_once(e_ADMIN."auth.php");
-	
+require_once(e_HANDLER.'form_handler.php');
+require_once(e_HANDLER.'message_handler.php');
+$frm = e107::getForm();
+$mes = e107::getMessage();
 $menu_config = e107::getConfig('menu'); 
+
 if (isset($_POST['update_menu'])) 
 {
 	$temp = $old = $menu_config->getPref();
@@ -34,7 +37,7 @@ if (isset($_POST['update_menu']))
 	$tp = e107::getParser();
 	while (list($key, $value) = each($_POST)) 
 	{
-		if ($value != CM_L9) 
+		if ($value != LAN_UPDATE) 
 		{
 			$temp[$tp->toDB($key)] = $tp->toDB($value);
 		}
@@ -49,62 +52,54 @@ if (isset($_POST['update_menu']))
 	{
 		if($menu_config->save(false))
 		{
-			e107::getMessage()->add(CM_L10, E_MESSAGE_SUCCESS);
+			$mes->addSuccess();
 		}
 	}
 	else
 	{
-		e107::getMessage()->add(LAN_NO_CHANGE);
+		$mes->addInfo(LAN_NO_CHANGE);
 	}
 }
 
-// TODO - 0.8 aware markup, e_form usage
-$text = "<div style='text-align:center'>
-	<form method=\"post\" action=\"".e_SELF."?".e_QUERY."\" id=\"plugin-menu-config-form\">
-	<table style=\"width:85%\" class=\"fborder\" >
-	 
+$text = "
+	<form method='post' action='".e_SELF."?".e_QUERY."' id='plugin-menu-config-form'>
+	<table class='table adminform'>
+	<colgroup span='2'>
+    	<col class='col-label' />
+    	<col class='col-control' />
+    </colgroup>
 	<tr>
-	<td style=\"width:40%\" class='forumheader3'>".CM_L3.": </td>
-	<td style=\"width:60%\" class='forumheader3'>
-	<input class=\"tbox\" type=\"text\" name=\"comment_caption\" size=\"20\" value=\"".$menu_config->get('comment_caption')."\" maxlength=\"100\" />
-	</td>
+		<td>".CM_L3.":</td>
+		<td><input class='tbox' type='text' name='comment_caption' size='20' value='".$menu_config->get('comment_caption')."' maxlength='100' /></td>
 	</tr>
 	 
 	<tr>
-	<td style=\"width:40%\" class='forumheader3'>".CM_L4.": </td>
-	<td style=\"width:60%\" class='forumheader3'>
-	<input class=\"tbox\" type=\"text\" name=\"comment_display\" size=\"20\" value=\"".$menu_config->get('comment_display')."\" maxlength=\"2\" />
-	</td>
+		<td>".CM_L4.":</td>
+		<td><input class='tbox' type='text' name='comment_display' size='20' value='".$menu_config->get('comment_display')."' maxlength='2' /></td>
 	</tr>
 	 
 	<tr>
-	<td style=\"width:40%\" class='forumheader3'>".CM_L5.": </td>
-	<td style=\"width:60%\" class='forumheader3'>
-	<input class=\"tbox\" type=\"text\" name=\"comment_characters\" size=\"20\" value=\"".$menu_config->get('comment_characters')."\" maxlength=\"4\" />
-	</td>
+		<td>".CM_L5.":</td>
+		<td><input class='tbox' type='text' name='comment_characters' size='20' value='".$menu_config->get('comment_characters')."' maxlength='4' /></td>
 	</tr>
 	 
 	<tr>
-	<td style=\"width:40%\" class='forumheader3'>".CM_L6.": </td>
-	<td style=\"width:60%\" class='forumheader3'>
-	<input class=\"tbox\" type=\"text\" name=\"comment_postfix\" size=\"30\" value=\"".$menu_config->get('comment_postfix')."\" maxlength=\"200\" />
-	</td>
+		<td>".CM_L6.":</td>
+		<td><input class='tbox' type='text' name='comment_postfix' size='30' value='".$menu_config->get('comment_postfix')."' maxlength='200' /></td>
 	</tr>
 	 
 	<tr>
-	<td style=\"width:40%\" class='forumheader3'>".CM_L7.": </td>
-	<td style=\"width:60%\" class='forumheader3'>
-	<input type=\"checkbox\" name=\"comment_title\" value=\"1\"".($menu_config->get('comment_title') ? ' checked="checked"' : '')." />
-	</td>
-	</tr>
-	 
-	<tr>
-	<td colspan=\"2\" class='forumheader' style=\"text-align:center\"><input class=\"button\" type=\"submit\" name=\"update_menu\" value=\"".CM_L9."\" /></td>
+		<td>".CM_L7.":</td>
+		<td><input type='checkbox' name='comment_title' value='1'".($menu_config->get('comment_title') ? ' checked="checked"' : '')." /></td>
 	</tr>
 	</table>
-	</form>
-	</div>";
+
+	<div class='buttons-bar center'>
+		".$frm->admin_button('update_menu', LAN_UPDATE, 'update')."
+	</div>	
+	</form>";
 	
-e107::getRender()->tablerender(CM_L8, e107::getMessage()->render().$text);
+$ns->tablerender(CM_L8, $mes->render() . $text);
+
 require_once(e_ADMIN."footer.php");
 ?>
\ No newline at end of file
diff --git a/e107_plugins/comment_menu/languages/English.php b/e107_plugins/comment_menu/languages/English.php
index 2c47edd33..c3b27f2c5 100644
--- a/e107_plugins/comment_menu/languages/English.php
+++ b/e107_plugins/comment_menu/languages/English.php
@@ -2,17 +2,13 @@
 /*
  * 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)
  *
- *
- *
- * $Source: /cvs_backup/e107_0.8/e107_plugins/comment_menu/languages/English.php,v $
- * $Revision$
- * $Date$
- * $Author$
- */
+ * $URL$
+ * $Id$
+*/
 
 define("CM_L1", "No comments yet.");
 define("CM_L2", "");
@@ -22,8 +18,8 @@ define("CM_L5", "Number of characters to display?");
 define("CM_L6", "Postfix for too long comments?");
 define("CM_L7", "Show original news title in menu?");
 define("CM_L8", "New Comments Menu Configuration");
-define("CM_L9", "Update Menu Settings");
-define("CM_L10", "Comments menu configuration saved");
+//define("CM_L9", "Update Menu Settings");
+//define("CM_L10", "Comments menu configuration saved");
 define("CM_L11", "on");
 define("CM_L12", "Re:");
 define("CM_L13", "Posted by");