diff --git a/e107_admin/admin.php b/e107_admin/admin.php
index 57bf45da0..fd0f8d0b1 100644
--- a/e107_admin/admin.php
+++ b/e107_admin/admin.php
@@ -787,7 +787,7 @@ function render_clean() // still used by classis, tabbed etc.
 {
 	global $td;
 	$text = "";
-	while ($td <= ADLINK_COLS)
+	while ($td <= defset('ADLINK_COLS', 5))
 	{
 		$text .= "<td class='td' style='width:20%;'></td>";
 		$td++;
@@ -799,7 +799,7 @@ function render_clean() // still used by classis, tabbed etc.
 
 
 
-if(is_object($adp))
+if(isset($adp) && is_object($adp))
 {
 	$adp->render();
 }
diff --git a/e107_admin/includes/categories.php b/e107_admin/includes/categories.php
index 093e0ba2d..1152f4947 100644
--- a/e107_admin/includes/categories.php
+++ b/e107_admin/includes/categories.php
@@ -19,7 +19,7 @@ $text = "<div style='text-align:center'>
 	
 $admin_cat = e107::getNav()->adminCats();
 
- $newarray = e107::getNav()->adminLinks('core');
+$newarray = e107::getNav()->adminLinks('core');
 $plugin_array = e107::getNav()->adminLinks('plugin');
 
 foreach ($admin_cat['id'] as $cat_key => $cat_id)
diff --git a/e107_admin/includes/combo.php b/e107_admin/includes/combo.php
index 0bb212cd5..bd80419a2 100644
--- a/e107_admin/includes/combo.php
+++ b/e107_admin/includes/combo.php
@@ -24,6 +24,7 @@ foreach($newarray as $key=>$funcinfo)
 	$buts .= e107::getNav()->renderAdminButton($funcinfo[0], $funcinfo[1], $funcinfo[2], $funcinfo[3], $funcinfo[5], 'default');
 }
 $text .= $buts;
+$td = 0;
 while ($td <= 5) {
 	$text .= "<td class='td' style='width:20%;' ></td>";
 	$td++;
diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index e122b9790..4967e9e49 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -566,8 +566,11 @@ class admin_shortcodes
 
 	function sc_admin_log($parm=null)
 	{
+		e107::coreLan('log_messages', true);
+
 		if (getperms('0'))
 		{
+
 			if (!function_exists('admin_log'))
 			{
 				function admin_log()
@@ -575,7 +578,7 @@ class admin_shortcodes
 
 					$sql = e107::getDb();
 					$ns = e107::getRender();
-					$text = E_16_ADMINLOG." <a style='cursor: pointer' onclick=\"expandit('adminlog')\">".ADLAN_116."</a>\n";
+					$text = "<ul class='list-group'><li class='list-group-item'>".E_16_ADMINLOG." <a style='cursor: pointer' onclick=\"expandit('adminlog')\">".ADLAN_116."</a></li></ul>\n";
 					if (e_QUERY == 'logall')
 					{
 						$text .= "<div id='adminlog'>";
@@ -586,16 +589,16 @@ class admin_shortcodes
 						$text .= "<div style='display: none;' id='adminlog'>";
 						$cnt = $sql ->select('admin_log', '*', 'ORDER BY `dblog_datestamp` DESC LIMIT 0,10', 'no_where');
 					}
-					$text .= ($cnt) ? '<ul>' : '';
-					$gen = e107::getDateConvert();
+					$text .= ($cnt) ? '<ul class="list-group">' : '';
+					$gen = e107::getDate();
 					while ($row = $sql ->fetch())
 					{
 						$datestamp = $gen->convert_date($row['dblog_datestamp'], 'short');
-						$text .= "<li>{$datestamp} - {$row['dblog_title']}</li>";
+						$text .= "<li class='list-group-item'>{$datestamp} - ".defset($row['dblog_title'],$row['dblog_title'] )."</li>";
 					}
 					$text .= ($cnt ? '</ul>' : '');
-					$text .= "[ <a href='".e_ADMIN_ABS."admin_log.php?adminlog'>".ADLAN_117."</a> ]";
-					$text .= "<br />[ <a href='".e_ADMIN_ABS."admin_log.php?config'>".ADLAN_118."</a> ]";
+					$text .= "<p><a class='btn btn-sm btn-primary' href='".e_ADMIN_ABS."admin_log.php'>".ADLAN_117."</a> ";
+					$text .= "<a class='btn btn-sm btn-primary' href='".e_ADMIN_ABS."admin_log.php?mode=main&action=maintenance'>".ADLAN_118."</a></p>";
 
 					//			$text .= "<br />[ <a href='".e_ADMIN."admin_log.php?purge' onclick=\"return jsconfirm('".LAN_CONFIRMDEL."')\">".ADLAN_118."</a> ]\n";
 
diff --git a/e107_tests/tests/unit/e107Test.php b/e107_tests/tests/unit/e107Test.php
index 164f4617f..2bf6eb441 100644
--- a/e107_tests/tests/unit/e107Test.php
+++ b/e107_tests/tests/unit/e107Test.php
@@ -1057,7 +1057,7 @@ class e107Test extends \Codeception\Test\Unit
 			'search'  => 'core/rewrite',
 			'system'  => 'core/rewrite',
 			'user'    => 'core/rewrite',
-			'gallery' => 'plugin/rewrite'
+	//		'gallery' => 'plugin/rewrite'
 		);
 
 
diff --git a/e107_tests/tests/unit/e_menu_layoutTest.php b/e107_tests/tests/unit/e_menu_layoutTest.php
index e07beabf2..d0edae132 100644
--- a/e107_tests/tests/unit/e_menu_layoutTest.php
+++ b/e107_tests/tests/unit/e_menu_layoutTest.php
@@ -12,12 +12,11 @@
 	class e_menu_layoutTest extends \Codeception\Test\Unit
 	{
 
-		/** @var e_menu_layout */
 		protected $menu;
 
 		protected function _before()
 		{
-			require_once(e_HANDLER."menumanager_class.php");
+		//	require_once(e_HANDLER."menumanager_class.php");
 		}
 
 		private function copydir( $src, $dst )
diff --git a/e107_tests/tests/unit/scriptsTest.php b/e107_tests/tests/unit/scriptsTest.php
index 60f89b004..fc251d3e7 100644
--- a/e107_tests/tests/unit/scriptsTest.php
+++ b/e107_tests/tests/unit/scriptsTest.php
@@ -7,21 +7,45 @@
 
 		protected function _before()
 		{
-			define("SEP", " <span class='fa fa-angle-double-right e-breadcrumb'></span> ");
+			if(!defined('SEP'))
+			{
+				define("SEP", " <span class='fa fa-angle-double-right e-breadcrumb'></span> ");
+			}
+		}
+
+		public function testAdminScripts()
+		{
+			$exclude = array('index.php', 'menus.php'); // FIXME menus defines e_ADMIN_AREA which messes up other tests.
+			$this->loadScripts(e_ADMIN, $exclude);
+
+		}
+
+		public function testAdminIncludes()
+		{
+			ob_start();
+			require_once(e_ADMIN."admin.php");
+			ob_end_clean();
+			$this->loadScripts(e_ADMIN."includes/");
+
+		}
+
+		public function testAdminLayouts()
+		{
+			$this->loadScripts(e_ADMIN.'includes/layouts/');
 		}
 
 
-		public function testAdminScripts()
+		private function loadScripts($folder, $exclude= array())
 		{
 		//	$globalList = e107::getPref('lan_global_list');
 
 
-			$list = scandir(e_ADMIN);
+			$list = scandir($folder);
 
 			$config = e107::getConfig();
 
 			$preInstall = array('banner', 'page');
-			$exclude = array('index.php', 'menus.php'); // FIXME menus defines e_ADMIN_AREA which messes up other tests.
+
 
 			foreach($preInstall as $plug)
 			{
@@ -41,7 +65,7 @@
 
 			foreach($list as $file)
 			{
-				$ext = pathinfo(e_ADMIN.$file, PATHINFO_EXTENSION);
+				$ext = pathinfo($folder.$file, PATHINFO_EXTENSION);
 
 				if($ext !== 'php' || in_array($file, $exclude))
 				{
@@ -53,7 +77,7 @@
 				// test for PHP Notice/Warning etc.
 				$error = false;
 
-				if(require_once(e_ADMIN.$file))
+				if(require_once($folder.$file))
 				{
 					$this->assertTrue(true, "loading ".$file);
 				}
diff --git a/e107_themes/bootstrap3/theme.php b/e107_themes/bootstrap3/theme.php
index 9f53c427d..108b011cf 100644
--- a/e107_themes/bootstrap3/theme.php
+++ b/e107_themes/bootstrap3/theme.php
@@ -16,6 +16,7 @@ if(!defined('e107_INIT'))
 	exit;
 }
 
+// e107::lan('theme');
 
 class theme implements e_theme_render
 {