diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 1738347080..4aecd11bfa 100755
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -12,6 +12,8 @@
 	      - Converted more of the inventory program to use templates
 	      - Added a search field/add button when list products (inventory)
 	      - Fixed editing of calendar entry with regards to start time
+	      - Fixed sorting order in navbar when apps where assigned to a group.
+	      - Fixed groups not being assinged an app properly.
 
 [09072000] - Added print icon that allows you to print out a page without having
 	        the navbar. Thanks Sam Wynn Jr <sam.wynn@lmco.com>
diff --git a/doc/create_tables.mysql b/doc/create_tables.mysql
index 19da9aca6e..6051dfce05 100755
--- a/doc/create_tables.mysql
+++ b/doc/create_tables.mysql
@@ -1,20 +1,26 @@
 # $Id$
 
 CREATE TABLE applications (
-  app_name varchar(25) NOT NULL,
-  app_title varchar(50),
-  app_enabled int,
+  app_name     varchar(25) NOT NULL,
+  app_title    varchar(50),
+  app_enabled  int,
+  app_order    int,
+  app_tables   varchar(255),
   UNIQUE app_name (app_name)
 );
 
-insert into applications (app_name, app_title, app_enabled) values ('admin', 'Administration', 1);
-insert into applications (app_name, app_title, app_enabled) values ('filemanager', 'File manager', 1);
-insert into applications (app_name, app_title, app_enabled) values ('addressbook', 'Address Book', 1);
-insert into applications (app_name, app_title, app_enabled) values ('todo', 'ToDo List', 1);
-insert into applications (app_name, app_title, app_enabled) values ('calendar', 'Calendar', 1);
-insert into applications (app_name, app_title, app_enabled) values ('email', 'Email', 1);
-insert into applications (app_name, app_title, app_enabled) values ('nntp', 'NNTP', 1);
-insert into applications (app_name, app_title, app_enabled) values ('cron_apps', 'cron_apps', 0);
+insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('admin', 'Administration', 1, 1, NULL);
+insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('tts', 'Trouble Ticket System', 0, 2, NULL);
+insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('inv', 'Inventory', 0, 3, NULL);
+insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('chat', 'Chat', 0, 4, NULL);
+insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('headlines', 'Headlines', 0, 5, NULL);
+insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('filemanager', 'File manager', 1, 6, NULL);
+insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('addressbook', 'Address Book', 1, 7, 'addressbook');
+insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('todo', 'ToDo List', 1, 8, 'todo');
+insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('calendar', 'Calendar', 1, 9, 'webcal_entry,webcal_entry_users,webcal_entry_groups,webcal_repeats');
+insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('email', 'Email', 1, 10,NULL);
+insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('nntp', 'NNTP', 1, 11, NULL);
+insert into applications (app_name, app_title, app_enabled, app_order, app_tables) values ('cron_apps', 'cron_apps', 0, 0, NULL);
 
 CREATE TABLE accounts (
   con		int(11) DEFAULT '0' NOT NULL auto_increment,