diff --git a/xCAT-UI/js/nodes/nodes.js b/xCAT-UI/js/nodes/nodes.js
index 649b771aa..2395ffef9 100644
--- a/xCAT-UI/js/nodes/nodes.js
+++ b/xCAT-UI/js/nodes/nodes.js
@@ -1025,7 +1025,13 @@ function loadUnlockPage(tgtNodes) {
 		position: "center right",
 		offset: [-2, 10],
 		effect: "fade",
-		opacity: 0.7
+		opacity: 0.7,
+		events : {
+			def : "mouseover,mouseout",
+			input : "mouseover,mouseout",
+			widget : "focus mouseover,blur mouseout",
+			tooltip : "mouseover,mouseout"
+		}
 	});
 	
 	/**
@@ -1036,11 +1042,9 @@ function loadUnlockPage(tgtNodes) {
 		// Remove any warning messages
 		$(this).parent().parent().find('.ui-state-error').remove();
 		
-		// If form is complete
-		var ready = formComplete(newTabId);
-		if (ready) {
-			var password = $('#' + newTabId + ' input[name=password]').val();
-
+		// If a password is given
+		var password = $('#' + newTabId + ' input[name=password]').css('border', 'solid #BDBDBD 1px');
+		if (password.val()) {
 			// Setup SSH keys
     		$.ajax( {
     			url : 'lib/cmd.php',
@@ -1048,7 +1052,7 @@ function loadUnlockPage(tgtNodes) {
     			data : {
     				cmd : 'webrun',
     				tgt : '',
-    				args : 'unlock;' + tgtNodes + ';' + password,
+    				args : 'unlock;' + tgtNodes + ';' + password.val(),
     				msg : 'out=' + statBarId + ';cmd=unlock;tgt=' + tgtNodes
     			},
     
@@ -1064,6 +1068,7 @@ function loadUnlockPage(tgtNodes) {
     		// Show warning message
 			var warn = createWarnBar('You are missing some values!');
 			warn.prependTo($(this).parent().parent());
+			password.css('border', 'solid #FF0000 1px');
     	}
     });
 
@@ -1129,7 +1134,13 @@ function loadScriptPage(tgtNodes) {
 		position: "center right",
 		offset: [-2, 10],
 		effect: "fade",
-		opacity: 0.7
+		opacity: 0.7,
+		events : {
+			def : "mouseover,mouseout",
+			input : "mouseover,mouseout",
+			widget : "focus mouseover,blur mouseout",
+			tooltip : "mouseover,mouseout"
+		}
 	});
 
 	// Script
@@ -1151,27 +1162,18 @@ function loadScriptPage(tgtNodes) {
 		// Remove any warning messages
 		$(this).parent().parent().find('.ui-state-error').remove();
 		
-		var ready = true;
-
-		// Check script
-		var textarea = $('#' + newTabId + ' textarea');
-		for (var i in textarea) {
-			if (!textarea.eq(i).val()) {
-				textarea.eq(i).css('border', 'solid #FF0000 1px');
-				ready = false;
-			} else {
-				textarea.eq(i).css('border', 'solid #424242 1px');
-			}
-		}
-
+		// Get script to run
+		var textarea = $('#' + newTabId + ' textarea').css('border', 'solid #BDBDBD 1px');
+		
 		// If no inputs are empty
-		if (ready) {
+		if (textarea.val()) {
 			// Run script
 			runScript(inst);
 		} else {
 			// Show warning message
 			var warn = createWarnBar('You are missing some values');
 			warn.prependTo($(this).parent().parent());
+			textarea.css('border', 'solid #FF0000 1px');
 		}
 	});
 	scriptForm.append(runBtn);
@@ -1401,33 +1403,6 @@ function updateStatusBar(data) {
 	}
 }
 
-/**
- * Check if the form is complete
- * 
- * @param tabId
- *            Tab ID containing form
- * @return True: If the form is complete, False: Otherwise
- */
-function formComplete(tabId) {
-	var ready = true;
-
-	// Check all inputs within the form
-	var inputs = $('#' + tabId + ' input');
-	for (var i in inputs) {
-		// If there is no value given in the input
-		if (!inputs.eq(i).val()) {
-			inputs.eq(i).css('border', 'solid #FF0000 1px');
-			
-			// It is not complete
-			ready = false;
-		} else {
-			inputs.eq(i).css('border', 'solid #BDBDBD 1px');
-		}
-	}
-
-	return ready;
-}
-
 /**
  * Update power status of a node in the datatable
  * 
diff --git a/xCAT-UI/js/nodes/rnetboot.js b/xCAT-UI/js/nodes/rnetboot.js
index efa336507..6bfd536e8 100644
--- a/xCAT-UI/js/nodes/rnetboot.js
+++ b/xCAT-UI/js/nodes/rnetboot.js
@@ -187,7 +187,7 @@ function loadNetbootPage(tgtNodes) {
 	netbootForm.append(okBtn);
 
 	// Append to discover tab
-	tab.add(newTabId, 'Netboot', netbootForm, true);
+	tab.add(newTabId, 'Boot', netbootForm, true);
 
 	// Select new tab
 	tab.select(newTabId);
diff --git a/xCAT-UI/js/nodes/updatenode.js b/xCAT-UI/js/nodes/updatenode.js
index b6d7735ef..1839628e3 100644
--- a/xCAT-UI/js/nodes/updatenode.js
+++ b/xCAT-UI/js/nodes/updatenode.js
@@ -317,7 +317,7 @@ function loadUpdatenodePage(tgtNodes) {
 	updatenodeForm.append(okBtn);
 
 	// Append to discover tab
-	tab.add(newTabId, 'Updatenode', updatenodeForm, true);
+	tab.add(newTabId, 'Update', updatenodeForm, true);
 
 	// Select new tab
 	tab.select(newTabId);