diff --git a/bilder.pot b/bilder.pot
index 42e2ee6..13ce0b1 100644
--- a/bilder.pot
+++ b/bilder.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-09 00:41+0200\n"
+"POT-Creation-Date: 2007-10-11 11:35+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,85 +22,89 @@ msgid ""
 "\t\t\t\t\t      sorry for the inconvenience caused."
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:3
-#: templates/personAdmin/personInUp.tpl.php:55
+#: templates/personAdmin/personForm.tpl.php:3
+#: templates/personAdmin/personForm.tpl.php:40
 msgid "submit"
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:4
+#: templates/personAdmin/personForm.tpl.php:4
 msgid "delete"
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:31
+#: templates/personAdmin/personForm.tpl.php:31
 msgid "update"
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:38
+#: templates/personAdmin/personForm.tpl.php:38
 msgid "insert"
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:61
+#: templates/personAdmin/personForm.tpl.php:47
 msgid "personal data"
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:81
-#: templates/personAdmin/personSearch1.tpl.php:56
+#: templates/personAdmin/personForm.tpl.php:67
+#: templates/personAdmin/personSearch.tpl.php:56
 msgid "firstname"
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:87
-#: templates/personAdmin/personSearch1.tpl.php:45
+#: templates/personAdmin/personForm.tpl.php:73
+#: templates/personAdmin/personSearch.tpl.php:45
 msgid "surname"
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:93
+#: templates/personAdmin/personForm.tpl.php:79
 msgid "company"
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:99
+#: templates/personAdmin/personForm.tpl.php:85
 msgid "email"
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:105
+#: templates/personAdmin/personForm.tpl.php:91
 msgid "url"
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:120
+#: templates/personAdmin/personForm.tpl.php:102
 msgid "photographer"
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:125
+#: templates/personAdmin/personForm.tpl.php:115
 msgid "camera"
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:131
+#: templates/personAdmin/personForm.tpl.php:121
 msgid "cameraId"
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:146
+#: templates/personAdmin/personForm.tpl.php:132
 msgid "owner"
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:151
+#: templates/personAdmin/personForm.tpl.php:145
 msgid "watermark"
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:156
+#: templates/personAdmin/personForm.tpl.php:150
 msgid "watermark width"
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:162
+#: templates/personAdmin/personForm.tpl.php:156
 msgid "watermark height"
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:168
+#: templates/personAdmin/personForm.tpl.php:162
 msgid "watermark xPos"
 msgstr ""
 
-#: templates/personAdmin/personInUp.tpl.php:174
+#: templates/personAdmin/personForm.tpl.php:168
 msgid "watermark yPos"
 msgstr ""
 
-#: templates/personAdmin/personSearch1.tpl.php:37
+#: templates/personAdmin/personForm.tpl.php:173
+msgid "more"
+msgstr ""
+
+#: templates/personAdmin/personSearch.tpl.php:37
 msgid "search"
 msgstr ""
diff --git a/js/personAdmin/personSearch1.js b/js/personAdmin/personSearch.js
similarity index 91%
rename from js/personAdmin/personSearch1.js
rename to js/personAdmin/personSearch.js
index 807779d..2813e89 100644
--- a/js/personAdmin/personSearch1.js
+++ b/js/personAdmin/personSearch.js
@@ -20,7 +20,7 @@
  * altSurnames         / fill the list of alternative surnames
  * altFirstnames       / fill the list of alternative firstnames
  */
-function c_personSearch1 (fname, sname, fnameAlt, snameAlt, names, person)
+function c_personSearch (fname, sname, fnameAlt, snameAlt, names, person)
 {
 	this.firstname = fname;
 	this.surname   = sname;
@@ -97,7 +97,7 @@ function c_personSearch1 (fname, sname, fnameAlt, snameAlt, names, person)
 
 		switch (inField.getAttribute ('id'))
 		{
-			case 'personSearch1_fname':
+			case 'personSearch_fname':
 				idx = this.fnameIdx;
 				if (idx != -1)
 				{
@@ -106,7 +106,7 @@ function c_personSearch1 (fname, sname, fnameAlt, snameAlt, names, person)
 					inField.value = dists[2];
 				}
 				break;
-			case 'personSearch1_sname':
+			case 'personSearch_sname':
 				idx = this.snameIdx;
 				if (idx != -1)
 				{
@@ -269,7 +269,7 @@ function c_personSearch1 (fname, sname, fnameAlt, snameAlt, names, person)
 	}
 }
 
-function personSearch1AltFirstnameHandler (_event)
+function personSearchAltFirstnameHandler (_event)
 {
 	if (_event == undefined)
 		_event = window.event;
@@ -279,25 +279,25 @@ function personSearch1AltFirstnameHandler (_event)
 	else if (_event.keyCode)
 		var keycode = _event.keyCode;
 
-	// pSearch1 wird im php personSearch1.js angelegt.
+	// pSearch wird im php personSearch.js angelegt.
 	switch (keycode)
 	{
 		case 38:
-			pSearch1.decFnameIdx ();
+			pSearch.decFnameIdx ();
 			break;
 		case 40:
-			pSearch1.incFnameIdx ();
+			pSearch.incFnameIdx ();
 			break;
 		case 13:
-			return pSearch1.hide ('personSearch1_fBestFit');
+			return pSearch.hide ('personSearch_fBestFit');
 		default:
-			pSearch1.fnameIdx = -1;
+			pSearch.fnameIdx = -1;
 	}
 
-	return pSearch1.altFirstnames ();
+	return pSearch.altFirstnames ();
 }
 
-function personSearch1AltSurnameHandler (_event)
+function personSearchAltSurnameHandler (_event)
 {
 	if (_event == undefined)
 		_event = window.event;
@@ -307,20 +307,20 @@ function personSearch1AltSurnameHandler (_event)
 	else if (_event.keyCode)
 		var keycode = _event.keyCode;
 
-	// pSearch1 wird im php personSearch1.js angelegt.
+	// pSearch wird im php personSearch.js angelegt.
 	switch (keycode)
 	{
 		case 38:
-			pSearch1.decSnameIdx ();
+			pSearch.decSnameIdx ();
 			break;
 		case 40:
-			pSearch1.incSnameIdx ();
+			pSearch.incSnameIdx ();
 			break;
 		case 13:
-			return pSearch1.hide ('personSearch1_sBestFit');
+			return pSearch.hide ('personSearch_sBestFit');
 		default:
-			pSearch1.snameIdx = -1;
+			pSearch.snameIdx = -1;
 	}
 
-	return pSearch1.altSurnames ();
+	return pSearch.altSurnames ();
 }
diff --git a/libs/c_personAdmin.php b/libs/c_personAdmin.php
index 23c4271..14b4efc 100644
--- a/libs/c_personAdmin.php
+++ b/libs/c_personAdmin.php
@@ -84,7 +84,7 @@ class c_personAdmin extends c_picToolSavant
 		return $result;
 	}
 	
-	function personSearch1 ()
+	function personSearch ()
 	{
 		$names = array ();
 
@@ -94,7 +94,7 @@ class c_personAdmin extends c_picToolSavant
 
 		$this->assign ('names', $names);
 
-		return $this->fetch ('personAdmin/personSearch1.tpl.php');
+		return $this->fetch ('personAdmin/personSearch.tpl.php');
 	}
 
 	function personForm ()
@@ -104,7 +104,7 @@ class c_personAdmin extends c_picToolSavant
 
 	function show ()
 	{
-		$this->assign ('personSearch1', $this->personSearch1 ());
+		$this->assign ('personSearch', $this->personSearch ());
 		$this->assign ('personForm', $this->personForm ());
 
 		$this->display ('personAdmin/personAdmin.tpl.php');
diff --git a/locale/de/LC_MESSAGES/bilder.mo b/locale/de/LC_MESSAGES/bilder.mo
index c12e791..386f93f 100644
Binary files a/locale/de/LC_MESSAGES/bilder.mo and b/locale/de/LC_MESSAGES/bilder.mo differ
diff --git a/po/de.po b/po/de.po
index 5105e53..df60b60 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-09 00:41+0200\n"
+"POT-Creation-Date: 2007-10-11 11:35+0200\n"
 "PO-Revision-Date: 2007-10-07 15:45+0200\n"
 "Last-Translator:  <georg@steffers.org>\n"
 "Language-Team: German\n"
@@ -25,85 +25,89 @@ msgstr ""
 "Diese Seite funktioniert nur mir Javascript Unterstützung. Wir bedauern\n"
 "\t\t\t\t\t      die verursachten Unannehmlichkeiten."
 
-#: templates/personAdmin/personInUp.tpl.php:3
-#: templates/personAdmin/personInUp.tpl.php:55
+#: templates/personAdmin/personForm.tpl.php:3
+#: templates/personAdmin/personForm.tpl.php:40
 msgid "submit"
 msgstr "senden"
 
-#: templates/personAdmin/personInUp.tpl.php:4
+#: templates/personAdmin/personForm.tpl.php:4
 msgid "delete"
 msgstr "löschen"
 
-#: templates/personAdmin/personInUp.tpl.php:31
+#: templates/personAdmin/personForm.tpl.php:31
 msgid "update"
 msgstr "aktualisieren"
 
-#: templates/personAdmin/personInUp.tpl.php:38
+#: templates/personAdmin/personForm.tpl.php:38
 msgid "insert"
 msgstr "einfügen"
 
-#: templates/personAdmin/personInUp.tpl.php:61
+#: templates/personAdmin/personForm.tpl.php:47
 msgid "personal data"
 msgstr "Perönliche Daten"
 
-#: templates/personAdmin/personInUp.tpl.php:81
-#: templates/personAdmin/personSearch1.tpl.php:56
+#: templates/personAdmin/personForm.tpl.php:67
+#: templates/personAdmin/personSearch.tpl.php:56
 msgid "firstname"
 msgstr "Vorname"
 
-#: templates/personAdmin/personInUp.tpl.php:87
-#: templates/personAdmin/personSearch1.tpl.php:45
+#: templates/personAdmin/personForm.tpl.php:73
+#: templates/personAdmin/personSearch.tpl.php:45
 msgid "surname"
 msgstr "Nachname"
 
-#: templates/personAdmin/personInUp.tpl.php:93
+#: templates/personAdmin/personForm.tpl.php:79
 msgid "company"
 msgstr "Firma"
 
-#: templates/personAdmin/personInUp.tpl.php:99
+#: templates/personAdmin/personForm.tpl.php:85
 msgid "email"
 msgstr "eMail"
 
-#: templates/personAdmin/personInUp.tpl.php:105
+#: templates/personAdmin/personForm.tpl.php:91
 msgid "url"
 msgstr "Homepage"
 
-#: templates/personAdmin/personInUp.tpl.php:120
+#: templates/personAdmin/personForm.tpl.php:102
 msgid "photographer"
 msgstr "Fotograf"
 
-#: templates/personAdmin/personInUp.tpl.php:125
+#: templates/personAdmin/personForm.tpl.php:115
 msgid "camera"
 msgstr "Kamera"
 
-#: templates/personAdmin/personInUp.tpl.php:131
+#: templates/personAdmin/personForm.tpl.php:121
 msgid "cameraId"
 msgstr "Kamera ID"
 
-#: templates/personAdmin/personInUp.tpl.php:146
+#: templates/personAdmin/personForm.tpl.php:132
 msgid "owner"
 msgstr "Besitzer"
 
-#: templates/personAdmin/personInUp.tpl.php:151
+#: templates/personAdmin/personForm.tpl.php:145
 msgid "watermark"
 msgstr "Wasserzeichen"
 
-#: templates/personAdmin/personInUp.tpl.php:156
+#: templates/personAdmin/personForm.tpl.php:150
 msgid "watermark width"
 msgstr "Wasserzeichen Breite"
 
-#: templates/personAdmin/personInUp.tpl.php:162
+#: templates/personAdmin/personForm.tpl.php:156
 msgid "watermark height"
 msgstr "Wasserzeichen Höhe"
 
-#: templates/personAdmin/personInUp.tpl.php:168
+#: templates/personAdmin/personForm.tpl.php:162
 msgid "watermark xPos"
 msgstr "Wasserzeichen X"
 
-#: templates/personAdmin/personInUp.tpl.php:174
+#: templates/personAdmin/personForm.tpl.php:168
 msgid "watermark yPos"
 msgstr "Wasserzeichen Y"
 
-#: templates/personAdmin/personSearch1.tpl.php:37
+#: templates/personAdmin/personForm.tpl.php:173
+msgid "more"
+msgstr "Weitere"
+
+#: templates/personAdmin/personSearch.tpl.php:37
 msgid "search"
 msgstr "Suche"
diff --git a/templates/personAdmin/personAdmin.tpl.php b/templates/personAdmin/personAdmin.tpl.php
index 8a90430..3d5ec62 100644
--- a/templates/personAdmin/personAdmin.tpl.php
+++ b/templates/personAdmin/personAdmin.tpl.php
@@ -13,7 +13,7 @@
 		<script src="<?=JSURL?>levenshtein.js" type="text/javascript"></script>
 		<script src="<?=JSURL?>fittingStrings.js" type="text/javascript"></script>
 		<script src="<?=JSURL?>transPngBg.js" type="text/javascript"></script>
-		<script src="<?=JSURL?>personAdmin/personSearch1.js"
+		<script src="<?=JSURL?>personAdmin/personSearch.js"
 			type="text/javascript"></script>
 		<script src="<?=JSURL?>personAdmin/personForm.js"
 			type="text/javascript"></script>
@@ -41,7 +41,7 @@
 					      sorry for the inconvenience caused.')?>
 				</div>
 			</noscript>
-			<?=$this->personSearch1?>
+			<?=$this->personSearch?>
 			<div style="height: 5px; line-height: 5px">&nbsp;</div>
 			<?=$this->personForm?>
 		</div>
diff --git a/templates/personAdmin/personForm.tpl.php b/templates/personAdmin/personForm.tpl.php
index 5e4c123..3d4e999 100644
--- a/templates/personAdmin/personForm.tpl.php
+++ b/templates/personAdmin/personForm.tpl.php
@@ -169,7 +169,9 @@
 					</div>
 				</div>
 				<div class="bgc-box1 f-box1 d-box1">
-					<div class="bgc-box-head1 f-box-head1 d-box-head1">more</div>
+					<div class="bgc-box-head1 f-box-head1 d-box-head1">
+						<?=_('more')?>
+					</div>
 				</div>
 			</div>
 		</div>
diff --git a/templates/personAdmin/personSearch1.tpl.php b/templates/personAdmin/personSearch.tpl.php
similarity index 70%
rename from templates/personAdmin/personSearch1.tpl.php
rename to templates/personAdmin/personSearch.tpl.php
index de79cf3..addb20a 100644
--- a/templates/personAdmin/personSearch1.tpl.php
+++ b/templates/personAdmin/personSearch.tpl.php
@@ -24,9 +24,9 @@
 		<? endforeach ?>
 	<? endforeach ?>
 
-	pSearch1 = new c_personSearch1 (
-		'personSearch1_fname', 'personSearch1_sname',
-		'personSearch1_fBestFit', 'personSearch1_sBestFit', names, person);
+	pSearch = new c_personSearch (
+		'personSearch_fname', 'personSearch_sname',
+		'personSearch_fBestFit', 'personSearch_sBestFit', names, person);
 //]]>
 </script>
 
@@ -39,24 +39,24 @@
 			<div class="bgc-box1 f-box1 d-box1">
 				<div style="position: relative; z-index: 1">
 					<input type="text" style="width: 200px" maxlength="255"
-						id="personSearch1_sname" value=""
-						onKeyUp="return pSearch1.altSurnames ()" 
-						onBlur="return pSearch1.hide ('personSearch1_sBestFit')" />
+						id="personSearch_sname" value=""
+						onKeyUp="return pSearch.altSurnames ()" 
+						onBlur="return pSearch.hide ('personSearch_sBestFit')" />
 					<?=_('surname')?>
 					<div class="bgc-tt1 d-tt1"
 						style="position: absolute; top: 20px; left: 0px">
-						<ul id="personSearch1_sBestFit" class="d-tt1" />
+						<ul id="personSearch_sBestFit" class="d-tt1" />
 					</div>
 				</div>
 				<div style="position: relative; z-index: 0">
 					<input type="text" style="width: 200px" maxlength="255"
-						id="personSearch1_fname" value=""
-						onKeyUp="return pSearch1.altFirstnames ()" 
-						onBlur="return pSearch1.hide ('personSearch1_fBestFit')" />
+						id="personSearch_fname" value=""
+						onKeyUp="return pSearch.altFirstnames ()" 
+						onBlur="return pSearch.hide ('personSearch_fBestFit')" />
 					<?=_('firstname')?>
 					<div class="bgc-tt1 d-tt1"
 						style="position: absolute; top: 20px; left: 0px">
-						<ul id="personSearch1_fBestFit" class="d-tt1" />
+						<ul id="personSearch_fBestFit" class="d-tt1" />
 					</div>
 				</div>
 			</div>
@@ -66,9 +66,9 @@
 
 <script language="javascript">
 //<![CDATA[
-	document.getElementById ('personSearch1_sname').onkeyup =
-		personSearch1AltSurnameHandler;
-	document.getElementById ('personSearch1_fname').onkeyup =
-		personSearch1AltFirstnameHandler;
+	document.getElementById ('personSearch_sname').onkeyup =
+		personSearchAltSurnameHandler;
+	document.getElementById ('personSearch_fname').onkeyup =
+		personSearchAltFirstnameHandler;
 //]]>
 </script>
diff --git a/templates/personSelect.tpl.php b/templates/personAdmin/personSelect.tpl.php
similarity index 100%
rename from templates/personSelect.tpl.php
rename to templates/personAdmin/personSelect.tpl.php