diff --git a/admin/editapplication.php b/admin/editapplication.php
index 623c1eee97..d5074a9621 100644
--- a/admin/editapplication.php
+++ b/admin/editapplication.php
@@ -15,12 +15,30 @@
   if ($submit) {
      $phpgw_info["flags"] = array("noheader" => True, "nonavbar" => True);
   }
+
   $phpgw_info["flags"]["currentapp"] = "admin";
+  $phpgw_info["flags"]["enable_nextmatchs_class"] = True;
   include("../header.inc.php");
 
-  $phpgw->template->set_file(array("form"	=> "application_form.tpl"));
+  function display_row($label, $value)
+  {
+     global $phpgw;
+     $phpgw->template->set_var("tr_color",$phpgw->nextmatchs->alternate_row_color());
+     $phpgw->template->set_var("label",$label);
+     $phpgw->template->set_var("value",$value);
+
+     $phpgw->template->parse("rows","row",True);
+  }
+
+  $phpgw->template->set_file(array("form" => "application_form.tpl",
+                                   "row"  => "application_form_row.tpl"
+                                  ));
 
   if ($submit) {
+     if (! $app_order) {
+        $app_order = 0;
+     }
+
      $totalerrors = 0;
   
      if (! $n_app_name)
@@ -41,8 +59,8 @@
         
      if (! $totalerrors) {
         $phpgw->db->query("update applications set app_name='" . addslashes($n_app_name) . "',"
-                	    . "app_title='" . addslashes($n_app_title) . "', app_enabled='"
-                        . "$n_app_status' where app_name='$old_app_name'",__LINE__,__FILE__);
+                	     . "app_title='" . addslashes($n_app_title) . "', app_enabled='"
+                        . "$n_app_status',app_order='$app_order' where app_name='$old_app_name'",__LINE__,__FILE__);
 
         Header("Location: " . $phpgw->link("applications.php"));
         $phpgw->common->phpgw_exit();
@@ -63,24 +81,28 @@
      $n_app_title  = $phpgw->db->f("app_title");
      $n_app_status = $phpgw->db->f("app_enabled");
      $old_app_name = $phpgw->db->f("app_name");
+     $app_order    = $phpgw->db->f("app_order");
   }
  
   $phpgw->template->set_var("lang_header",lang("Edit application"));
   $phpgw->template->set_var("hidden_vars",'<input type="hidden" name="old_app_name" value="' . $old_app_name . '">');
-
+  $phpgw->template->set_var("th_bg",$phpgw_info["theme"]["th_bg"]);
   $phpgw->template->set_var("form_action",$phpgw->link("editapplication.php"));
-  $phpgw->template->set_var("lang_app_name",lang("application name"));
-  $phpgw->template->set_var("lang_app_title",lang("application title"));
+
+  display_row(lang("application name"),'<input name="n_app_name" value="' . $n_app_name . '">');
+  display_row(lang("application title"),'<input name="n_app_title" value="' . $n_app_title . '">');
+
   $phpgw->template->set_var("lang_status",lang("Status"));
   $phpgw->template->set_var("lang_submit_button",lang("edit"));
 
-  $phpgw->template->set_var("app_name_value",$n_app_name);
-  $phpgw->template->set_var("app_title_value",$n_app_title);
-
   $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>';
+
+  display_row(lang("Status"),'<select name="n_app_status">' . $status_html . '</select>');
+  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 . '">');
+
   $phpgw->template->set_var("select_status",$status_html);
 
   $phpgw->template->pparse("out","form");
diff --git a/admin/newapplication.php b/admin/newapplication.php
index 15d6dc3702..325120c038 100644
--- a/admin/newapplication.php
+++ b/admin/newapplication.php
@@ -38,7 +38,7 @@
      }
   
      $phpgw->db->query("select count(*) from applications where app_name='"
-     				. addslashes($n_app_name) . "'",__LINE__,__FILE__);
+               . addslashes($n_app_name) . "'",__LINE__,__FILE__);
      $phpgw->db->next_record();
      
      if ($phpgw->db->f(0) != 0) {
@@ -57,32 +57,32 @@
      
      if (! $totalerrors) {
         $phpgw->db->query("insert into 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__);
+                     . addslashes($n_app_name) . "','" . addslashes($n_app_title) . "','"
+                     . "$n_app_status','$app_order')",__LINE__,__FILE__);
 
         $phpgw->db->query("SELECT preference_owner, preference_value FROM preferences");
-	if($phpgw->db->num_rows()) {
-	  while($phpgw->db->next_record()) {
-	    if($phpgw->db->f("preference_owner") != $phpgw_info["user"]["account_id"]) {
-	      $phpgw_newuser["user"]["preferences"] = unserialize($phpgw->db->f("preference_value"));
-	      if(!$phpgw_newuser["user"]["preferences"][$n_app_name]) {
-		$phpgw->common->hook_single("add_def_pref", $n_app_name);
-		$phpgw->preferences->commit_user($phpgw->db->f("preference_owner"));
-	      }
-	    } elseif(!$phpgw_info["user"]["preferences"][$n_app_name]) {
-	      $phpgw->common->hook_single("add_def_pref", $n_app_name);
-	      $phpgw_info["user"]["preferences"][$n_app_name] = $phpgw_newuser["user"]["preferences"][$n_app_name];
-	      unset($phpgw_newuser);
-	      $phpgw->preferences->commit();
-	    }
-	  }
-	}
+        if ($phpgw->db->num_rows()) {
+           while ($phpgw->db->next_record()) {
+              if ($phpgw->db->f("preference_owner") != $phpgw_info["user"]["account_id"]) {
+                 $phpgw_newuser["user"]["preferences"] = unserialize($phpgw->db->f("preference_value"));
+                 if (!$phpgw_newuser["user"]["preferences"][$n_app_name]) {
+                    $phpgw->common->hook_single("add_def_pref", $n_app_name);
+                    $phpgw->preferences->commit_user($phpgw->db->f("preference_owner"));
+                 }
+              } elseif(!$phpgw_info["user"]["preferences"][$n_app_name]) {
+                 $phpgw->common->hook_single("add_def_pref", $n_app_name);
+                 $phpgw_info["user"]["preferences"][$n_app_name] = $phpgw_newuser["user"]["preferences"][$n_app_name];
+                 unset($phpgw_newuser);
+                 $phpgw->preferences->commit();
+              }
+          }
+        }
         Header("Location: " . $phpgw->link("applications.php"));
         $phpgw->common->phpgw_exit();
      } else {
         $phpgw->template->set_var("error","<p><center>" . $phpgw->common->error_list($error) . "</center><br>");
      }
-  } else {		// else submit
+  } else {     // else submit
      $phpgw->template->set_var("error","");
   }
   $phpgw->common->phpgw_header();
@@ -103,6 +103,13 @@
                . '<option value="1"' . $selected[1] . '>' . lang("Enabled")  . '</option>'
                . '<option value="2"' . $selected[2] . '>' . lang("Enabled - Hidden from navbar")  . '</option>';
   display_row(lang("Status"),'<select name="n_app_status">' . $status_html . '</select>');
+
+  if (! $app_order) {
+     $phpgw->db->query("select (max(app_order)+1) as max from applications");
+     $phpgw->db->next_record();
+     $app_order = $phpgw->db->f("max");
+  }
+
   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 . '">');
 
   $phpgw->template->set_var("lang_submit_button",lang("add"));