diff --git a/e107_admin/meta.php b/e107_admin/meta.php
index b66324ac8..dc5d7c33c 100644
--- a/e107_admin/meta.php
+++ b/e107_admin/meta.php
@@ -1,20 +1,18 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@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/meta.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2008-12-06 11:13:50 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
+ * e107 website system
+ *
+ * Copyright (C) 2001-2008 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ * Administration Area - Meta Tags
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_admin/meta.php,v $
+ * $Revision: 1.4 $
+ * $Date: 2008-12-15 13:42:25 $
+ * $Author: secretr $
+ *
 */
 require_once("../class2.php");
 if (!getperms("T")) {
@@ -23,10 +21,12 @@ if (!getperms("T")) {
 }
 $e_sub_cat = 'meta';
 require_once("auth.php");
+require_once(e_HANDLER."message_handler.php");
+$emessage = &eMessage::getInstance();
 
 $current_lang = ($sql->mySQLlanguage != "") ? $sql->mySQLlanguage : $pref['sitelanguage'];
 
-if (isset($_POST['metasubmit'])) 
+if (isset($_POST['metasubmit']))
 {
 	$tmp = $pref['meta_tag'];
 	$langs = explode(",",e_LANLIST);
@@ -59,12 +59,7 @@ if (isset($_POST['metasubmit']))
 
 	$admin_log->log_event('META_01','meta_news_summary=>'.$pref['meta_news_summary'].'[!br!]'.$current_lang,E_LOG_INFORMATIVE,'');
 	save_prefs();
-	$message = METLAN_1;
-}
-
-if ($message) 
-{
-	$ns->tablerender(METLAN_4, "<div style='text-align:center'>".METLAN_1." (".$current_lang.").</div>");
+	$emessage->add(METLAN_1." ({$current_lang})", E_MESSAGE_SUCCESS);
 }
 
 $meta = $pref['meta_tag'];
@@ -73,71 +68,69 @@ $meta_keywords = $pref['meta_keywords'];
 $meta_copyright = $pref['meta_copyright'];
 $meta_author = $pref['meta_author'];
 
-$text = "<div style='text-align:center'>
+$text = "
 	<form method='post' action='".e_SELF."' id='dataform'>
-	<table style='".ADMIN_WIDTH."' class='fborder'>
+		<fieldset id='core-meta-settings'>
+			<legend class='e-hideme'>".METLAN_8." (".$current_lang.")"."</legend>
+			<table cellpadding='0' cellspacing='0' class='adminform'>
+				<colgroup span='2'>
+					<col class='col-label' />
+					<col class='col-control' />
+				</colgroup>
+				<tbody>
+					<tr>
+						<td class='label'>".METLAN_9."</td>
+						<td class='control'>
+							<textarea class='tbox textarea' title='meta_description' id='meta_description' name='meta_description' cols='70' rows='4'>".$tp->toForm($meta_diz[$current_lang])."</textarea>
+						</td>
+					</tr>
+					<tr>
+						<td class='label'>".METLAN_10."</td>
+						<td class='control'>
+							<textarea class='tbox textarea' title='meta_keywords' id='meta_keywords' name='meta_keywords' cols='70' rows='4'>".$tp->toForm($meta_keywords[$current_lang])."</textarea>
+						</td>
+					</tr>
 
-	<tr>
-    <td style='width:25%' class='forumheader3'>".METLAN_9."</td>
-    <td style='width:75%' class='forumheader3'>
-	<textarea class='tbox' title='meta_description' id='meta_description' name='meta_description' cols='70' rows='4' style='width:90%'>".$tp->toForm($meta_diz[$current_lang])."</textarea>
-	</td>
-	</tr>
+					<tr>
+						<td class='label'>".METLAN_11."</td>
+						<td class='control'>
+							<input class='tbox input-text' size='70' type='text' name='meta_copyright' value='".$meta_copyright[$current_lang]."' />
+						</td>
+					</tr>
 
-	<tr>
-	<td style='width:25%' class='forumheader3'>".METLAN_10."</td>
-    <td style='width:75%' class='forumheader3'>
-	<textarea class='tbox' title='meta_keywords' id='meta_keywords' name='meta_keywords' cols='70' rows='4' style='width:90%'>".$tp->toForm($meta_keywords[$current_lang])."</textarea>
-	</td>
-	</tr>
+					<tr>
+						<td class='label'>".METLAN_13."</td>
+						<td class='control'>
+							<input class='tbox input-text' size='70' type='text' name='meta_author' value=\"".$meta_author[$current_lang]."\" />
+						</td>
+					</tr>
 
-	<tr>
-	<td style='width:25%' class='forumheader3'>".METLAN_11."</td>
-    <td style='width:75%' class='forumheader3'>
-	<input class='tbox' style='width:90%' size='70' type='text' name='meta_copyright' value='".$meta_copyright[$current_lang]."' />
-	</td>
-	</tr>
+					<tr>
+						<td class='label'>".METLAN_2."</td>
+						<td class='control'>
+							<textarea class='tbox textarea' title=\"eg. <meta name='author' content='your name' />\" id='meta' name='meta' cols='70'
+							rows='10' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>".str_replace("<","&lt;",$tp->toForm($meta[$current_lang]))."</textarea>
+							<div class='smalltext field-help'>eg. &lt;meta name='author' content='your name' /&gt; </div>
+						</td>
+					</tr>
 
-	<tr>
-	<td style='width:25%' class='forumheader3'>".METLAN_13."</td>
-    <td style='width:75%' class='forumheader3'>
-	<input class='tbox' style='width:90%' size='70' type='text' name='meta_author' value=\"".$meta_author[$current_lang]."\" />
-	</td>
-	</tr>
+					<tr>
+						<td class='label'>".METLAN_12."</td>
+						<td class='control'>
+							<input class='checkbox' type='checkbox' name='meta_news_summary' value='1'".($pref['meta_news_summary'] ? " checked='checked'" : '')." />
+						</td>
+					</tr>
+				</tbody>
+			</table>
+			<div class='buttons-bar center'>
+				<button class='create' type='submit' name='metasubmit' value='".METLAN_3."'><span>".METLAN_3."</span></button>
+			</div>
+		</fieldset>
+	</form>
 
-	<tr>
-	<td style='width:25%' class='forumheader3'>".METLAN_2.":
-	<span class='smalltext'><br /><br />eg.
-	&lt;meta name='author' content='your name' /&gt; </span>
-	</td>
-	<td style='width:75%' class='forumheader3'>
-	<textarea class='tbox' title=\"eg. <meta name='author' content='your name' />\" id='meta' name='meta' cols='70'
-	rows='10' style='width:90%' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>".str_replace("<","&lt;",$tp->toForm($meta[$current_lang]))."</textarea>
-	<br />";
-$text .= "</td>
-</tr>
+";
 
-	<tr>
-	<td style='width:25%' class='forumheader3'>".METLAN_12."</td>
-    <td class='forumheader3' style='text-align:left;width:75%' >";
-    $checked = ($pref['meta_news_summary']) ? "checked='checked'" : "";
-	$text .= "
-	<input type='checkbox' name='meta_news_summary' value='1' {$checked} />
-	</td>
-	</tr>
-
-<tr><td colspan='2' style='text-align:center' class='forumheader'>
-
-<input class='button' type='submit' name='metasubmit' value='".METLAN_3."' />
-</td>
-</tr>
-</table>
-</form>
-</div>";
-
-
-
-$ns -> tablerender(METLAN_8." (".$current_lang.")", $text);
+$ns -> tablerender(METLAN_8." (".$current_lang.")", $emessage->render().$text);
 
 require_once("footer.php");
 
diff --git a/e107_languages/English/admin/lan_frontpage.php b/e107_languages/English/admin/lan_frontpage.php
index 1de2e2d9c..bc561cf0a 100644
--- a/e107_languages/English/admin/lan_frontpage.php
+++ b/e107_languages/English/admin/lan_frontpage.php
@@ -1,13 +1,10 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system - Language File.
-|
-|     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_frontpage.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2008-12-15 13:31:02 $
-|     $Author: secretr $
-+----------------------------------------------------------------------------+
+ * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
+ * $Id: lan_frontpage.php,v 1.4 2008-12-15 13:42:25 secretr Exp $
+ *
+ * Admin Language File
+ *
 */
 
 /*
diff --git a/e107_languages/English/admin/lan_meta.php b/e107_languages/English/admin/lan_meta.php
index 465f8a8bc..fbe623077 100644
--- a/e107_languages/English/admin/lan_meta.php
+++ b/e107_languages/English/admin/lan_meta.php
@@ -1,18 +1,16 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system - Language File.
-|
-|     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_meta.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:34:41 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
+ * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
+ * $Id: lan_meta.php,v 1.2 2008-12-15 13:42:25 secretr Exp $
+ *
+ * Admin Language File
+ *
 */
+
 define("METLAN_1", "Meta tags updated in database");
 define("METLAN_2", "Enter additional meta-tags");
 define("METLAN_3", "Enter new meta tag settings");
-define("METLAN_4", "Updated");
+//define("METLAN_4", "Updated");
 define("METLAN_5", "type your description here");
 define("METLAN_6", "type, a, list, of, your, keywords, here");
 define("METLAN_7", "type your copyright info here");