diff --git a/admin/inc/class.boapplications.inc.php b/admin/inc/class.boapplications.inc.php
new file mode 100644
index 0000000000..1d27d680b5
--- /dev/null
+++ b/admin/inc/class.boapplications.inc.php
@@ -0,0 +1,52 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - administration                                            *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */
+
+	class boapplications
+	{
+		var $so;
+
+		function boapplications()
+		{
+			$this->so = CreateObject('admin.soapplications');
+		}
+
+		function get_list()
+		{
+			return $this->so->get_list();
+		}
+
+		function read($app_name)
+		{
+			return $this->so->read($app_name);
+		}
+
+		function save($data)
+		{
+			return $this->so->save($data);
+		}
+
+		function exists($app_name)
+		{
+			return $this->so->exists($app_name);
+		}
+
+		function app_order()
+		{
+			return $this->so->app_order();
+		}
+
+		function delete($app_name)
+		{
+			return $this->so->delete($app_name);
+		}
+	}
diff --git a/admin/inc/class.soapplications.inc.php b/admin/inc/class.soapplications.inc.php
new file mode 100644
index 0000000000..7b59390d0b
--- /dev/null
+++ b/admin/inc/class.soapplications.inc.php
@@ -0,0 +1,90 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - administration                                            *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */
+
+	class soapplications
+	{
+		var $db;
+
+		function soapplications()
+		{
+			$this->db = $GLOBALS['phpgw']->db;
+		}
+
+		function read($app_name)
+		{
+			$sql = "SELECT * FROM phpgw_applications WHERE app_name='$app_name'";
+
+			$this->db->query($sql,__LINE__,__FILE__);
+			$this->db->next_record();
+			$app_info = array(
+				$this->db->f('app_name'),
+				$this->db->f('app_title'),
+				$this->db->f('app_enabled'),
+				$this->db->f('app_name'),
+				$this->db->f('app_order')
+			);
+			return $app_info;
+		}
+
+		function get_list()
+		{
+			$this->db->query("SELECT * FROM phpgw_applications WHERE app_enabled<3",__LINE__,__FILE__);
+			if($this->db->num_rows())
+			{
+				while ($this->db->next_record())
+				{
+					$apps[$this->db->f('app_name')] = array(
+						'title'  => $this->db->f('app_title'),
+						'name'   => $this->db->f('app_name'),
+						'status' => $this->db->f('app_enabled')
+					);
+				}
+			}
+			@reset($apps);
+			return $apps;
+		}
+
+		function save($data)
+		{
+			$sql = "UPDATE phpgw_applications SET app_name='" . addslashes($data['n_app_name']) . "',"
+				. "app_title='" . addslashes($data['n_app_title']) . "', app_enabled='"
+				. $data['n_app_status'] . "',app_order='" . $data['app_order'] . "' WHERE app_name='" . $data['old_app_name'] . "'";
+
+			$this->db->query($sql,__LINE__,__FILE__);
+			return True;
+		}
+
+		function exists($app_name)
+		{
+			$this->db->query("select count(*) from phpgw_applications where app_name='" . addslashes($app_name) . "'",__LINE__,__FILE__);
+			$this->db->next_record();
+
+			if ($this->db->f(0) != 0)
+			{
+				return True;
+			}
+			return False;
+		}
+
+		function app_order()
+		{
+			$this->db->query("SELECT (max(app_order)+1) as max from phpgw_applications");
+			$this->db->next_record();
+			return $this->db->f('max');
+		}
+
+		function delete($app_name)
+		{
+			$this->db->query("DELETE FROM phpgw_applications WHERE app_name='$app_name'",__LINE__,__FILE__);
+		}
+	}
diff --git a/admin/inc/class.uiapplications.inc.php b/admin/inc/class.uiapplications.inc.php
new file mode 100644
index 0000000000..c37ba44ba5
--- /dev/null
+++ b/admin/inc/class.uiapplications.inc.php
@@ -0,0 +1,359 @@
+<?php
+  /**************************************************************************\
+  * phpGroupWare - administration                                            *
+  * http://www.phpgroupware.org                                              *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+  /* $Id$ */
+
+	class uiapplications
+	{
+		var $public_functions = array(
+			'get_list' => True,
+			'add'      => True,
+			'edit'     => True,
+			'delete'   => True
+		);
+
+		var $bo;
+		var $nextmatchs;
+
+		function uiapplications()
+		{
+			$this->bo = CreateObject('admin.boapplications');
+			$this->nextmatchs = CreateObject('phpgwapi.nextmatchs');
+		}
+
+		function get_list()
+		{
+			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
+
+			$GLOBALS['phpgw']->template->set_file(array('applications' => 'applications.tpl'));
+			$GLOBALS['phpgw']->template->set_block('applications','list','list');
+			$GLOBALS['phpgw']->template->set_block('applications','row','row');
+
+			$start = $GLOBALS['HTTP_POST_VARS']['start'];
+			$sort  = $GLOBALS['HTTP_GET_VARS']['sort'];
+			$order = $GLOBALS['HTTP_GET_VARS']['order'];
+			$offset = $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+
+			$apps = $this->bo->get_list();
+			$total = count($apps);
+
+			$sort = $sort ? $sort : 'ASC';
+
+			if($sort == 'ASC')
+			{
+				ksort($apps);
+			}
+			else
+			{
+				krsort($apps);
+			}
+
+			if ($start && $offset)
+			{
+				$limit = $start + $offset;
+			}
+			elseif ($start && !$offset)
+			{
+				$limit = $start;
+			}
+			elseif(!$start && !$offset)
+			{
+				$limit = $total;
+			}
+			else
+			{
+				$start = 0;
+				$limit = $offset;
+			}
+
+			if ($limit > $total)
+			{
+				$limit = $total;
+			}
+
+			$i = 0;
+			$applications = array();
+			while(list($app,$data) = @each($apps))
+			{
+				if($i >= $start && $i<= $limit)
+				{
+					$applications[$app] = $data;
+				}
+				$i++;
+			}
+
+			$GLOBALS['phpgw']->template->set_var('lang_installed',lang('Installed applications'));
+			$GLOBALS['phpgw']->template->set_var('bg_color',$GLOBALS['phpgw_info']['theme']['bg_color']);
+			$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
+
+			$GLOBALS['phpgw']->template->set_var('sort_title',$this->nextmatchs->show_sort_order($sort,'title','title','/index.php',lang('Title'),'&menuaction=admin.uiapplications.get_list'));
+			$GLOBALS['phpgw']->template->set_var('lang_showing',$this->nextmatchs->show_hits($total,$start));
+			$GLOBALS['phpgw']->template->set_var('left',$this->nextmatchs->left('/index.php',$start,$total,'menuaction=admin.uiapplications.get_list'));
+			$GLOBALS['phpgw']->template->set_var('right',$this->nextmatchs->right('index.php',$start,$total,'menuaction=admin.uiapplications.get_list'));
+
+			$GLOBALS['phpgw']->template->set_var('lang_edit',lang('Edit'));
+			$GLOBALS['phpgw']->template->set_var('lang_delete',lang('Delete'));
+			$GLOBALS['phpgw']->template->set_var('lang_enabled',lang('Enabled'));
+
+			$GLOBALS['phpgw']->template->set_var('new_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.add'));
+			$GLOBALS['phpgw']->template->set_var('lang_add',lang('add'));
+
+			@reset($applications);
+			while (list($key,$app) = @each($applications))
+			{
+				$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
+
+				if($app['title'])
+				{
+					$name = $app['title'];
+				}
+				elseif($app['name'])
+				{
+					$name = $app['name'];
+				}
+				else
+				{
+					$name = '&nbsp;';
+				}
+
+				$GLOBALS['phpgw']->template->set_var('tr_color',$tr_color);
+				$GLOBALS['phpgw']->template->set_var('name',$name);
+
+				$GLOBALS['phpgw']->template->set_var('edit','<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.edit&app_name=' . urlencode($app['name'])) . '"> ' . lang('Edit') . ' </a>');
+				$GLOBALS['phpgw']->template->set_var('delete','<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.delete&app_name=' . urlencode($app['name'])) . '"> ' . lang('Delete') . ' </a>');
+
+				if ($app['status'])
+				{
+					$status = lang('Yes');
+				}
+				else
+				{
+					$status = '<b>' . lang('No') . '</b>';
+				}
+				$GLOBALS['phpgw']->template->set_var('status',$status);
+
+				$GLOBALS['phpgw']->template->parse('rows','row',True);
+			}
+
+			$GLOBALS['phpgw']->template->pparse('out','list');
+		}
+
+		function display_row($label, $value)
+		{
+			$GLOBALS['phpgw']->template->set_var('tr_color',$this->nextmatchs->alternate_row_color());
+			$GLOBALS['phpgw']->template->set_var('label',$label);
+			$GLOBALS['phpgw']->template->set_var('value',$value);
+			$GLOBALS['phpgw']->template->parse('rows','row',True);
+		}
+
+		function add()
+		{
+			$GLOBALS['phpgw']->template->set_file(array('application' => 'application_form.tpl'));
+			$GLOBALS['phpgw']->template->set_block('application','form','form');
+			$GLOBALS['phpgw']->template->set_block('application','row','row');
+
+			if ($HTTP_POST_VARS['submit'])
+			{
+				$totalerrors = 0;
+
+				$apporder     = $HTTP_POST_VARS['app_order'] ? $HTTP_POST_VARS['app_order'] : 0;
+				$n_app_name   = chop($HTTP_POST_VARS['n_app_name']);
+				$n_app_title  = chop($HTTP_POST_VARS['n_app_title']);
+				$n_app_status = $HTTP_POST_VARS['n_app_status'];
+
+				if ($this->bo->exists($n_app_name))
+				{
+					$error[$totalerrors++] = lang('That application name already exists.');
+				}
+				if (preg_match("/\D/",$app_order))
+				{
+					$error[$totalerrors++] = lang('That application order must be a number.');
+				}
+				if (!$n_app_name)
+				{
+					$error[$totalerrors++] = lang('You must enter an application name.');
+				}
+				if (!$n_app_title)
+				{
+					$error[$totalerrors++] = lang('You must enter an application title.');
+				}
+
+				if (!$totalerrors)
+				{
+					$GLOBALS['phpgw']->db->query("INSERT INTO phpgw_applications (app_name,app_title,app_enabled,app_order) VALUES('"
+						. addslashes($n_app_name) . "','" . addslashes($n_app_title) . "','"
+						. "$n_app_status','$app_order')",__LINE__,__FILE__);
+
+					Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list'));
+					$GLOBALS['phpgw']->common->phpgw_exit();
+				}
+				else
+				{
+					$GLOBALS['phpgw']->template->set_var('error','<p><center>' . $GLOBALS['phpgw']->common->error_list($error) . '</center><br>');
+				}
+			}
+			else
+			{	// else submit
+				$GLOBALS['phpgw']->template->set_var('error','');
+			}
+
+			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
+
+			$GLOBALS['phpgw']->template->set_var('lang_header',lang('Add new application'));
+			$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
+
+			$GLOBALS['phpgw']->template->set_var('hidden_vars','');
+			$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.add'));
+
+			$this->display_row(lang('application name'),'<input name="n_app_name" value="' . $n_app_name . '">');
+			$this->display_row(lang('application title'),'<input name="n_app_title" value="' . $n_app_title . '">');
+
+			if(!isset($n_app_status))
+			{
+				$n_app_status = 1;
+			}
+
+			$selected[$n_app_status] = ' selected';
+			$status_html = '<option value="0"' . $selected[0] . '>' . lang('Disabled') . '</option>'
+				. '<option value="1"' . $selected[1] . '>' . lang('Enabled') . '</option>'
+				. '<option value="2"' . $selected[2] . '>' . lang('Enabled - Hidden from navbar') . '</option>';
+			$this->display_row(lang('Status'),'<select name="n_app_status">' . $status_html . '</select>');
+
+			if (!$app_order)
+			{
+				$app_order = $this->bo->app_order();
+			}
+
+			$this->display_row(lang('Select which location this app should appear on the navbar, lowest (left) to highest (right)'),'<input name="app_order" value="' . $app_order . '">');
+
+			$GLOBALS['phpgw']->template->set_var('lang_submit_button',lang('add'));
+			$GLOBALS['phpgw']->template->pparse('out','form');
+		}
+
+		function edit()
+		{
+			$app_name = $GLOBALS['HTTP_GET_VARS']['app_name'];
+
+			$GLOBALS['phpgw']->template->set_file(array('application' => 'application_form.tpl'));
+			$GLOBALS['phpgw']->template->set_block('application','form','form');
+			$GLOBALS['phpgw']->template->set_block('application','row','row');
+
+			if ($GLOBALS['HTTP_POST_VARS']['submit'])
+			{
+				$totalerrors = 0;
+
+				$old_app_name = $GLOBALS['HTTP_POST_VARS']['old_app_name'];
+				$app_order    = $GLOBALS['HTTP_POST_VARS']['app_order'] ? $GLOBALS['HTTP_POST_VARS']['app_order'] : 0;
+				$n_app_name   = chop($GLOBALS['HTTP_POST_VARS']['n_app_name']);
+				$n_app_title  = chop($GLOBALS['HTTP_POST_VARS']['n_app_title']);
+				$n_app_status = $GLOBALS['HTTP_POST_VARS']['n_app_status'];
+
+				if (! $n_app_name)
+				{
+					$error[$totalerrors++] = lang('You must enter an application name.');
+				}
+
+				if (! $n_app_title)
+				{
+					$error[$totalerrors++] = lang('You must enter an application title.');
+				}
+
+				if ($old_app_name != $n_app_name)
+				{
+					if ($this->bo->exists($n_app_name))
+					{
+						$error[$totalerrors++] = lang('That application name already exists.');
+					}
+				}
+ 
+				if (! $totalerrors)
+				{
+					$this->bo->save(array(
+						'n_app_name'   => $n_app_name,
+						'n_app_title'  => $n_app_title,
+						'n_app_status' => $n_app_status,
+						'app_order'    => $app_order,
+						'old_app_name' => $old_app_name
+					));
+
+					Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list'));
+					$GLOBALS['phpgw']->common->phpgw_exit();
+				}
+			}
+
+			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
+
+			if ($totalerrors)
+			{
+				$GLOBALS['phpgw']->template->set_var('error','<p><center>' . $GLOBALS['phpgw']->common->error_list($error) . '</center><br>');
+			}
+			else
+			{
+				$GLOBALS['phpgw']->template->set_var('error','');
+				list($n_app_name,$n_app_title,$n_app_status,$old_app_name,$app_order) = $this->bo->read($app_name);
+			}
+
+			$GLOBALS['phpgw']->template->set_var('lang_header',lang('Edit application'));
+			$GLOBALS['phpgw']->template->set_var('hidden_vars','<input type="hidden" name="old_app_name" value="' . $old_app_name . '">');
+			$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
+			$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.edit'));
+
+			$this->display_row(lang('application name'),'<input name="n_app_name" value="' . $n_app_name . '">');
+			$this->display_row(lang('application title'),'<input name="n_app_title" value="' . $n_app_title . '">');
+
+			$GLOBALS['phpgw']->template->set_var('lang_status',lang('Status'));
+			$GLOBALS['phpgw']->template->set_var('lang_submit_button',lang('edit'));
+
+			$selected[$n_app_status] = ' selected';
+			$status_html = '<option value="0"' . $selected[0] . '>' . lang('Disabled') . '</option>'
+				. '<option value="1"' . $selected[1] . '>' . lang('Enabled') . '</option>'
+				. '<option value="2"' . $selected[2] . '>' . lang('Enabled - Hidden from navbar') . '</option>';
+
+			$this->display_row(lang("Status"),'<select name="n_app_status">' . $status_html . '</select>');
+			$this->display_row(lang("Select which location this app should appear on the navbar, lowest (left) to highest (right)"),'<input name="app_order" value="' . $app_order . '">');
+
+			$GLOBALS['phpgw']->template->set_var('select_status',$status_html);
+			$GLOBALS['phpgw']->template->pparse('out','form');
+		}
+
+		function delete()
+		{
+			$app_name = $GLOBALS['HTTP_GET_VARS']['app_name'];
+
+			if (!$app_name)
+			{
+				Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list'));
+			}
+
+			$GLOBALS['phpgw']->template->set_file(array('body' => 'delete_common.tpl'));
+
+			if ($GLOBALS['HTTP_GET_VARS']['confirm'])
+			{
+				$this->bo->delete($app_name);
+				Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list'));
+				$GLOBALS['phpgw']->common->phpgw_exit();
+			}
+
+			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
+
+			$GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to delete this application ?'));
+			$GLOBALS['phpgw']->template->set_var('no','<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list') . '">' . lang('No') . '</a>');
+			$GLOBALS['phpgw']->template->set_var('yes','<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.delete&app_name=' . urlencode($app_name) . "&confirm=True") . '">' . lang('Yes') . '</a>');
+			$GLOBALS['phpgw']->template->pparse('out','body');
+
+			$GLOBALS['phpgw']->common->phpgw_footer();
+		}
+	}
+?>