diff --git a/mactrack_macauth.php b/mactrack_macauth.php
index 69a0b0e..700b7f9 100644
--- a/mactrack_macauth.php
+++ b/mactrack_macauth.php
@@ -149,7 +149,7 @@ function form_actions() {
 			<input type='hidden' name='action' value='actions'>
 			<input type='hidden' name='selected_items' value='" . (isset($maca_array) ? serialize($maca_array) : '') . "'>
 			<input type='hidden' name='drp_action' value='" . get_request_var('drp_action') . "'>" . ($save_html != '' ? "
-			<button type='button' class='ui-button ui-corner-all ui-widget' onClick='cactiReturnTo()'>" . __esc('Cancel', 'mactrack') . "'></button>
+			<button type='button' class='ui-button ui-corner-all ui-widget' onClick='cactiReturnTo()'>" . __esc('Cancel', 'mactrack') . "</button>
 			$save_html" : "<button type='button' class='ui-button ui-corner-all ui-widget' onClick='cactiReturnTo()'>" . __esc('Return', 'mactrack') . "</button>") . "
 		</td>
 	</tr>";
diff --git a/mactrack_snmp.php b/mactrack_snmp.php
index 16d025f..7cc7f2c 100644
--- a/mactrack_snmp.php
+++ b/mactrack_snmp.php
@@ -247,7 +247,7 @@ function goTo(strURL) {
 		print "<tr><td class='even'><span class='textError'>" . __('You must select at least one SNMP Option.', 'mactrack') . "</span></td></tr>\n";
 		$save_html = "";
 	} else {
-		$save_html = "<button type='submit' name='save' class='ui-button ui-corner-all ui-widget ui-state-active'>" . __esc('Continue', 'mactrack') . "'></button>";
+		$save_html = "<button type='submit' name='save' class='ui-button ui-corner-all ui-widget ui-state-active'>" . __esc('Continue', 'mactrack') . "</button>";
 
 		if (get_nfilter_request_var("drp_action") == '1') { /* delete */
 			print "<tr>
@@ -271,7 +271,7 @@ function goTo(strURL) {
 		<td align='right' class='saveRow'>
 			<input type='hidden' name='action' value='actions'>
 			<input type='hidden' name='selected_items' value='" . (isset($mactrack_array) ? serialize($mactrack_array) : '') . "'>
-			<input type='hidden' name='drp_action' class='ui-button ui-corner-all ui-widget'>" . get_nfilter_request_var("drp_action") . "'>
+			<input type='hidden' name='drp_action' class='ui-button ui-corner-all ui-widget' value='" . get_nfilter_request_var("drp_action") . "'>
 			<button type='button' class='ui-button ui-corner-all ui-widget' onClick='goTo(\"" . "mactrack_snmp.php" . "\")'>" . ($save_html == '' ? __esc('Return', 'mactrack'):__esc('Cancel', 'mactrack')) . "</button>
 			$save_html
 		</td>
diff --git a/mactrack_view_devices.php b/mactrack_view_devices.php
index 66e9d29..125487e 100644
--- a/mactrack_view_devices.php
+++ b/mactrack_view_devices.php
@@ -27,7 +27,7 @@
 include('./include/auth.php');
 include_once('./plugins/mactrack/lib/mactrack_functions.php');
 
-$title = __('Mactrack - Device Report View', 'macktrack');
+$title = __('Mactrack - Device Report View', 'mactrack');
 
 if (isset_request_var('export')) {
 	mactrack_view_export_devices();
diff --git a/mactrack_view_macs.php b/mactrack_view_macs.php
index 1f0d7fd..94bed22 100644
--- a/mactrack_view_macs.php
+++ b/mactrack_view_macs.php
@@ -282,7 +282,7 @@ function form_aggregated_actions() {
 			<input type='hidden' name='action' value='actions'>
 			<input type='hidden' name='selected_items' value='" . (isset($row_array) ? serialize($row_array) : '') . "'>
 			<input type='hidden' name='drp_action' value='" . get_request_var('drp_action') . "'>" . ($save_html != '' ? "
-			<button type='button' onClick='cactiReturnTo()' class='ui-button ui-corner-all ui-widget'>" . __esc('Cancel', 'macktrack') . "</button>
+			<button type='button' onClick='cactiReturnTo()' class='ui-button ui-corner-all ui-widget'>" . __esc('Cancel', 'mactrack') . "</button>
 			$save_html" : "<button type='button' onClick='cactiReturnTo()' class='ui-button ui-corner-all ui-widget'>" . __esc('Return', 'mactrack') . '</button>') . "
 		</td>
 	</tr>";