diff --git a/app/add.py b/app/add.py
index b15bdbc4..9617a159 100644
--- a/app/add.py
+++ b/app/add.py
@@ -77,7 +77,7 @@ if form.getvalue('mode') is not None:
 	else:
 		ssl_check = ""
 				
-	if not ip and form.getvalue('port') is not None:
+	if not ip and port is not None:
 		bind = "    bind *:"+ port + " " + ssl + "\n" 
 	elif port is not None:
 		bind = "    bind " + ip + ":" + port + " " + ssl + "\n"
diff --git a/app/templates/add.html b/app/templates/add.html
index 865c4b84..4d3e0c7d 100644
--- a/app/templates/add.html
+++ b/app/templates/add.html
@@ -14,7 +14,7 @@
 	</ul>
 	<div id="listen">
 		<form name="add-listner" action="/app/add.py">
-		<table>
+		<table class="add-table">
 			<caption><h3 style="margin-left: 20px; margin-bottom: 10px;">Add listen</h3></caption>
 				<tr>
 					<td class="addName">Select server: </td>
@@ -27,6 +27,19 @@
 						</select>
 						<div class="tooltip tooltipTop"><b>Note:</b> If you reconfigure Master server, Slave will reconfigured automatically</div>
 					</td>
+					<td rowspan="5" class="add-note addName">
+						A "listen" section defines a complete proxy with its frontend and backend parts combined in one section. It is generally useful for TCP-only traffic.
+						<br /><br />
+						All proxy names must be formed from upper and lower case letters, digits,
+						'-' (dash), '_' (underscore) , '.' (dot) and ':' (colon). ACL names are
+						case-sensitive, which means that "www" and "WWW" are two different proxies.
+						<br /><br />
+						Historically, all proxy names could overlap, it just caused troubles in the
+						logs. Since the introduction of content switching, it is mandatory that two
+						proxies with overlapping capabilities (frontend/backend) have different names.
+						However, it is still permitted that a frontend and a backend share the same
+						name, as this configuration seems to be commonly encountered.
+					</td>
 				</tr>
 		<tr>
 			<td class="addName">Name:</td>
@@ -42,10 +55,6 @@
 				<div class="tooltip tooltipTop">IP for bind listner, <b>if empty will be assignet on all IPs</b>. Start typing ip, or press down.<br>If you use <b>VRRP keep in blank</b>. If you assign an IP, the slave will not start</div>
 			</td>
 		</tr>
-		<tr class="advance-show">
-			<td class="addName">Advanced:</td>
-			<td class="addOption"><a href="#" title="Show Advanced settings">Show Advanced settings</a></td>
-		</tr>
 		<tr class="advance">
 			<td class="addName">Mode: </td>
 			<td class="addOption">
@@ -170,6 +179,11 @@
 				<span>
 					<a class="add-server" id="add-server" title="Add backend server" style="cursor: pointer;"></a>
 				</span>
+			</td>
+		</tr>
+		<tr class="advance">
+			<td class="addName">Check:</td>
+			<td class="addOption">
 				<div>
 					<label for="controlgroup-listen-show" style="margin-top: 5px;" title="Change default check">Cusmot check params</label>
 					<input type="checkbox" id="controlgroup-listen-show" name="default-check" value="1">
@@ -199,6 +213,10 @@
 				</div>
 			</td>
 		</tr>
+		<tr class="advance-show">
+			<td class="addName">Advanced:</td>
+			<td class="addOption"><a href="#" title="Show Advanced settings">Show Advanced settings</a></td>
+		</tr>
 		<tr>
 			<td class="addButton">
 				<button type="submit" value="" name="" class="btn btn-default">Add Listen</button>
@@ -224,6 +242,19 @@
 					</select>
 					<div class="tooltip tooltipTop"><b>Note:</b> If you reconfigure Master  server, Slave will reconfigured automatically</div>
 				</td>
+				<td rowspan="5" class="add-note addName">
+						A "frontend" section describes a set of listening sockets accepting client connections.
+						<br /><br />
+						All proxy names must be formed from upper and lower case letters, digits,
+						'-' (dash), '_' (underscore) , '.' (dot) and ':' (colon). ACL names are
+						case-sensitive, which means that "www" and "WWW" are two different proxies.
+						<br /><br />
+						Historically, all proxy names could overlap, it just caused troubles in the
+						logs. Since the introduction of content switching, it is mandatory that two
+						proxies with overlapping capabilities (frontend/backend) have different names.
+						However, it is still permitted that a frontend and a backend share the same
+						name, as this configuration seems to be commonly encountered.
+				</td>
 			</tr>
 		<tr>
 			<td class="addName">Name:</td>
@@ -239,10 +270,6 @@
 				<div class="tooltip tooltipTop">IP for bind listner, <b>if empty will be assignet on all IPs</b>. Start typing ip, or press down.<br>If you use <b>VRRP keep in blank</b>. If you assign an IP, the slave will not start</div>
 			</td>
 		</tr>
-		<tr class="advance-show">
-			<td class="addName">Advanced:</td>
-			<td class="addOption"><a href="#" title="Show Advanced settings">Show Advanced settings</a></td>
-		</tr>
 		<tr class="advance">
 			<td class="addName">Mode: </td>
 			<td class="addOption">
@@ -319,6 +346,10 @@
 				<p style="font-size: 12px"><b>Note:</b> If backend don\t exist, you must <a href="#" style="color: #23527c"  title="Create backend" id="redirectBackend">create backend first</a>.</p>
 			</td>
 		</tr>
+		<tr class="advance-show">
+			<td class="addName">Advanced:</td>
+			<td class="addOption"><a href="#" title="Show Advanced settings">Show Advanced settings</a></td>
+		</tr>
 		<tr>
 			<td class="addButton">
 				<button type="submit" value="" name="" class="btn btn-default">Add Frontend</button>
@@ -345,6 +376,19 @@
 					</select>
 					<div class="tooltip tooltipTop"><b>Note:</b> If you reconfigure Master server, Slave will reconfigured automatically</div>
 				</td>
+				<td rowspan="4" class="add-note addName">
+						A "backend" section describes a set of servers to which the proxy will connect to forward incoming connections.
+						<br /><br />
+						All proxy names must be formed from upper and lower case letters, digits,
+						'-' (dash), '_' (underscore) , '.' (dot) and ':' (colon). ACL names are
+						case-sensitive, which means that "www" and "WWW" are two different proxies.
+						<br /><br />
+						Historically, all proxy names could overlap, it just caused troubles in the
+						logs. Since the introduction of content switching, it is mandatory that two
+						proxies with overlapping capabilities (frontend/backend) have different names.
+						However, it is still permitted that a frontend and a backend share the same
+						name, as this configuration seems to be commonly encountered.
+				</td>
 			</tr>
 		<tr>
 			<td class="addName">Name:</td>
@@ -352,10 +396,6 @@
 				<input type="text" name="new_backend" id="new_backend" required title="Name backend"  placeholder="web_80" class="form-control">
 			</td>
 		</tr>
-		<tr class="advance-show">
-			<td class="addName">Advanced:</td>
-			<td class="addOption"><a href="#" title="Show Advanced settings">Show Advanced settings</a></td>
-		</tr>
 		<tr class="advance">
 			<td class="addName">Mode: </td>
 			<td class="addOption">
@@ -368,8 +408,6 @@
 					<input type="checkbox" id="https-backend" name="ssl" value="https">
 				</span>
 				<div id="https-hide-backend" style="display: none;">
-					<br /><span class="tooltip tooltipTop">Enter name to pem file, or press down:</span><br />
-					<input type="text" name="cert" placeholder="some_cert.pem" class="form-control" size="39" id="path-cert-backend"><br />
 					<label for="ssl-check" style="margin-top: 5px;">Disable ssl verify on servers?</label><input type="checkbox" id="ssl-check" name="ssl-check" value="ssl-check" checked>
 				</div>				
 			</td>
@@ -465,6 +503,11 @@
 				<span>
 					<a class="add-server" id="add-server2" title="Add backend server" style="cursor: pointer;"></a>
 				</span>
+			</td>
+		</tr>
+		<tr class="advance">
+			<td class="addName">Check:</td>
+			<td class="addOption">
 				<div>
 					<label for="controlgroup-backend-show" style="margin-top: 5px;" title="Change default check"	>Cusmot check params</label>
 					<input type="checkbox" id="controlgroup-backend-show" name="default-check">
@@ -494,6 +537,10 @@
 				</div>
 			</td>
 		</tr>
+		<tr class="advance-show">
+			<td class="addName">Advanced:</td>
+			<td class="addOption"><a href="#" title="Show Advanced settings">Show Advanced settings</a></td>
+		</tr>
 		<tr>
 			<td class="addButton">
 				<button type="submit" value="" name="" class="btn btn-default">Add Backend</button>
diff --git a/inc/script.js b/inc/script.js
index f4168cf5..98b088ae 100644
--- a/inc/script.js
+++ b/inc/script.js
@@ -562,10 +562,8 @@ $( function() {
 	$( "#https-backend" ).click( function(){
 		if ($('#https-backend').is(':checked')) {
 			$( "#https-hide-backend" ).show( "fast" );
-			$( "#path-cert-backend" ).attr('required',true);
 		} else {
 			$( "#https-hide-backend" ).hide( "fast" );
-			$( "#path-cert-backend" ).prop('required',false);
 		}
 	});	
 	$( "#options-listen-show" ).click( function(){
@@ -1090,24 +1088,6 @@ $( function() {
 		autoFocus: true,
 		minLength: -1
 	});
-	$( "#path-cert-backend" ).autocomplete({
-		source: function( request, response ) {
-			$.ajax( {
-				url: "options.py",
-				data: {
-					getcerts:1,
-					serv: $("#serv3").val(),
-					token: $('#token').val()
-				},
-				success: function( data ) {
-					data = data.replace(/\s+/g,' ');
-					response(data.split(" "));
-				}						
-			} );
-		},
-		autoFocus: true,
-		minLength: -1
-	});
 	$( "#interface" ).autocomplete({
 		source: function( request, response ) {
 			$.ajax( {
diff --git a/inc/style.css b/inc/style.css
index 34ee44e9..587c7603 100644
--- a/inc/style.css
+++ b/inc/style.css
@@ -250,6 +250,9 @@ pre {
 .advance {
 	display: none;
 }
+.advance-show  {
+	font-size: 13px !important;
+}
 .advance-show  a{
 	color: #9d9d9d !important;
 }