diff --git a/app/number_translations/number_translation_edit.php b/app/number_translations/number_translation_edit.php
index c8ba51e7ef..6748511585 100644
--- a/app/number_translations/number_translation_edit.php
+++ b/app/number_translations/number_translation_edit.php
@@ -24,9 +24,9 @@
 //includes
 	require_once "root.php";
 	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
 
 //check permissions
-	require_once "resources/check_auth.php";
 	if (permission_exists('number_translation_add') || permission_exists('number_translation_edit')) {
 		//access granted
 	}
@@ -43,6 +43,7 @@
 	if (is_uuid($_REQUEST["id"])) {
 		$action = "update";
 		$number_translation_uuid = $_REQUEST["id"];
+		$id = $_REQUEST["id"];
 	}
 	else {
 		$action = "add";
@@ -60,10 +61,6 @@
 //process the user data and save it to the database
 	if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 
-		//get the uuid from the POST
-			if ($action == "update") {
-				$number_translation_uuid = $_POST["number_translation_uuid"];
-			}
 
 		//validate the token
 			$token = new token;
@@ -77,6 +74,7 @@
 			$msg = '';
 			if (strlen($number_translation_name) == 0) { $msg .= $text['message-required']." ".$text['label-number_translation_name']."<br>\n"; }
 			//if (strlen($number_translation_details) == 0) { $msg .= $text['message-required']." ".$text['label-number_translation_details']."<br>\n"; }
+			//if (strlen($domain_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-domain_uuid']."<br>\n"; }
 			if (strlen($number_translation_enabled) == 0) { $msg .= $text['message-required']." ".$text['label-number_translation_enabled']."<br>\n"; }
 			//if (strlen($number_translation_description) == 0) { $msg .= $text['message-required']." ".$text['label-number_translation_description']."<br>\n"; }
 			if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
@@ -92,41 +90,33 @@
 				return;
 			}
 
-		//cleanup the array
-			$x = 0;
-			foreach ($_POST["number_translation_details"] as $row) {
-				//unset the empty row
-					if (strlen($_POST["number_translation_details"][$x]["number_translation_detail_regex"]) == 0) {
-						unset($_POST["number_translation_details"][$x]);
-					}
-					if (strlen($_POST["number_translation_details"][$x]["number_translation_detail_replace"]) == 0) {
-						unset($_POST["number_translation_details"][$x]);
-					}
-					if (strlen($_POST["number_translation_details"][$x]["number_translation_detail_order"]) == 0) {
-						unset($_POST["number_translation_details"][$x]);
-					}
-				//increment the row
-					$x++;
-			}
-
 		//add the number_translation_uuid
 			if (!is_uuid($_POST["number_translation_uuid"])) {
 				$number_translation_uuid = uuid();
-				$_POST["number_translation_uuid"] = $number_translation_uuid;
 			}
 
 		//prepare the array
-			$array['number_translations'][0] = $_POST;
+			$array['number_translations'][0]["number_translation_uuid"] = $number_translation_uuid;
+			$array['number_translations'][0]["number_translation_name"] = $number_translation_name;
+			$array['number_translations'][0]["domain_uuid"] = $domain_uuid;
+			$array['number_translations'][0]["number_translation_enabled"] = $number_translation_enabled;
+			$array['number_translations'][0]["number_translation_description"] = $number_translation_description;
+			$y = 0;
+			foreach ($number_translation_details as $row) {
+				if (strlen($row['number_translation_detail_regex']) > 0) {
+					$array['number_translations'][0]['number_translation_details'][$y]["number_translation_detail_uuid"] = $row["number_translation_detail_uuid"];
+					$array['number_translations'][0]['number_translation_details'][$y]["number_translation_detail_regex"] = $row["number_translation_detail_regex"];
+					$array['number_translations'][0]['number_translation_details'][$y]["number_translation_detail_replace"] = $row["number_translation_detail_replace"];
+					$array['number_translations'][0]['number_translation_details'][$y]["number_translation_detail_order"] = $row["number_translation_detail_order"];
+					$y++;
+				}
+			}
 
 		//save to the data
 			$database = new database;
-			$database->app_name = 'number_translations';
+			$database->app_name = 'Number Translations';
 			$database->app_uuid = '6ad54de6-4909-11e7-a919-92ebcb67fe33';
-			if (is_uuid($number_translation_uuid)) {
-				$database->uuid($number_translation_uuid);
-			}
 			$database->save($array);
-			$message = $database->message;
 
 		//redirect the user
 			if (isset($action)) {
@@ -136,50 +126,50 @@
 				if ($action == "update") {
 					$_SESSION["message"] = $text['message-update'];
 				}
-				header('Location: number_translation_edit.php?id='.escape($number_translation_uuid));
+				header('Location: number_translation_edit.php?id='.urlencode($number_translation_uuid));
 				return;
 			}
-	}
+	} //(is_array($_POST) && strlen($_POST["persistformvar"]) == 0)
 
 //pre-populate the form
 	if (is_array($_GET) && $_POST["persistformvar"] != "true") {
 		$number_translation_uuid = $_GET["id"];
 		$sql = "select * from v_number_translations ";
 		$sql .= "where number_translation_uuid = :number_translation_uuid ";
+		//$sql .= "and domain_uuid = :domain_uuid ";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['number_translation_uuid'] = $number_translation_uuid;
 		$database = new database;
-		$row = $database->select($sql, $parameters, 'row');
-		if (is_array($row) && @sizeof($row) != 0) {
+		$result = $database->execute($sql, $parameters, 'all');
+		foreach ($result as &$row) {
 			$number_translation_name = $row["number_translation_name"];
 			$number_translation_details = $row["number_translation_details"];
 			$number_translation_enabled = $row["number_translation_enabled"];
 			$number_translation_description = $row["number_translation_description"];
 		}
-		unset($sql, $parameters, $row);
+		unset ($sql, $parameters);
 	}
 
 //get the child data
 	if (is_uuid($number_translation_uuid)) {
 		$sql = "select * from v_number_translation_details ";
 		$sql .= "where number_translation_uuid = :number_translation_uuid ";
+		//$sql .= "and domain_uuid = '".$domain_uuid."' ";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['number_translation_uuid'] = $number_translation_uuid;
 		$database = new database;
-		$number_translation_details = $database->select($sql, $parameters, 'all');
+		$number_translation_details = $database->execute($sql, $parameters, 'all');
+		unset ($sql, $parameters);
 	}
 
-//add the $number_translation_uuid
-	if (!is_uuid($number_translation_uuid)) {
-		$number_translation_uuid = uuid();
+//add the $number_translation_detail_uuid
+	if (!is_uuid($number_translation_detail_uuid)) {
+		$number_translation_detail_uuid = uuid();
 	}
 
 //add an empty row
-	if (is_array($number_translation_details)) {
-		$x = count($number_translation_details);
-	}
-	else {
-		$number_translation_details = [];
-		$x = 0;
-	}
+	$x = count($number_translation_details);
+	$number_translation_details[$x]['domain_uuid'] = $_SESSION['domain_uuid'];
 	$number_translation_details[$x]['number_translation_uuid'] = $number_translation_uuid;
 	$number_translation_details[$x]['number_translation_detail_uuid'] = uuid();
 	$number_translation_details[$x]['number_translation_detail_regex'] = '';
@@ -201,16 +191,22 @@
 	echo "<td align='left' width='30%' nowrap='nowrap' valign='top'><b>".$text['title-number_translation']."</b><br><br></td>\n";
 	echo "<td width='70%' align='right' valign='top'>\n";
 	echo "	<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='number_translations.php'\" value='".$text['button-back']."'>";
+	echo "	<input type='button' class='btn' name='' alt='".$text['button-copy']."' onclick=\"window.location='number_translation_copy.php'\" value='".$text['button-copy']."'>";
 	echo "	<input type='submit' class='btn' value='".$text['button-save']."'>";
 	echo "</td>\n";
 	echo "</tr>\n";
+	echo "<tr>\n";
+	echo "<td colspan='2'>\n";
+	echo "	".$text['description-number_translations']."<br /><br />\n";
+	echo "</td>\n";
+	echo "</tr>\n";
 
 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-number_translation_name']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' style='position: relative;' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='number_translation_name' maxlength='255' value=\"".escape($number_translation_name)."\">\n";
+	echo "	<input class='formfld' type='text' name='number_translation_name' maxlength='255' value='".escape($number_translation_name)."'>\n";
 	echo "<br />\n";
 	echo $text['description-number_translation_name']."\n";
 	echo "</td>\n";
@@ -221,47 +217,88 @@
 	echo "	".$text['label-number_translation_details']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' style='position: relative;' align='left'>\n";
-	echo "			<table>\n";
-	echo "				<tr>\n";
-	echo "					<td class='vtable'>".$text['label-number_translation_detail_regex']."</td>\n";
-	echo "					<td class='vtable'>".$text['label-number_translation_detail_replace']."</td>\n";
-	echo "					<td class='vtable'>".$text['label-number_translation_detail_order']."</td>\n";
-	echo "					<td class='vtable'></td>\n";
-	echo "				</tr>\n";
+	echo "	<table>\n";
+	echo "		<tr>\n";
+	echo "			<th class='vtablereq'>".$text['label-number_translation_detail_regex']."</th>\n";
+	echo "			<th class='vtablereq'>".$text['label-number_translation_detail_replace']."</th>\n";
+	echo "			<th class='vtablereq'>".$text['label-number_translation_detail_order']."</th>\n";
+	echo "			<td class='vtable'></td>\n";
+	echo "		</tr>\n";
 	$x = 0;
 	foreach($number_translation_details as $row) {
-		echo "			<tr>\n";
-		echo "				<input type='hidden' name='number_translation_details[$x][number_translation_uuid]' value=\"".escape($row["number_translation_uuid"])."\">\n";
-		echo "				<input type='hidden' name='number_translation_details[$x][number_translation_detail_uuid]' value=\"".escape($row["number_translation_detail_uuid"])."\">\n";
-		echo "				<td>\n";
-		echo "					<input class='formfld' type='text' name='number_translation_details[$x][number_translation_detail_regex]' maxlength='255' value=\"".escape($row["number_translation_detail_regex"])."\">\n";
-		echo "				</td>\n";
-		echo "				<td>\n";
-		echo "					<input class='formfld' type='text' name='number_translation_details[$x][number_translation_detail_replace]' maxlength='255' value=\"".escape($row["number_translation_detail_replace"])."\">\n";
-		echo "				</td>\n";
-		echo "				<td>\n";
-		echo "					<input class='formfld' type='text' name='number_translation_details[$x][number_translation_detail_order]' maxlength='255' value=\"".escape($row["number_translation_detail_order"])."\">\n";
-		echo "				</td>\n";
-		echo "				<td class='list_control_icons' style='width: 25px;'>\n";
-		if ($x+1 != @sizeof($number_translation_details)) {
-			echo "				<a href=\"number_translation_delete.php?number_translation_detail_uuid=".escape($row["number_translation_detail_uuid"])."\" alt='delete' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
+		echo "		<tr>\n";
+		echo "			<input type='hidden' name='number_translation_details[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
+		echo "			<input type='hidden' name='number_translation_details[$x][number_translation_uuid]' value=\"".escape($row["number_translation_uuid"])."\">\n";
+		echo "			<input type='hidden' name='number_translation_details[$x][number_translation_detail_uuid]' value=\"".escape($row["number_translation_detail_uuid"])."\">\n";
+		echo "			<td>\n";
+		echo "				<input class='formfld' type='text' name='number_translation_details[$x][number_translation_detail_regex]' maxlength='255' value=\"".escape($row["number_translation_detail_regex"])."\">\n";
+		echo "			</td>\n";
+		echo "			<td>\n";
+		echo "				<input class='formfld' type='text' name='number_translation_details[$x][number_translation_detail_replace]' maxlength='255' value=\"".escape($row["number_translation_detail_replace"])."\">\n";
+		echo "			</td>\n";
+		echo "			<td>\n";
+		echo "				<select name='number_translation_details[$x][number_translation_detail_order]' class='formfld'>\n";
+		$i=0;
+		while ($i<=999) {
+			$selected = ($i == $row["number_translation_detail_order"]) ? "selected" : null;
+			if (strlen($i) == 1) {
+				echo "					<option value='00$i' ".$selected.">00$i</option>\n";
+			}
+			if (strlen($i) == 2) {
+				echo "					<option value='0$i' ".$selected.">0$i</option>\n";
+			}
+			if (strlen($i) == 3) {
+				echo "					<option value='$i' ".$selected.">$i</option>\n";
+			}
+			$i++;
 		}
-		echo "				</td>\n";
-		echo "			</tr>\n";
+		echo "				</select>\n";
+		echo "			</td>\n";
+		echo "			<td class='list_control_icons' style='width: 25px;'>\n";
+		echo "				<a href=\"number_translation_delete.php?number_translation_detail_uuid=".escape($row['number_translation_detail_uuid'])."&amp;a=delete\" alt='delete' onclick=\"return confirm('Do you really want to delete this?')\"><button type='button' class='btn btn-default list_control_icon'><span class='glyphicon glyphicon-remove'></span></button></a>\n";
+		echo "			</td>\n";
+		echo "		</tr>\n";
 		$x++;
 	}
-	echo "			</table>\n";
+	echo "	</table>\n";
 	echo "<br />\n";
 	echo $text['description-number_translation_detail_order']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-domain_uuid']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<select class='formfld' name='domain_uuid'>\n";
+	if (strlen($domain_uuid) == 0) {
+		echo "		<option value='' selected='selected'>".$text['select-global']."</option>\n";
+	}
+	else {
+		echo "		<option value=''>".$text['label-global']."</option>\n";
+	}
+	foreach ($_SESSION['domains'] as $row) {
+		if ($row['domain_uuid'] == $domain_uuid) {
+			echo "		<option value='".$row['domain_uuid']."' selected='selected'>".escape($row['domain_name'])."</option>\n";
+		}
+		else {
+			echo "		<option value='".$row['domain_uuid']."'>".$row['domain_name']."</option>\n";
+		}
+	}
+	echo "	</select>\n";
+	echo "<br />\n";
+	echo $text['description-domain_uuid']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-number_translation_enabled']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' style='position: relative;' align='left'>\n";
 	echo "	<select class='formfld' name='number_translation_enabled'>\n";
+	echo "		<option value=''></option>\n";
 	if ($number_translation_enabled == "true") {
 		echo "		<option value='true' selected='selected'>".$text['label-true']."</option>\n";
 	}
@@ -285,7 +322,7 @@
 	echo "	".$text['label-number_translation_description']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' style='position: relative;' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='number_translation_description' maxlength='255' value=\"".escape($number_translation_description)."\">\n";
+	echo "	<input class='formfld' type='text' name='number_translation_description' maxlength='255' value='".escape($number_translation_description)."'>\n";
 	echo "<br />\n";
 	echo $text['description-number_translation_description']."\n";
 	echo "</td>\n";
@@ -293,9 +330,9 @@
 
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
-	echo "			<input type='hidden' name='number_translation_uuid' value='".escape($number_translation_uuid)."'>\n";
-	echo "			<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
-	echo "			<input type='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "				<input type='hidden' name='number_translation_uuid' value='".escape($number_translation_uuid)."'>\n";
+	echo "				<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
+	echo "				<input type='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";