diff --git a/e107_core/shortcodes/batch/page_shortcodes.php b/e107_core/shortcodes/batch/page_shortcodes.php
index 7df5fc211..0002fb9cb 100644
--- a/e107_core/shortcodes/batch/page_shortcodes.php
+++ b/e107_core/shortcodes/batch/page_shortcodes.php
@@ -258,7 +258,7 @@ class cpage_shortcodes extends e_shortcode
 			return $url;
 		}
 		
-		if(trim($this->var['page_text']) == '') // Hide the button when there is no page content. (avoids templates with and without buttons)
+		if(trim($this->var['page_text']) == '' && empty($this->var['menu_button_url'])) // Hide the button when there is no page content. (avoids templates with and without buttons)
 		{
 			return "<!-- Button Removed: No page text exists! -->";	
 		}
diff --git a/e107_core/templates/menu_template.php b/e107_core/templates/menu_template.php
index fb948f10f..add3df824 100644
--- a/e107_core/templates/menu_template.php
+++ b/e107_core/templates/menu_template.php
@@ -9,12 +9,12 @@
 	$MENU_TEMPLATE['default']['end'] 					= ''; 
 
 	$MENU_TEMPLATE['button']['start'] 					= '<div class="cpage-menu">'; 
-	$MENU_TEMPLATE['button']['body'] 					= '{CMENUBODY}<br />{CPAGEBUTTON}'; 
+	$MENU_TEMPLATE['button']['body'] 					= '<div>{CMENUBODY}</div>{CPAGEBUTTON}';
 	$MENU_TEMPLATE['button']['end'] 					= '</div>'; 
 
 	### Additional control over image thumbnailing is possible via SETIMAGE e.g. {SETIMAGE: w=200&h=150&crop=1}
 	$MENU_TEMPLATE['buttom-image']['start'] 			= '<div class="cpage-menu">'; 
-	$MENU_TEMPLATE['buttom-image']['body'] 				= '{CMENUIMAGE}<br />{CPAGEBUTTON}'; 
+	$MENU_TEMPLATE['buttom-image']['body'] 				= '<div>{CMENUIMAGE}</div>{CPAGEBUTTON}';
 	$MENU_TEMPLATE['buttom-image']['end'] 				= '</div>'; 
 
 	$MENU_TEMPLATE['image-only']['start'] 					= '';