diff --git a/app/music_on_hold/music_on_hold_edit.php b/app/music_on_hold/music_on_hold_edit.php
index 0648498948..c7cfe6df93 100644
--- a/app/music_on_hold/music_on_hold_edit.php
+++ b/app/music_on_hold/music_on_hold_edit.php
@@ -17,186 +17,316 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2016
+	Portions created by the Initial Developer are Copyright (C) 2016
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-require_once "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists('music_on_hold_edit')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
+
+//includes
+	require_once "root.php";
+	require_once "resources/require.php";
+
+//check permissions
+	require_once "resources/check_auth.php";
+	if (permission_exists('music_on_hold_add') || permission_exists('music_on_hold_edit')) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
 
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
 
-//get current music on hold record, build array
-	$sql = "select * from v_music_on_hold ";
-	$sql .= "where music_on_hold_uuid = '".$_GET['id']."' ";
-	if (!permission_exists('music_on_hold_global_edit')) {
-		$sql .= "and domain_uuid = '".$domain_uuid."' ";
+//action add or update
+	if (isset($_REQUEST["id"])) {
+		$action = "update";
+		$music_on_hold_uuid = check_str($_REQUEST["id"]);
 	}
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$row = $prep_statement->fetch(PDO::FETCH_NAMED);
-	foreach ($row as $index => $value) {
-		$moh[str_replace('music_on_hold_','',$index)] = $value;
-		$moh['name_only'] = (substr_count($moh['name'], '/') > 0) ? substr($moh['name'], 0, strpos($moh['name'],'/')) : $moh['name'];
+	else {
+		$action = "add";
 	}
-	unset($sql, $prep_statement, $row);
-	//echo "<pre>".print_r($moh, true)."</pre>"; exit;
 
-if (is_array($_POST) && sizeof($_POST) > 0) {
-	//retrieve posted values
-		$moh = $_POST;
-
-	//check required fields
-		if (permission_exists('music_on_hold_name') && $moh['name'] == '') { $missing_fields[] = $text['label-name']; }
-		if (permission_exists('music_on_hold_path') && $moh['path'] == '') { $missing_fields[] = $text['label-path']; }
-		if (is_array($missing_fields) && sizeof($missing_fields > 0)) {
-			//set message
-				$_SESSION["message_mood"] = 'negative';
-				$_SESSION["message"] = $text['message-missing_required_fields'].': '.implode(', ', $missing_fields);
+//get http post variables and set them to php variables
+	if (count($_POST) > 0) {
+		if (permission_exists('music_on_hold_domain')) {
+			$domain_uuid = check_str($_POST["domain_uuid"]);
 		}
-		else {
-			//check strings
-				foreach ($_POST as $field => $value) {
-					$moh[$field] = check_str($value);
-				}
+		$music_on_hold_name = check_str($_POST["music_on_hold_name"]);
+		$music_on_hold_path = check_str($_POST["music_on_hold_path"]);
+		$music_on_hold_rate = check_str($_POST["music_on_hold_rate"]);
+		$music_on_hold_shuffle = check_str($_POST["music_on_hold_shuffle"]);
+		$music_on_hold_channels = check_str($_POST["music_on_hold_channels"]);
+		$music_on_hold_interval = check_str($_POST["music_on_hold_interval"]);
+		$music_on_hold_timer_name = check_str($_POST["music_on_hold_timer_name"]);
+		$music_on_hold_chime_list = check_str($_POST["music_on_hold_chime_list"]);
+		$music_on_hold_chime_freq = check_str($_POST["music_on_hold_chime_freq"]);
+		$music_on_hold_chime_max = check_str($_POST["music_on_hold_chime_max"]);
+	}
 
-			//update the moh record
-				$sql = "update v_music_on_hold set ";
-				if (permission_exists('music_on_hold_domain')) {
-					$sql .= "domain_uuid = ".(($moh['domain_uuid'] != '') ? "'".$moh['domain_uuid']."'" : 'null').", ";
-				}
-				if (permission_exists('music_on_hold_name')) {
-					$sql .= "music_on_hold_name = '".$moh['name']."', ";
-				}
-				if (permission_exists('music_on_hold_path')) {
-					$sql .= "music_on_hold_path = ".(($moh['path'] != '') ? "'".$moh['path']."'" : '$${sounds_dir}/music').", ";
-				}
-				$sql .= "music_on_hold_shuffle = '".$moh['shuffle']."', ";
-				$sql .= "music_on_hold_channels = ".$moh['channels'].", ";
-				$sql .= "music_on_hold_interval = ".(($moh['interval'] != '') ? $moh['interval'] : '20').", ";
-				$sql .= "music_on_hold_timer_name = 'soft', ";
-				$sql .= "music_on_hold_chime_list = '".$moh['chime_list']."', ";
-				$sql .= "music_on_hold_chime_freq = ".(($moh['chime_freq'] != '') ? $moh['chime_freq'] : 'null').", ";
-				$sql .= "music_on_hold_chime_max = ".(($moh['chime_max'] != '') ? $moh['chime_max'] : 'null')." ";
-				$sql .= "where music_on_hold_uuid = '".$moh['uuid']."' ";
-				if (!permission_exists('music_on_hold_domain')) {
-					$sql .= "and domain_uuid = '".$domain_uuid."' ";
-				}
-				//echo $sql."<br>"; exit;
-				$db->exec(check_sql($sql));
-				unset($sql);
+//add or update the data
+	if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 
-			//set message
-				$_SESSION["message"] = $text['message-update'];
+		//get the uuid
+			if ($action == "update") {
+				$music_on_hold_uuid = check_str($_POST["music_on_hold_uuid"]);
+			}
 
-			//redirect
-				header("Location: music_on_hold.php");
-				exit;
+		//check for all required data
+			$msg = '';
+			if (strlen($music_on_hold_name) == 0) { $msg .= $text['message-required']." ".$text['label-name']."<br>\n"; }
+			if (strlen($music_on_hold_path) == 0) { $msg .= $text['message-required']." ".$text['label-path']."<br>\n"; }
+			//if (strlen($music_on_hold_rate) == 0) { $msg .= $text['message-required']." ".$text['label-rate']."<br>\n"; }
+			if (strlen($music_on_hold_shuffle) == 0) { $msg .= $text['message-required']." ".$text['label-shuffle']."<br>\n"; }
+			if (strlen($music_on_hold_channels) == 0) { $msg .= $text['message-required']." ".$text['label-channels']."<br>\n"; }
+			//if (strlen($music_on_hold_interval) == 0) { $msg .= $text['message-required']." ".$text['label-interval']."<br>\n"; }
+			//if (strlen($music_on_hold_timer_name) == 0) { $msg .= $text['message-required']." ".$text['label-timer_name']."<br>\n"; }
+			//if (strlen($music_on_hold_chime_list) == 0) { $msg .= $text['message-required']." ".$text['label-chime_list']."<br>\n"; }
+			//if (strlen($music_on_hold_chime_freq) == 0) { $msg .= $text['message-required']." ".$text['label-chime_freq']."<br>\n"; }
+			//if (strlen($music_on_hold_chime_max) == 0) { $msg .= $text['message-required']." ".$text['label-chime_max']."<br>\n"; }
+			if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
+				require_once "resources/header.php";
+				require_once "resources/persist_form_var.php";
+				echo "<div align='center'>\n";
+				echo "<table><tr><td>\n";
+				echo $msg."<br />";
+				echo "</td></tr></table>\n";
+				persistformvar($_POST);
+				echo "</div>\n";
+				require_once "resources/footer.php";
+				return;
+			}
+
+		//add or update the database
+			if ($_POST["persistformvar"] != "true") {
+				if ($action == "add" && permission_exists('music_on_hold_add')) {
+					$sql = "insert into v_music_on_hold ";
+					$sql .= "(";
+					$sql .= "domain_uuid, ";
+					$sql .= "music_on_hold_uuid, ";
+					$sql .= "music_on_hold_name, ";
+					$sql .= "music_on_hold_path, ";
+					$sql .= "music_on_hold_rate, ";
+					$sql .= "music_on_hold_shuffle, ";
+					$sql .= "music_on_hold_channels, ";
+					$sql .= "music_on_hold_interval, ";
+					$sql .= "music_on_hold_timer_name, ";
+					$sql .= "music_on_hold_chime_list, ";
+					$sql .= "music_on_hold_chime_freq, ";
+					$sql .= "music_on_hold_chime_max ";
+					$sql .= ")";
+					$sql .= "values ";
+					$sql .= "(";
+					$sql .= "'".$_SESSION['domain_uuid']."', ";
+					$sql .= "'".uuid()."', ";
+					$sql .= "'$music_on_hold_name', ";
+					$sql .= "'$music_on_hold_path', ";
+					if (strlen($music_on_hold_rate) == 0) { $sql .= "null, "; } else { $sql .= "'$music_on_hold_rate', "; }
+					$sql .= "'$music_on_hold_shuffle', ";
+					if (strlen($music_on_hold_channels) == 0) { $sql .= "null, "; } else { $sql .= "'$music_on_hold_channels', "; }
+					if (strlen($music_on_hold_interval) == 0) { $sql .= "null, "; } else { $sql .= "'$music_on_hold_interval', "; }
+					$sql .= "'$music_on_hold_timer_name', ";
+					$sql .= "'$music_on_hold_chime_list', ";
+					if (strlen($music_on_hold_chime_freq) == 0) { $sql .= "null, "; } else { $sql .= "'$music_on_hold_chime_freq', "; }
+					if (strlen($music_on_hold_chime_max) == 0) { $sql .= "null "; } else { $sql .= "'$music_on_hold_chime_max' "; }
+					$sql .= ")";
+					$db->exec(check_sql($sql));
+					unset($sql);
+
+					$_SESSION["message"] = $text['message-add'];
+					header("Location: music_on_holds.php");
+					return;
+				} //if ($action == "add")
+
+				if ($action == "update" && permission_exists('music_on_hold_edit')) {
+					$sql = "update v_music_on_hold set ";
+					if (permission_exists('music_on_hold_domain')) {
+						if (strlen($domain_uuid) == 0) { $sql .= "domain_uuid = null, "; } else { $sql .= "domain_uuid = '$domain_uuid', "; }
+					}
+					$sql .= "music_on_hold_name = '$music_on_hold_name', ";
+					$sql .= "music_on_hold_path = '$music_on_hold_path', ";
+					if (strlen($music_on_hold_rate) == 0) { $sql .= "music_on_hold_rate = null, "; } else { $sql .= "music_on_hold_rate = '$music_on_hold_rate', "; }
+					$sql .= "music_on_hold_shuffle = '$music_on_hold_shuffle', ";
+					if (strlen($music_on_hold_channels) == 0) { $sql .= "music_on_hold_channels = null, "; } else { $sql .= "music_on_hold_channels = '$music_on_hold_channels', "; }
+					if (strlen($music_on_hold_interval) == 0) { $sql .= "music_on_hold_interval = null, "; } else { $sql .= "music_on_hold_interval = '$music_on_hold_interval', "; }
+					$sql .= "music_on_hold_timer_name = '$music_on_hold_timer_name', ";
+					$sql .= "music_on_hold_chime_list = '$music_on_hold_chime_list', ";
+					if (strlen($music_on_hold_chime_freq) == 0) { $sql .= "music_on_hold_chime_freq = null, "; } else { $sql .= "music_on_hold_chime_freq = '$music_on_hold_chime_freq', "; }
+					if (strlen($music_on_hold_chime_max) == 0) { $sql .= "music_on_hold_chime_max = null "; } else { $sql .= "music_on_hold_chime_max = '$music_on_hold_chime_max' "; }
+					$sql .= "where music_on_hold_uuid = '$music_on_hold_uuid' ";
+					$db->exec(check_sql($sql));
+					unset($sql);
+
+					$_SESSION["message"] = $text['message-update'];
+					header("Location: music_on_hold.php");
+					return;
+				} //if ($action == "update")
+			} //if ($_POST["persistformvar"] != "true")
+	} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
+
+//pre-populate the form
+	if (count($_GET) > 0 && $_POST["persistformvar"] != "true") {
+		$music_on_hold_uuid = check_str($_GET["id"]);
+		$sql = "select * from v_music_on_hold ";
+		$sql .= "where ( ";
+		$sql .= "	domain_uuid = '$domain_uuid' ";
+		$sql .= "	or domain_uuid is null ";
+		$sql .= ") ";
+		$sql .= "and music_on_hold_uuid = '$music_on_hold_uuid' ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+		foreach ($result as &$row) {
+			$domain_uuid = $row["domain_uuid"];
+			$music_on_hold_name = $row["music_on_hold_name"];
+			$music_on_hold_path = $row["music_on_hold_path"];
+			$music_on_hold_rate = $row["music_on_hold_rate"];
+			$music_on_hold_shuffle = $row["music_on_hold_shuffle"];
+			$music_on_hold_channels = $row["music_on_hold_channels"];
+			$music_on_hold_interval = $row["music_on_hold_interval"];
+			$music_on_hold_timer_name = $row["music_on_hold_timer_name"];
+			$music_on_hold_chime_list = $row["music_on_hold_chime_list"];
+			$music_on_hold_chime_freq = $row["music_on_hold_chime_freq"];
+			$music_on_hold_chime_max = $row["music_on_hold_chime_max"];
 		}
-}
+		unset ($prep_statement);
+	}
 
 //show the header
 	require_once "resources/header.php";
-	$document['title'] = $text['title-music_on_hold_settings'];
 
 //show the content
-	if (if_group("superadmin")) {
-		echo "<script>\n";
-		echo "var Objs;\n";
-		echo "\n";
-		echo "function changeToInput(obj){\n";
-		echo "	tb=document.createElement('INPUT');\n";
-		echo "	tb.type='text';\n";
-		echo "	tb.name=obj.name;\n";
-		echo "	tb.setAttribute('class', 'formfld');\n";
-		echo "	tb.setAttribute('style', 'width: 380px;');\n";
-		echo "	tb.value=obj.options[obj.selectedIndex].value;\n";
-		echo "	tbb=document.createElement('INPUT');\n";
-		echo "	tbb.setAttribute('class', 'btn');\n";
-		echo "	tbb.setAttribute('style', 'margin-left: 4px;');\n";
-		echo "	tbb.type='button';\n";
-		echo "	tbb.value=$('<div />').html('&#9665;').text();\n";
-		echo "	tbb.objs=[obj,tb,tbb];\n";
-		echo "	tbb.onclick=function(){ Replace(this.objs); }\n";
-		echo "	obj.parentNode.insertBefore(tb,obj);\n";
-		echo "	obj.parentNode.insertBefore(tbb,obj);\n";
-		echo "	obj.parentNode.removeChild(obj);\n";
-		echo "}\n";
-		echo "\n";
-		echo "function Replace(obj){\n";
-		echo "	obj[2].parentNode.insertBefore(obj[0],obj[2]);\n";
-		echo "	obj[0].parentNode.removeChild(obj[1]);\n";
-		echo "	obj[0].parentNode.removeChild(obj[2]);\n";
-		echo "}\n";
-		echo "</script>\n";
-		echo "\n";
-	}
-
-	echo "<form method='post' name='frm'>\n";
-	echo "<input type='hidden' name='uuid' value='".$moh['uuid']."'>\n";
-
-	echo "<div style='float: right;'>\n";
-	echo "	<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='music_on_hold.php'\" value='".$text['button-back']."'>";
-	echo "	<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
-	echo "</div>\n";
-	echo "<b>".$text['header-music_on_hold_settings'].": ".$moh['name_only']." (".($moh['rate']/1000).' kHz'.(($moh['rate'] == '48000') ? ' / '.$text['option-default'] : null).")</b>";
-	echo "<br /><br />\n\n";
-
-	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-
-	if (permission_exists('music_on_hold_name')) {
-		echo "<tr>\n";
-		echo "<td class='vncellreq' width='30%'>\n";
-		echo "	".$text['label-name']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left' width='70%'>\n";
-		echo "	<input class='formfld' type='text' name='name' value='".$moh['name']."'>\n";
-		echo "</td>\n";
-		echo "</tr>\n";
-	}
-
+	echo "<form name='frm' id='frm' method='post' action=''>\n";
+	echo "<table width='100%'  border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
-	echo "<td class='vncell' width='30%'>\n";
-	echo "	".$text['label-shuffle']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left' width='70%'>\n";
-	echo "	<select name='shuffle' class='formfld'>\n";
-	echo "		<option value='false' ".(($moh['shuffle'] == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
-	echo "		<option value='true' ".(($moh['shuffle'] == "true") ? "selected='selected'" : null).">".$text['label-true']."</option>\n";
-	echo "	</select>\n";
+	echo "<td align='left' width='30%' nowrap='nowrap' valign='top'><b>".$text['title-music_on_hold']."</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='music_on_hold.php'\" value='".$text['button-back']."'>";
+	echo "	<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
-	echo "<td class='vncell'>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-name']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='music_on_hold_name' maxlength='255' value=\"$music_on_hold_name\">\n";
+	echo "<br />\n";
+	echo $text['description-music_on_hold_name']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-path']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='music_on_hold_path' maxlength='255' value=\"$music_on_hold_path\">\n";
+	echo "<br />\n";
+	echo $text['description-music_on_hold_path']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-rate']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<select class='formfld' name='music_on_hold_rate'>\n";
+	echo "	<option value=''></option>\n";
+	if ($music_on_hold_rate == "8000") {
+		echo "	<option value='8000' selected='selected'>8000</option>\n";
+	}
+	else {
+		echo "	<option value='8000'>8000</option>\n";
+	}
+	if ($music_on_hold_rate == "16000") {
+		echo "	<option value='16000' selected='selected'>16000</option>\n";
+	}
+	else {
+		echo "	<option value='16000'>16000</option>\n";
+	}
+	if ($music_on_hold_rate == "32000") {
+		echo "	<option value='32000' selected='selected'>32000</option>\n";
+	}
+	else {
+		echo "	<option value='32000'>32000</option>\n";
+	}
+	if ($music_on_hold_rate == "48000") {
+		echo "	<option value='48000' selected='selected'>48000</option>\n";
+	}
+	else {
+		echo "	<option value='48000'>48000</option>\n";
+	}
+	echo "	</select>\n";
+	echo "<br />\n";
+	echo $text['description-music_on_hold_rate']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-shuffle']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<select class='formfld' name='music_on_hold_shuffle'>\n";
+	echo "	<option value=''></option>\n";
+	if ($music_on_hold_shuffle == "true") {
+		echo "	<option value='true' selected='selected'>".$text['label-true']."</option>\n";
+	}
+	else {
+		echo "	<option value='true'>".$text['label-true']."</option>\n";
+	}
+	if ($music_on_hold_shuffle == "false") {
+		echo "	<option value='false' selected='selected'>".$text['label-false']."</option>\n";
+	}
+	else {
+		echo "	<option value='false'>".$text['label-false']."</option>\n";
+	}
+	echo "	</select>\n";
+	echo "<br />\n";
+	echo $text['description-music_on_hold_shuffle']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-channels']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "	<select name='channels' class='formfld'>\n";
-	echo "		<option value='1'>".$text['label-mono']."</option>\n";
-	echo "		<option value='2' ".(($moh['channels'] == '2') ? 'selected' : null).">".$text['label-stereo']."</option>\n";
+	echo "	<select name='music_on_hold_channels' class='formfld'>\n";
+	echo "		<option value='1' ".(($music_on_hold_channels == '2') ? 'selected' : null).">".$text['label-mono']."</option>\n";
+	echo "		<option value='2' ".(($music_on_hold_channels == '2') ? 'selected' : null).">".$text['label-stereo']."</option>\n";
 	echo "	</select>\n";
+	echo "<br />\n";
+	echo $text['description-music_on_hold_channels']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
-	echo "<td class='vncell'>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-interval']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='interval' maxlength='4' style='max-width: 50px;' value='".$moh['interval']."'>\n";
+	echo "  <input class='formfld' type='text' name='music_on_hold_interval' maxlength='255' value='$music_on_hold_interval'>\n";
+	echo "<br />\n";
+	echo $text['description-music_on_hold_interval']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-timer_name']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='music_on_hold_timer_name' maxlength='255' value=\"$music_on_hold_timer_name\">\n";
+	echo "<br />\n";
+	echo $text['description-music_on_hold_timer_name']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
@@ -301,62 +431,63 @@ if (is_array($_POST) && sizeof($_POST) > 0) {
 	echo "</tr>\n";
 
 	echo "<tr>\n";
-	echo "<td class='vncell'>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-chime_frequency']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='chime_freq' maxlength='4' style='max-width: 50px;' value='".$moh['chime_freq']."'>\n";
+	echo "	<input class='formfld' type='text' name='music_on_hold_chime_freq' maxlength='255' value=\"$music_on_hold_chime_freq\">\n";
+	echo "<br />\n";
+	echo $text['description-music_on_hold_chime_freq']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
-	echo "<td class='vncell'>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-chime_maximum']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='chime_max' maxlength='4' style='max-width: 50px;' value='".$moh['chime_max']."'>\n";
+	echo "	<input class='formfld' type='text' name='music_on_hold_chime_max' maxlength='255' value=\"$music_on_hold_chime_max\">\n";
+	echo "<br />\n";
+	echo $text['description-music_on_hold_chime_max']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	if (permission_exists('music_on_hold_domain')) {
-		echo "	<tr>\n";
-		echo "		<td class='vncell' valign='top' nowrap='nowrap'>\n";
-		echo "			".$text['label-domain']."\n";
-		echo "		</td>\n";
-		echo "		<td class='vtable' align='left'>\n";
-		echo "			<select name='domain_uuid' class='formfld'>\n";
-		if (permission_exists('music_on_hold_global_view') && permission_exists('music_on_hold_global_add')) {
-			echo "			<option value=''>".$text['label-global']."</option>\n";
-		}
-		foreach ($_SESSION['domains'] as $row) {
-			echo "    		<option value='".$row['domain_uuid']."' ".(($row['domain_uuid'] == $moh['domain_uuid']) ? "selected='selected'" : null).">".$row['domain_name']."</option>\n";
-		}
-		echo "    		</select>\n";
-		echo "		</td>\n";
-		echo "	</tr>\n";
-	}
-
-	if (permission_exists('music_on_hold_path')) {
 		echo "<tr>\n";
-		echo "<td class='vncellreq' width='30%'>\n";
-		echo "	".$text['label-path']."\n";
+		echo "<td class='vncell' valign='top' nowrap='nowrap'>\n";
+		echo "	".$text['label-domain']."\n";
 		echo "</td>\n";
-		echo "<td class='vtable' align='left' width='70%'>\n";
-		echo "	<input class='formfld' type='text' name='path' value='".$moh['path']."'>\n";
+		echo "<td class='vtable'>\n";
+		echo "	<select name='domain_uuid' class='formfld'>\n";
+		echo "		<option value=''></option>\n";
+		foreach ($_SESSION['domains'] as $row) {
+			if ($row['domain_uuid'] == $domain_uuid) {
+				echo "		<option value='".$row['domain_uuid']."' selected='selected'>".$row['domain_name']."</option>\n";
+			}
+			else {
+				echo "		<option value='".$row['domain_uuid']."'>".$row['domain_name']."</option>\n";
+			}
+		}
+		echo "	</select>\n";
+
+		echo "    </select>\n";
 		echo "</td>\n";
 		echo "</tr>\n";
 	}
 
+	echo "	<tr>\n";
+	echo "		<td colspan='2' align='right'>\n";
+	if ($action == "update") {
+		echo "				<input type='hidden' name='music_on_hold_uuid' value='$music_on_hold_uuid'>\n";
+	}
+	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "		</td>\n";
+	echo "	</tr>";
 	echo "</table>";
-	echo "<br>";
-
-	echo "<div style='float: right;'>\n";
-	echo "<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
-	echo "</div>\n";
-	echo "<br><br>";
-
 	echo "</form>";
+	echo "<br /><br />";
 
 //include the footer
 	require_once "resources/footer.php";
+
 ?>