diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php
index 06fd3f526..8daf90ab8 100644
--- a/e107_admin/cpage.php
+++ b/e107_admin/cpage.php
@@ -349,7 +349,7 @@ class page_admin_ui extends e_admin_ui
 			'page_order' 		=> array('title'=> LAN_ORDER, 		'tab' => 1,	'type' => 'number', 'width' => 'auto', 'inline'=>true),
 			
 			// Menu Tab  XXX 'menu_name' is 'menu_name' - not caption. 
-			'menu_name' 		=> array('title'=> "Menu Name", 		'tab' => 2,	'type' => 'text', 		'width' => 'auto','nolist'=>true, "help"=>"Will be listed in the Menu-Manager under this name or may be called using {MENU|name} in your theme."),
+			'menu_name' 		=> array('title'=> "Menu Name", 		'tab' => 2,	'type' => 'text', 		'width' => 'auto','nolist'=>true, "help"=>"Will be listed in the Menu-Manager under this name or may be called using {CMENU=name} in your theme."),
 		   	'menu_title'	   	=> array('title'=> "Menu Title", 	'nolist'=>true, 'tab' => 2,	'type' => 'text', 'inline'=>true,		'width'=>'25%', "help"=>"Caption displayed on the menu item."),
 			'menu_text' 		=> array('title'=> "Menu Body",		'nolist'=>true, 'tab' => 2,	'type' => 'bbarea',		'data'=>'str',	'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1', 'writeParms'=>'media=page' ), 
 			'menu_template' 	=> array('title'=> "Menu Template", 'nolist'=>true, 'tab' => 2,	'type' => 'dropdown', 	'width' => 'auto','filter' => true, 'batch'=>true, 'inline'=>true, 'writeParms'=>''),
diff --git a/e107_core/templates/menu_template.php b/e107_core/templates/menu_template.php
index 0feb9cb03..ba14e8ac7 100644
--- a/e107_core/templates/menu_template.php
+++ b/e107_core/templates/menu_template.php
@@ -6,8 +6,7 @@
 
 	$MENU_TEMPLATE['default']['start'] 					= ''; 
 	$MENU_TEMPLATE['default']['body'] 					= '{CMENUBODY}'; 
-	$MENU_TEMPLATE['default']['noTableRender'] 			= true;
-
+	$MENU_TEMPLATE['default']['noTableRender'] 			= false; // XXX Let the theme decide. 
 
 	$MENU_TEMPLATE['button']['start'] 					= '<div class="cpage-menu">'; 
 	$MENU_TEMPLATE['button']['body'] 					= '{CMENUBODY}{CPAGEBUTTON}';