diff --git a/src/main/webapp/WEB-INF/views/admin.jsp b/src/main/webapp/WEB-INF/views/admin.jsp
index 95e96a4..e1201ab 100644
--- a/src/main/webapp/WEB-INF/views/admin.jsp
+++ b/src/main/webapp/WEB-INF/views/admin.jsp
@@ -16,7 +16,7 @@
 <title>HA Flow Administration</title>
 <link rel="stylesheet" href="<%=basePath%>/style/site.css">
 <body>
-	<h1>HA Flow Administration</h1>
+	<h1>Haflow Administration</h1>
 	<h2>Module List</h2>
 	<table>
 		<tr>
diff --git a/src/main/webapp/WEB-INF/views/main.jsp b/src/main/webapp/WEB-INF/views/main.jsp
index f2d8a31..f138152 100644
--- a/src/main/webapp/WEB-INF/views/main.jsp
+++ b/src/main/webapp/WEB-INF/views/main.jsp
@@ -10,7 +10,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>HA Flow</title>
+<title>Haflow - a big data analysis service platform!</title>
 <link rel="stylesheet"
 	href="http://ajax.googleapis.com/ajax/libs/dojo/1.9.0/dijit/themes/claro/claro.css">
 <link rel="stylesheet"
diff --git a/src/main/webapp/script/haflow.main.js b/src/main/webapp/script/haflow.main.js
index c829928..b025d3a 100644
--- a/src/main/webapp/script/haflow.main.js
+++ b/src/main/webapp/script/haflow.main.js
@@ -1181,8 +1181,8 @@ HAFlow.Main.prototype.onFlowClicked = function(instance, flowId) {
 	text += "<div class=\"configuration-content\"><strong>Flow Info:</strong></div>";
 	text += "<div class=\"configuration-content\"><span><strong>Id:</strong> "
 			+ flowBrief.id + "</span></div>";
-	text += "<div class=\"configuration-content\"><span><strong>Name:</strong></span></div>";
-	text += "<div id=\"flow_name_text_box\" class=\"configuration-content\"></div>";
+	text += "<div class=\"configuration-content\"><span><strong>Name:</strong></span>";
+	text += "<span id=\"flow_name_text_box\" class=\"configuration-content\"></span></div>";
 	text += "<div id=\"save_flow_name_button\" class=\"configuration-content\"></div>";
 	text += "</div>";
 	$("#" + instance.informationContainerId).html(text);
@@ -1232,7 +1232,7 @@ HAFlow.Main.prototype.onNodeClicked = function(instance, flowId, nodeId) {
 			+ module.name + "</span></div>";
 	text += "<div class=\"configuration-content\">";
 	text += "<span><strong>Name:</strong> </span>";
-	text += "<div id=\"node_name_text_box\" class=\"configuration-content\"></div>";
+	text += "<span id=\"node_name_text_box\" class=\"configuration-content\"></span>";
 	text += "<div id=\"save_node_name_button\" class=\"configuration-content\"></div>";
 	text += "</div>";
 	text += "<div class=\"configuration-content\"><strong>Delete?</strong></div>";
@@ -1271,7 +1271,7 @@ HAFlow.Main.prototype.onNodeClicked = function(instance, flowId, nodeId) {
 
 	var form = "";
 	form += "<div class=\"configuration\">";
-	form += "<div class=\"configuration-content\"><strong>Configuration:</strong></div>";
+	//form += "<div class=\"configuration-content\"><strong>Configuration:</strong></div>";
 	var i;
 	for (i = 0; i < module.configurations.length; i++) {
 		var textBoxId = "flow_" + flowId + "_node_" + nodeId + "_"
diff --git a/src/main/webapp/style/haflow.main.css b/src/main/webapp/style/haflow.main.css
index 5ec7ce8..0200422 100644
--- a/src/main/webapp/style/haflow.main.css
+++ b/src/main/webapp/style/haflow.main.css
@@ -60,7 +60,15 @@
 
 }
 ._jsPlumb_endpoint {
-	z-index: 3;
+	z-index: 9;
+}
+
+._jsPlumb_overlay {
+	z-index: 4;
+}
+
+._jsPlumb_endpoint_anchor_ {
+	z-index: 9;
 }
 
 .dragHover {
