diff --git a/system/libs/visitors.php b/system/libs/visitors.php
index 24daa828..f6da3822 100644
--- a/system/libs/visitors.php
+++ b/system/libs/visitors.php
@@ -102,12 +102,12 @@ class Visitors
 		if($this->cacheEnabled) {
 			foreach($this->data as $ip => &$details)
 				$details['ip'] = $ip;
-
+			
 			return $this->data;
 		}
-
+		
 		global $db;
-		return $db->query('SELECT ' . $db->fieldName('ip') . ', ' . $db->fieldName('lastvisit') . ', ' . $db->fieldName('page') . ' FROM ' . $db->tableName(TABLE_PREFIX . 'visitors') . ' ORDER BY ' . $db->fieldName('lastvisit') . ' DESC')->fetch();
+		return $db->query('SELECT ' . $db->fieldName('ip') . ', ' . $db->fieldName('lastvisit') . ', ' . $db->fieldName('page') . ' FROM ' . $db->tableName(TABLE_PREFIX . 'visitors') . ' ORDER BY ' . $db->fieldName('lastvisit') . ' DESC')->fetchAll();
 	}
 
 	public function getAmountVisitors()
diff --git a/system/template.php b/system/template.php
index d61c0d4d..76cea6a7 100644
--- a/system/template.php
+++ b/system/template.php
@@ -103,7 +103,7 @@ if($twig_loader && file_exists(BASE . $template_path))
 	$twig_loader->prependPath(BASE . $template_path);
 
 function get_template_menus() {
-	global $db, $template_name;
+	global $db, $config, $template_name;
 	
 	$menus = array();
 	$query = $db->query('SELECT `name`, `link`, `category` FROM `' . TABLE_PREFIX . 'menu` WHERE `template` = ' . $db->quote($template_name) . ' ORDER BY `category`, `ordering` ASC');
@@ -111,6 +111,12 @@ function get_template_menus() {
 		$menus[$menu['category']][] = array('name' => $menu['name'], 'link' => $menu['link']);
 	}
 	
-	return $menus;
+	$new_menus = array();
+	foreach($config['menu_categories'] as $id => $options) {
+		if(isset($menus[$id]))
+			$new_menus[$id] = $menus[$id];
+	}
+	
+	return $new_menus;
 }
 ?>