diff --git a/e107_admin/admin.php b/e107_admin/admin.php
index ecc47d0dd..36600d630 100644
--- a/e107_admin/admin.php
+++ b/e107_admin/admin.php
@@ -33,6 +33,9 @@ if (varset($pref['adminstyle'])=='cascade' || varset($pref['adminstyle'])=='begi
 
 if(strpos($pref['adminstyle'], 'infopanel') === 0)
 {
+	// Define constant for using custom template on the dashboard.
+	define('e_DASHBOARD', true);
+
 	require_once(e_ADMIN.'includes/'.$pref['adminstyle'].'.php');
 	$_class = 'adminstyle_'.$pref['adminstyle'];
 	if(class_exists($_class, false))
diff --git a/e107_admin/footer.php b/e107_admin/footer.php
index dacce49e9..431e489d4 100644
--- a/e107_admin/footer.php
+++ b/e107_admin/footer.php
@@ -19,7 +19,7 @@ if (!defined('e107_INIT'))
 }
 $In_e107_Footer = TRUE; // For registered shutdown function
 
-global $error_handler,$db_time,$ADMIN_FOOTER;
+global $error_handler,$db_time,$ADMIN_FOOTER,$ADMIN_FOOTER_DASHBOARD;
 
 // Legacy fix - call header if not already done, mainly fixing left side menus to work proper
 if(!deftrue('e_ADMIN_UI') && !deftrue('ADMIN_AREA'))
@@ -98,7 +98,15 @@ if (varset($e107_popup) != 1)
 	//NEW - Iframe mod
 	if (!deftrue('e_IFRAME'))
 	{
-		parse_admin($ADMIN_FOOTER);
+		// Dashboard uses its own template.
+		if (deftrue('e_DASHBOARD', false) === true)
+		{
+			parse_admin($ADMIN_FOOTER_DASHBOARD);
+		}
+		else
+		{
+			parse_admin($ADMIN_FOOTER);
+		}
 	}
 	
 	$eTimingStop = microtime();
diff --git a/e107_admin/header.php b/e107_admin/header.php
index f6fede866..d80195d45 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -588,7 +588,16 @@ if ($e107_popup != 1)
 	if (!deftrue('e_IFRAME'))
 	{
 		//removed  check strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE
-		parse_admin($ADMIN_HEADER);
+
+		// Dashboard uses its own template.
+		if (deftrue('e_DASHBOARD', false) === true)
+		{
+			parse_admin($ADMIN_HEADER_DASHBOARD);
+		}
+		else
+		{
+			parse_admin($ADMIN_HEADER);
+		}
 	}
 	elseif(!vartrue($_GET['configure'])) 
 	{
diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php
index 3d8d26050..3736c2985 100644
--- a/e107_admin/includes/infopanel.php
+++ b/e107_admin/includes/infopanel.php
@@ -281,22 +281,9 @@ class adminstyle_infopanel
 		if(vartrue($_GET['mode']) != 'customize')
 		{
 			// $ns->tablerender(ADLAN_47." ".ADMINNAME, $emessage->render().$text);	
-			echo $mes->render().'
-
-			<!-- INFOPANEL -->
-			<div class="row">
-				<div class="span6 col-md-6">
-				    '.$text.'
-				 </div>
-
-				 <div class="span6 col-md-6">
-				    '.$text2.'
-				 </div>
-			</div>
-			<!--  -->  
-			 
-			 
-			 ';
+			// echo $mes->render(); // TODO
+			echo $text; // Control Panel
+			echo $text2; // Latest e107 News + Website Status
 		}
 		else
 		{
diff --git a/e107_themes/bootstrap3/admin_template.php b/e107_themes/bootstrap3/admin_template.php
index 88c5a6d99..93672aa77 100644
--- a/e107_themes/bootstrap3/admin_template.php
+++ b/e107_themes/bootstrap3/admin_template.php
@@ -208,121 +208,129 @@ $ADMIN_MODAL =  '<div id="uiModal" class="modal hide fade" tabindex="-1" role="d
         </div>';*/
 
 
-	$ADMIN_MODAL =  '<div id="uiModal" class="modal fade">
-  <div id="admin-ui-modal" class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title modal-caption">&nbsp;</h4>
-      </div>
-      <div class="modal-body">
-        <p>Loading...</p>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-
-      </div>
-    </div><!-- /.modal-content -->
-  </div><!-- /.modal-dialog -->
+$ADMIN_MODAL = '
+<div id="uiModal" class="modal fade">
+	<div id="admin-ui-modal" class="modal-dialog modal-lg">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+					<span aria-hidden="true">&times;</span>
+				</button>
+				<h4 class="modal-title modal-caption">&nbsp;</h4>
+			</div>
+			<div class="modal-body">
+				<p>Loading...</p>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal-dialog -->
 </div><!-- /.modal -->';
 
 
-
-//	 <li>{ADMIN_COREUPDATE=icon}</li>
-
- $ADMIN_HEADER = $ADMIN_MODAL. '
-
+$ADMIN_HEADER_DASHBOARD = $ADMIN_HEADER = $ADMIN_MODAL . '
 <div class="navbar navbar-default navbar-fixed-top" role="navigation">
-      <div class="container" >
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-         <a class="brand navbar-brand" href="'.e_ADMIN_ABS.'admin.php" title="Return to Front Panel"><img class="admin-logo" src="'.e_THEME_ABS.'bootstrap3/images/e107_adminlogo.png" alt="e107" /></a>
-        </div>
-        <div class="navbar-collapse collapse">
-
-				{ADMIN_NAVIGATION=no-main}        	 
+	<div class="container">
+		<div class="navbar-header">
+			<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+				<span class="sr-only">Toggle navigation</span>
+				<span class="icon-bar"></span>
+				<span class="icon-bar"></span>
+				<span class="icon-bar"></span>
+			</button>
+			<a class="brand navbar-brand" href="' . e_ADMIN_ABS . 'admin.php" title="Return to Front Panel">
+				<img class="admin-logo" src="' . e_THEME_ABS . 'bootstrap3/images/e107_adminlogo.png" alt="e107"/>
+			</a>
+		</div>
+		<div class="navbar-collapse collapse">
+			{ADMIN_NAVIGATION=no-main}        	 
 			<div>
 				{ADMIN_NAVIGATION=logout}
 				{ADMIN_NAVIGATION=language}
-				 {ADMIN_NAVIGATION=home}
-	            {ADMIN_PM}
-	            {ADMIN_DEBUG}
+				{ADMIN_NAVIGATION=home}
+				{ADMIN_PM}
+				{ADMIN_DEBUG}
 			</div>
+		</div><!--/.navbar-collapse -->
+	</div>
+</div>
+';
 
-		  
-		  
-		  
-        </div><!--/.navbar-collapse -->
-      </div>
-    </div>';
- 
-    
-	
-	
-	
-	
-	
-$ADMIN_HEADER .= '<div class="container-fluid">
 
-      <div class="row">
-        <div class="col-md-3 col-lg-2" id="left-panel">
-        	{SETSTYLE=admin_menu}
-		
+$ADMIN_HEADER_DASHBOARD .= '
+<div class="container-fluid">
+	<div class="row">
+		<div class="col-md-12">
+			{SETSTYLE=admin_menu}
 			{ADMIN_MENU}
-
-			
-		
 			{ADMIN_PWORD}
 			{ADMIN_MENUMANAGER}
 
-			<div class="e-scroll-fixed">
-
-			
 			{SETSTYLE=site_info}
-			
 			{ADMINUI_HELP}
 			{ADMIN_HELP}
 
-			</div>
-
 			{ADMIN_SITEINFO=creditsonly}
 			{SETSTYLE=admin_menu}
-			
 			{ADMIN_LATEST=infopanel}
 			{ADMIN_STATUS=infopanel}
-	
 			{ADMIN_LOG=request}
 			{ADMIN_MSG=request}
 			{ADMIN_PLUGINS}
-			
-		
-			
 			{SETSTYLE=default}
-			
-         </div>
-        <div class="col-md-9 col-lg-10" id="right-panel" >
-         <div class="sidebar-toggle"><a href="#" title="Toggle Sidebar" data-toggle-sidebar="true">&nbsp;</a></div>
-        	<div>
-        
-        ';
+';
 
+$ADMIN_FOOTER_DASHBOARD = '
+		</div><!--/span-->
+	</div><!--/row-->
+</div><!--/.fluid-container-->
+
+<footer class="center mute"> 
+	Copyright &copy; 2008-2015 e107 Inc (e107.org)<br />
+</footer>
+';
+
+
+$ADMIN_HEADER .= '
+<div class="container-fluid">
+	<div class="row">
+		<div class="col-md-3 col-lg-2" id="left-panel">
+			{SETSTYLE=admin_menu}
+			{ADMIN_MENU}
+			{ADMIN_PWORD}
+			{ADMIN_MENUMANAGER}
+			<div class="e-scroll-fixed">
+				{SETSTYLE=site_info}
+				{ADMINUI_HELP}
+				{ADMIN_HELP}
+			</div>
+			{ADMIN_SITEINFO=creditsonly}
+			{SETSTYLE=admin_menu}
+			{ADMIN_LATEST=infopanel}
+			{ADMIN_STATUS=infopanel}
+			{ADMIN_LOG=request}
+			{ADMIN_MSG=request}
+			{ADMIN_PLUGINS}
+			{SETSTYLE=default}
+		</div>
+		<div class="col-md-9 col-lg-10" id="right-panel">
+			<div class="sidebar-toggle">
+				<a href="#" title="Toggle Sidebar" data-toggle-sidebar="true">&nbsp;</a>
+			</div>
+			<div>
+';
 
 $ADMIN_FOOTER = '
-		</div><!--/row-->
-        </div><!--/span-->
-      </div><!--/row-->
-     
-
-    </div><!--/.fluid-container-->
-    <footer class="center mute"> 
-		Copyright &copy; 2008-2015 e107 Inc (e107.org)<br />
-      </footer>';
+			</div><!--/row-->
+		</div><!--/span-->
+	</div><!--/row-->
+</div><!--/.fluid-container-->
 
+<footer class="center mute"> 
+	Copyright &copy; 2008-2015 e107 Inc (e107.org)<br />
+</footer>
+';
 
 
 //{FS_ADMIN_ALT_NAV}