diff --git a/admin/index.php b/admin/index.php
index e01857b708..a69e6c9480 100755
--- a/admin/index.php
+++ b/admin/index.php
@@ -30,7 +30,7 @@
 	// This func called by the includes to dump a row header
 	function section_start($appname='',$icon='')
 	{
-		$GLOBALS['phpgw']->template->set_var('app_title',lang($appname));
+		$GLOBALS['phpgw']->template->set_var('app_title',$GLOBALS['phpgw_info']['apps'][$appname]['title']);
 		$GLOBALS['phpgw']->template->set_var('app_name',$appname);
 		$GLOBALS['phpgw']->template->set_var('app_icon',$icon);
 		if ($icon)
@@ -55,8 +55,12 @@
 		$GLOBALS['phpgw']->template->parse('rows','spacer_row',True);
 	}
 
-	function display_section($appname,$file)
+	function display_section($appname,$file,$file2=False)
 	{
+		if ($file2)
+		{
+			$file = $file2;
+		}
 		if(is_array($file))
 		{
 			section_start($appname,