Index: trunk/wb/languages/EN.php
===================================================================
--- trunk/wb/languages/EN.php	(revision 118)
+++ trunk/wb/languages/EN.php	(revision 119)
@@ -103,6 +103,8 @@
 $HEADING['DEFAULT_SETTINGS'] = 'Default Settings';
 $HEADING['SEARCH_SETTINGS'] = 'Search Settings';
 $HEADING['FILESYSTEM_SETTINGS'] = 'Filesystem Settings';
+$HEADING['SERVER_SETTINGS'] = 'Server Settings';
+$HEADING['ADMINISTRATION_TOOLS'] = 'Administration Tools';
 
 $HEADING['MODIFY_DELETE_USER'] = 'Modify/Delete User';
 $HEADING['ADD_USER'] = 'Add User';
Index: trunk/wb/admin/groups/groups.php
===================================================================
--- trunk/wb/admin/groups/groups.php	(revision 118)
+++ trunk/wb/admin/groups/groups.php	(revision 119)
@@ -90,14 +90,16 @@
 			if($file != "." AND $file != ".." AND $file != ".svn" AND is_dir(WB_PATH."/modules/$file") AND file_exists(WB_PATH."/modules/$file/info.php")) {
 				// Include the modules info file
 				require(WB_PATH.'/modules/'.$file.'/info.php');
-				$template->set_var('VALUE', $file);
-				$template->set_var('NAME', $module_name);
-				if(!is_numeric(array_search($file, $module_permissions))) {
-					$template->set_var('CHECKED', 'checked');
-				} else {
-					$template->set_var('CHECKED', '');
+				if ($module_type=='page') {
+					$template->set_var('VALUE', $file);
+					$template->set_var('NAME', $module_name);
+					if(!is_numeric(array_search($file, $module_permissions))) {
+						$template->set_var('CHECKED', 'checked');
+					} else {
+						$template->set_var('CHECKED', '');
+					}
+					$template->parse('module_list', 'module_list_block', true);
 				}
-				$template->parse('module_list', 'module_list_block', true);
 			}
 		}
 	}
Index: trunk/wb/admin/groups/index.php
===================================================================
--- trunk/wb/admin/groups/index.php	(revision 118)
+++ trunk/wb/admin/groups/index.php	(revision 119)
@@ -125,9 +125,11 @@
 		if($file != '.' AND $file != '..' AND $file != '.svn' AND is_dir(WB_PATH."/modules/$file") AND file_exists(WB_PATH."/modules/$file/info.php")) {
 			// Include the modules info file
 			require(WB_PATH.'/modules/'.$file.'/info.php');
-			$template->set_var('VALUE', $file);
-			$template->set_var('NAME', $module_name);
-			$template->parse('module_list', 'module_list_block', true);
+			if ($module_type=='page') {
+				$template->set_var('VALUE', $file);
+				$template->set_var('NAME', $module_name);
+				$template->parse('module_list', 'module_list_block', true);
+			}
 		}
 	}
 }
Index: trunk/wb/admin/settings/index.php
===================================================================
--- trunk/wb/admin/settings/index.php	(revision 118)
+++ trunk/wb/admin/settings/index.php	(revision 119)
@@ -124,25 +124,19 @@
 						 );
 
 // Insert groups into signup list
-$template->set_block('main_block', 'group_list_block', 'group_list');
-$results = $database->query("SELECT group_id, name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'");
+$template->set_block('main_block', 'tool_list_block', 'tool_list');
+$results = $database->query("SELECT * FROM ".TABLE_PREFIX."modules WHERE type = 'tool'");
+$tool_list_empty=true;
 if($results->numRows() > 0) {
-	while($group = $results->fetchRow()) {
-		$template->set_var('ID', $group['group_id']);
-		$template->set_var('NAME', $group['name']);
-		if(FRONTEND_SIGNUP == $group['group_id']) {
-			$template->set_var('SELECTED', 'selected');
-		} else {
-			$template->set_var('SELECTED', '');
-		}
-		$template->parse('group_list', 'group_list_block', true);
+	while($tool = $results->fetchRow()) {
+		$template->set_var('LINK', '<a href="'.ADMIN_URL.'/settings/tool.php?tool='.$tool['directory'].'">'.$tool['name'].'</a>');
 	}
 } else {
-	$template->set_var('ID', 'disabled');
-	$template->set_var('NAME', $MESSAGE['GROUPS']['NO_GROUPS_FOUND']);
-	$template->parse('group_list', 'group_list_block', true);
+	$template->set_var('LINK', $TEXT['NONE_FOUND']);
 }
+$template->parse('tool_list', 'tool_list_block', true);
 
+
 // Insert language values
 $template->set_block('main_block', 'language_list_block', 'language_list');
 if($handle = opendir(WB_PATH.'/languages/')) {
@@ -466,12 +460,33 @@
 // Insert Server Email value into template
 $template->set_var('SERVER_EMAIL', SERVER_EMAIL);
 
+// Insert groups into signup list
+$template->set_block('main_block', 'tool_list_block', 'tool_list');
+$results = $database->query("SELECT group_id, name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'");
+if($results->numRows() > 0) {
+	while($group = $results->fetchRow()) {
+		$template->set_var('ID', $group['group_id']);
+		$template->set_var('NAME', $group['name']);
+		if(FRONTEND_SIGNUP == $group['group_id']) {
+			$template->set_var('SELECTED', 'selected');
+		} else {
+			$template->set_var('SELECTED', '');
+		}
+		$template->parse('group_list', 'group_list_block', true);
+	}
+} else {
+	$template->set_var('ID', 'disabled');
+	$template->set_var('NAME', $MESSAGE['GROUPS']['NO_GROUPS_FOUND']);
+	$template->parse('group_list', 'group_list_block', true);
+}
+
 // Insert language headings
 $template->set_var(array(
 								'HEADING_GENERAL_SETTINGS' => $HEADING['GENERAL_SETTINGS'],
 								'HEADING_DEFAULT_SETTINGS' => $HEADING['DEFAULT_SETTINGS'],
 								'HEADING_SEARCH_SETTINGS' => $HEADING['SEARCH_SETTINGS'],
-								'HEADING_FILESYSTEM_SETTINGS' => $HEADING['FILESYSTEM_SETTINGS']
+								'HEADING_SERVER_SETTINGS' => $HEADING['SERVER_SETTINGS'],
+								'HEADING_ADMINISTRATION_TOOLS' => $HEADING['ADMINISTRATION_TOOLS']
 								)
 						);
 // Insert language text and messages
Index: trunk/wb/admin/settings/template.html
===================================================================
--- trunk/wb/admin/settings/template.html	(revision 118)
+++ trunk/wb/admin/settings/template.html	(revision 119)
@@ -572,6 +572,23 @@
 		<input type="text" name="app_name" value="{APP_NAME}" />
 	</td>
 </tr>
+<tr class="advanced">
+	<td colspan="3" style="padding-top: 10px;">
+		<h2>{HEADING_ADMINISTRATION_TOOLS}</h2>
+	</td>
+</tr>
+<tr class="advanced">
+	<td>
+		<!-- BEGIN tool_list_block -->
+			{LINK} 
+		<!-- END tool_list_block -->
+		{TOOL_LIST}
+	</td>
+	<td>
+		&nbsp;
+	</td>
+	<td>&nbsp;</td>
+</tr>
 <tr>
 	<td>&nbsp;</td>
 	<td>