diff --git a/preferences/inc/class.uicategories.inc.php b/preferences/inc/class.uicategories.inc.php
index 340218187e..d5ded71f07 100644
--- a/preferences/inc/class.uicategories.inc.php
+++ b/preferences/inc/class.uicategories.inc.php
@@ -70,7 +70,6 @@
 			$GLOBALS['phpgw']->template->set_var('user_name',$this->user);
 			$GLOBALS['phpgw']->template->set_var('lang_search',lang('Search'));
 			$GLOBALS['phpgw']->template->set_var('lang_cancel',lang('Cancel'));
-			$GLOBALS['phpgw']->template->set_var('lang_done',lang('done'));
 			$GLOBALS['phpgw']->template->set_var('lang_sub',lang('Add sub'));
 			$GLOBALS['phpgw']->template->set_var('lang_edit',lang('Edit'));
 			$GLOBALS['phpgw']->template->set_var('lang_delete',lang('Delete'));
@@ -288,11 +287,6 @@
 				'cats_level'  => $cats_level
 			);
 
-			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Add %1 category for',
-				$GLOBALS['phpgw_info']['apps'][$cats_app]['title']).': '.$this->user;
-			$GLOBALS['phpgw']->common->phpgw_header();
-			echo parse_navbar();
-
 			$new_parent      = $_POST['new_parent'];
 			$cat_parent      = get_var('cat_parent',array('POST','GET'));
 			$cat_name        = $_POST['cat_name'];
@@ -338,9 +332,14 @@
 				else
 				{
 					$this->bo->save_cat($values);
-					$GLOBALS['phpgw']->template->set_var('message',lang('Category %1 has been added !', $cat_name));
+					return $this->index();
+					//$GLOBALS['phpgw']->template->set_var('message',lang('Category %1 has been added !', $cat_name));
 				}
 			}
+			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Add %1 category for',
+				$GLOBALS['phpgw_info']['apps'][$cats_app]['title']).': '.$this->user;
+			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
 
 			$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
 
@@ -403,11 +402,6 @@
 				$GLOBALS['phpgw']->link_redirect('/index.php',$link_data);
 			}
 
-			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Edit %1 category for',
-				$GLOBALS['phpgw_info']['apps'][$cats_app]['title']).': '.$this->user;
-			$GLOBALS['phpgw']->common->phpgw_header();
-			echo parse_navbar();
-
 			$new_parent			= $_POST['new_parent'];
 			$cat_parent			= $_POST['cat_parent'];
 			$cat_name			= $_POST['cat_name'];
@@ -457,10 +451,16 @@
 				else
 				{
 					$cat_id = $this->bo->save_cat($values);
-					$GLOBALS['phpgw']->template->set_var('message',lang('Category %1 has been updated !',$cat_name));
+					return $this->index();
+					//$GLOBALS['phpgw']->template->set_var('message',lang('Category %1 has been updated !',$cat_name));
 				}
 			}
 
+			$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Edit %1 category for',
+				$GLOBALS['phpgw_info']['apps'][$cats_app]['title']).': '.$this->user;
+			$GLOBALS['phpgw']->common->phpgw_header();
+			echo parse_navbar();
+
 			$cats = $this->bo->cats->return_single($cat_id);
 
 			$link_data['menuaction'] = 'preferences.uicategories.edit';
diff --git a/preferences/templates/default/category_form.tpl b/preferences/templates/default/category_form.tpl
index 6359b62e1e..e3d90286e7 100644
--- a/preferences/templates/default/category_form.tpl
+++ b/preferences/templates/default/category_form.tpl
@@ -32,8 +32,8 @@
 <!-- BEGIN add -->
 
 	<tr valign="bottom" height="50">
-		<td colspan="2"><input type="submit" name="save" value="{lang_save}"></form></td>
-		<td align="right"><form method="POST" action="{cancel_url}">
+		<td><input type="submit" name="save" value="{lang_save}"></form></td>
+		<td><form method="POST" action="{cancel_url}">
 			<input type="submit" name="cancel" value="{lang_cancel}"></form></td>
 	</tr>
 </table>
diff --git a/preferences/templates/default/listcats.tpl b/preferences/templates/default/listcats.tpl
index b99800d44a..fcbe0101d9 100644
--- a/preferences/templates/default/listcats.tpl
+++ b/preferences/templates/default/listcats.tpl
@@ -56,11 +56,12 @@
 				<input type="submit" value="{lang_add}">
 			</form>
 		</td>
-		<td align="right">
+		<td>
 			<form method="POST" action="{doneurl}">
-				<input type="submit" name="done" value="{lang_done}">
+				<input type="submit" name="done" value="{lang_cancel}">
 			</form>
 		</td>
+		<td width="80%">&nbsp;</td>
 	</tr>
 </table>