diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index 1e15518d62..6c910b29f1 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -381,7 +381,7 @@ require_once "resources/require.php";
 			obj[0].parentNode.removeChild(obj[2]);
 		}
 
-	// checks for duplicate devices (mac addresses) in db
+
 		function check_mac_duplicate(mac_addr, device_uuid_to_ignore) {
 			if (mac_addr != '') {
 				check_url = "device_edit.php?mac="+mac_addr+"&id="+device_uuid_to_ignore;
@@ -392,7 +392,7 @@ require_once "resources/require.php";
 					}
 					else {
 						$('#device_mac_address').removeClass('formfld_highlight_bad');
-						$('#frm').submit();
+						document.getElementById('frm').submit();
 					}
 				});
 			}
diff --git a/themes/accessible/template.php b/themes/accessible/template.php
index ea57381529..469c39c6e4 100644
--- a/themes/accessible/template.php
+++ b/themes/accessible/template.php
@@ -405,7 +405,7 @@ table tr:last-child td:last-child {
 		z-index: 99999;
 		position: absolute;
 		left: 0px;
-		top: 0px;
+		top: -200px;
 		right: 0px;
 		filter: alpha(opacity=0);
 		opacity: 0;
@@ -472,26 +472,30 @@ function confirmdelete(url) {
 <script language="javascript" type="text/javascript" src="<?=PROJECT_PATH?>/resources/jquery/jquery-1.8.3.js"></script>
 
 <script language="JavaScript" type="text/javascript">
-	function display_message() {
-		$(document).ready(function() {
-			$("#message_container").animate({ opacity: 0.9 }, "fast").delay(1750).animate({marginTop: '-=200'}, 1000);
-		});
+	function display_message(msg) {
+		$("#message_text").html(msg);
+		$("#message_container").animate({top: '+=200'}, 0).animate({ opacity: 0.9 }, "fast").delay(1750).animate({top: '-=200'}, 1000).animate({opacity: 0});
 	}
 </script>
 
 </head>
-<body onload="display_message();">
 
-	<?php
-		if (strlen($_SESSION['message']) > 0) {
-			echo "<div id='message_container'>";
-			echo "	<div id='message_block'>";
-			echo "		<span class='text'>".$_SESSION['message']."</span>";
-			echo "	</div>";
-			echo "</div>";
-			unset($_SESSION['message']);
-		}
-	?>
+<?php
+// set message_onload
+if (strlen($_SESSION['message']) > 0) {
+	$message_text = addslashes($_SESSION['message']);
+	$onload .= "display_message('".$message_text."');";
+	unset($_SESSION['message']);
+}
+?>
+
+<body onload="<?php echo $onload;?>">
+
+	<div id='message_container'>
+		<div id='message_block'>
+			<span id='message_text' class='text'></span>
+		</div>
+	</div>
 
 	<?php
 		// qr code container for contacts
diff --git a/themes/classic/template.php b/themes/classic/template.php
index 8742a70910..46632d88c1 100644
--- a/themes/classic/template.php
+++ b/themes/classic/template.php
@@ -503,7 +503,7 @@ table tr:nth-last-child(-5) td:first-of-type {
 		z-index: 99999;
 		position: absolute;
 		left: 0px;
-		top: 0px;
+		top: -200px;
 		right: 0px;
 		filter: alpha(opacity=0);
 		opacity: 0;
@@ -570,26 +570,30 @@ function confirmdelete(url) {
 <script language="javascript" type="text/javascript" src="<?=PROJECT_PATH?>/resources/jquery/jquery-1.8.3.js"></script>
 
 <script language="JavaScript" type="text/javascript">
-	function display_message() {
-		$(document).ready(function() {
-			$("#message_container").animate({ opacity: 0.9 }, "fast").delay(1750).animate({marginTop: '-=200'}, 1000);
-		});
+	function display_message(msg) {
+		$("#message_text").html(msg);
+		$("#message_container").animate({top: '+=200'}, 0).animate({ opacity: 0.9 }, "fast").delay(1750).animate({top: '-=200'}, 1000).animate({opacity: 0});
 	}
 </script>
 
 </head>
-<body onload="display_message();">
 
-	<?php
-		if (strlen($_SESSION['message']) > 0) {
-			echo "<div id='message_container'>";
-			echo "	<div id='message_block'>";
-			echo "		<span class='text'>".$_SESSION['message']."</span>";
-			echo "	</div>";
-			echo "</div>";
-			unset($_SESSION['message']);
-		}
-	?>
+<?php
+// set message_onload
+if (strlen($_SESSION['message']) > 0) {
+	$message_text = addslashes($_SESSION['message']);
+	$onload .= "display_message('".$message_text."');";
+	unset($_SESSION['message']);
+}
+?>
+
+<body onload="<?php echo $onload;?>">
+
+	<div id='message_container'>
+		<div id='message_block'>
+			<span id='message_text' class='text'></span>
+		</div>
+	</div>
 
 	<?php
 		// qr code container for contacts
diff --git a/themes/default/template.php b/themes/default/template.php
index 7c0894ca31..ee32bb8f2c 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -560,40 +560,6 @@ table tr:nth-last-child(-5) td:first-of-type {
 	}
 /* end the menu css*/
 
-	#message_container {
-		z-index: 99999;
-		position: absolute;
-		left: 0px;
-		top: 0px;
-		right: 0px;
-		filter: alpha(opacity=0);
-		opacity: 0;
-		-moz-opacity:0;
-		-khtml-opacity: 0;
-	}
-
-	#message_block {
-		margin: 0px auto;
-		width: 300px;
-		height: auto;
-		background-color: #000;
-		background-repeat: repeat-x;
-		background-image: url('<?=PROJECT_PATH?>/themes/default/images/background_black.png');
-		background-position: top center;
-		padding: 10px;
-		-webkit-border-radius: 0px 0px 7px 7px;
-		-moz-border-radius: 0px 0px 7px 7px;
-		border-radius: 0px 0px 7px 7px;
-		text-align: center;
-	}
-
-	#message_block .text {
-		font-family: arial, san-serif;
-		font-size: 10pt;
-		font-weight: bold;
-		color: #fff;
-	}
-
 	DIV.login_message {
 		border: 1px solid #bae0ba;
 		background-color: #eeffee;
@@ -657,7 +623,7 @@ table tr:nth-last-child(-5) td:first-of-type {
 		z-index: 99999;
 		position: absolute;
 		left: 0px;
-		top: 0px;
+		top: -200px;
 		right: 0px;
 		filter: alpha(opacity=0);
 		opacity: 0;
@@ -671,7 +637,7 @@ table tr:nth-last-child(-5) td:first-of-type {
 		height: auto;
 		background-color: #000;
 		background-repeat: repeat-x;
-		background-image: url('<?=PROJECT_PATH?>/themes/accessible/images/background_black.png');
+		background-image: url('<?=PROJECT_PATH?>/themes/default/images/background_black.png');
 		background-position: top center;
 		padding: 10px;
 		-webkit-border-radius: 0px 0px 7px 7px;
@@ -715,26 +681,30 @@ function confirmdelete(url) {
 <script language="javascript" type="text/javascript" src="<?=PROJECT_PATH?>/resources/jquery/jquery-1.8.3.js"></script>
 
 <script language="JavaScript" type="text/javascript">
-	function display_message() {
-		$(document).ready(function() {
-			$("#message_container").animate({ opacity: 0.9 }, "fast").delay(1750).animate({marginTop: '-=200'}, 1000);
-		});
+	function display_message(msg) {
+		$("#message_text").html(msg);
+		$("#message_container").animate({top: '+=200'}, 0).animate({ opacity: 0.9 }, "fast").delay(1750).animate({top: '-=200'}, 1000).animate({opacity: 0});
 	}
 </script>
 
 </head>
-<body onload="display_message();">
 
-	<?php
-		if (strlen($_SESSION['message']) > 0) {
-			echo "<div id='message_container'>";
-			echo "	<div id='message_block'>";
-			echo "		<span class='text'>".$_SESSION['message']."</span>";
-			echo "	</div>";
-			echo "</div>";
-			unset($_SESSION['message']);
-		}
-	?>
+<?php
+// set message_onload
+if (strlen($_SESSION['message']) > 0) {
+	$message_text = addslashes($_SESSION['message']);
+	$onload .= "display_message('".$message_text."');";
+	unset($_SESSION['message']);
+}
+?>
+
+<body onload="<?php echo $onload;?>">
+
+	<div id='message_container'>
+		<div id='message_block'>
+			<span id='message_text' class='text'></span>
+		</div>
+	</div>
 
 	<?php
 	//get a random background image
