diff --git a/e107_admin/wmessage.php b/e107_admin/wmessage.php
index 985d9d5fa..b8aee0403 100644
--- a/e107_admin/wmessage.php
+++ b/e107_admin/wmessage.php
@@ -112,7 +112,9 @@ if (isset($_POST['main_delete']))
 		$mes->addError(LAN_DELETED_FAILED); 
 	}
 }
-$ns->tablerender($caption, $mes->render() . $text);
+
+echo $mes->render();
+
 
 // Show Existing -------
 if ($action == "main" || $action == "") 
@@ -183,7 +185,7 @@ if ($action == "create" || $action == "edit")
 		</colgroup>
 		<tr>
 			<td>".WMLAN_10."</td>
-			<td>".$frm->text(wm_caption, $tp->toForm(vartrue($row['gen_ip'])), 80)."</td>
+			<td>".$frm->text('wm_caption', $tp->toForm(vartrue($row['gen_ip'])), 80)."</td>
 		</tr>
 		<tr>
 			<td>".WMLAN_04."</td>
diff --git a/e107_themes/bootstrap/theme.php b/e107_themes/bootstrap/theme.php
index f8e77dbd4..2295e2ca2 100644
--- a/e107_themes/bootstrap/theme.php
+++ b/e107_themes/bootstrap/theme.php
@@ -153,6 +153,7 @@ $HEADER['default'] = '
         </div><!--/span-->
 		<div class="span9">
 		 {SETSTYLE=default}
+		 	{WMESSAGE}
 ';
 
 
@@ -176,7 +177,7 @@ $HEADER['default-home'] = $HEADER['default'];
 
 
 $FOOTER['default-home'] = '
-		{WMESSAGE}
+	
 		 {SETSTYLE=span4}
 		 
 		 <div class="row-fluid">