diff --git a/e107_plugins/tagwords/admin_tagwords_config.php b/e107_plugins/tagwords/admin_tagwords_config.php
index 4963c31aa..105aef20c 100644
--- a/e107_plugins/tagwords/admin_tagwords_config.php
+++ b/e107_plugins/tagwords/admin_tagwords_config.php
@@ -21,6 +21,8 @@ if (!getperms("P"))
 }
 require_once(e_ADMIN."auth.php");
 require_once(e_HANDLER."userclass_class.php");
+require_once(e_HANDLER."message_handler.php");
+$mes = e107::getMessage();
 
 require_once(e_PLUGIN."tagwords/tagwords_class.php");
 $tag = new tagwords();
@@ -29,13 +31,16 @@ $tag = new tagwords();
 if(isset($_POST['updatesettings']))
 {
 	$tag->update_prefs();
-	$message = LAN_TAG_ADMIN_1;
+	$mes->addSuccess(LAN_UPDATED);
 }
 
+/*
 if(isset($message))
 {
 	$tag->show_message($message, $caption='', $type='ns');
 }
+*/
+$ns->tablerender($caption, $mes->render() . $text);
 
 $tag->tagwords_options();
 
diff --git a/e107_plugins/tagwords/languages/English.php b/e107_plugins/tagwords/languages/English.php
index d97eabf07..c89c392fd 100644
--- a/e107_plugins/tagwords/languages/English.php
+++ b/e107_plugins/tagwords/languages/English.php
@@ -36,7 +36,7 @@ define("LAN_TAG_19", "choose sort");
 define("LAN_TAG_20", "choose style");
 define("LAN_TAG_21", "each tag on a separate line");
 
-define("LAN_TAG_ADMIN_1", "preferences updated");
+//define("LAN_TAG_ADMIN_1", "preferences updated");
 
 define("LAN_TAG_OPT_1", "tagwords preferences");
 define("LAN_TAG_OPT_2", "minimum word appearance needed for tagcloud/taglist");
diff --git a/e107_plugins/tagwords/tagwords_template.php b/e107_plugins/tagwords/tagwords_template.php
index 51f5bf534..989b77f70 100644
--- a/e107_plugins/tagwords/tagwords_template.php
+++ b/e107_plugins/tagwords/tagwords_template.php
@@ -194,9 +194,10 @@ $TEMPLATE_TAGWORDS['admin_options'] = "
 	<td>".LAN_TAG_OPT_24."</td>
 	<td>{TAG_OPT_ACTIVEAREAS}</td>
 </tr>
-<tr>
-	<td colspan='2' style='text-align:center'>{TAG_OPT_BUTTON}</td>
-</tr>
+</table>
+<div class='buttonsbar center'>
+	{TAG_OPT_BUTTON}
+</div>
 </table>
 </form>";