diff --git a/README.md b/README.md
index 5f014483..38d8d412 100644
--- a/README.md
+++ b/README.md
@@ -129,6 +129,19 @@ For Apache do virtualhost with cgi-bin. Like this:
   		Order Deny,Allow
   		Deny from all
 	</FilesMatch>
+	
+	<IfModule mod_headers.c>
+		Header set X-XSS-Protection: 1;
+		Header set X-Frame-Options: deny
+		Header set X-Content-Type-Options: nosniff
+		Header set Strict-Transport-Security: max-age=3600;
+		Header set Cache-Control no-cache
+		Header set Expires: 0
+
+		<filesMatch ".(ico|css|js|gif|jpeg|jpg|png|svg|woff|ttf|eot)$">
+			Header set Cache-Control "max-age=86400, public"
+		</filesMatch>
+	</IfModule>
 </VirtualHost>
 ```
 
diff --git a/app/config.py b/app/config.py
index a0835812..e9a5979c 100644
--- a/app/config.py
+++ b/app/config.py
@@ -67,20 +67,10 @@ if serv is not None and form.getvalue('config') is not None:
 			conf.write(config)
 	except IOError:
 		error = "Can't read import config file"
-	
-	MASTERS = sql.is_master(serv)
-	for master in MASTERS:
-		if master[0] != None:
-			funct.upload_and_restart(master[0], cfg, just_save=save)
 		
-	stderr = funct.upload_and_restart(serv, cfg, just_save=save)
+	stderr = funct.master_slave_upload_and_restart(serv, cfg, just_save=save)
 		
 	funct.diff_config(oldcfg, cfg)
-	
-	#if save:
-	#	c = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
-	#	c["restart"] = form.getvalue('serv')
-	#	print(c)
 		
 	os.system("/bin/rm -f " + hap_configs_dir + "*.old")
 
diff --git a/app/create_db.py b/app/create_db.py
index ba3e2751..20c3752a 100644
--- a/app/create_db.py
+++ b/app/create_db.py
@@ -366,12 +366,15 @@ def update_db_v_3_4_5_2(**kwargs):
 	
 def update_db_v_3_4_5_22(**kwargs):
 	con, cur = get_cur()
-	sql = """insert into version ('version') values ('3.4.5.2'); """
+	if mysql_enable == '0':
+		sql = """insert into version ('version') values ('3.4.5.2'); """
+	else:
+		sql = """INSERT INTO version VALUES ('3.4.5.2'); """
 	try:    
 		cur.execute(sql)
 		con.commit()
 	except sqltool.Error as e:
-		print('Cannot insert version')
+		print('Cannot insert version %s' % e)
 	cur.close() 
 	con.close()
 	
@@ -435,7 +438,7 @@ def update_db_v_3_5_3(**kwargs):
 	
 def update_ver(**kwargs):
 	con, cur = get_cur()
-	sql = """update version set version = '3.5.7.1'; """
+	sql = """update version set version = '3.5.8'; """
 	try:    
 		cur.execute(sql)
 		con.commit()
diff --git a/app/funct.py b/app/funct.py
index e9c4734b..37d3fc8d 100644
--- a/app/funct.py
+++ b/app/funct.py
@@ -442,6 +442,7 @@ def upload(serv, path, file, **kwargs):
 		
 	return error
 	
+	
 def upload_and_restart(serv, cfg, **kwargs):
 	import sql
 	tmp_file = sql.get_setting('tmp_config_path') + "/" + get_data('config') + ".cfg"
@@ -480,6 +481,17 @@ def upload_and_restart(serv, cfg, **kwargs):
 		logging('localhost', error, haproxywi=1)
 		return error
 		
+		
+def master_slave_upload_and_restart(serv, cfg, just_save):
+	import sql
+	MASTERS = sql.is_master(serv)
+	for master in MASTERS:
+		if master[0] != None:
+			upload_and_restart(master[0], cfg, just_save=just_save)
+		
+	return upload_and_restart(serv, cfg, just_save=just_save)
+	
+		
 def open_port_firewalld(cfg):
 	try:
 		conf = open(cfg, "r")
@@ -499,6 +511,7 @@ def open_port_firewalld(cfg):
 	firewalld_commands.append('sudo firewall-cmd --reload')
 	return firewalld_commands
 	
+	
 def check_haproxy_config(serv):
 	import sql
 	commands = [ "haproxy  -q -c -f %s" % sql.get_setting('haproxy_config_path') ]
@@ -511,6 +524,7 @@ def check_haproxy_config(serv):
 			return False
 	ssh.close()
 		
+		
 def show_log(stdout):
 	i = 0
 	for line in stdout:
@@ -518,10 +532,12 @@ def show_log(stdout):
 		line_class = "line3" if i % 2 == 0 else "line"
 		print('<div class="'+line_class+'">' + escape_html(line) + '</div>')
 			
+			
 def show_ip(stdout):
 	for line in stdout:
 		print(line)
 		
+		
 def server_status(stdout):	
 	proc_count = ""
 	
@@ -533,6 +549,7 @@ def server_status(stdout):
 			proc_count = 0
 	return proc_count		
 
+
 def ssh_command(serv, commands, **kwargs):
 	ssh = ssh_connect(serv)
 		  
@@ -565,9 +582,11 @@ def ssh_command(serv, commands, **kwargs):
 		print("<div class='alert alert-danger' style='margin: 0;'>"+str(ssh)+"<a title='Close' id='errorMess'><b>X</b></a></div>")
 		pass
 
+
 def escape_html(text):
 	return cgi.escape(text, quote=True)
 	
+	
 def subprocess_execute(cmd):
 	import subprocess 
 	p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, universal_newlines=True)
@@ -576,6 +595,7 @@ def subprocess_execute(cmd):
 	
 	return output, stderr
 
+
 def show_backends(serv, **kwargs):
 	import json
 	import sql
@@ -600,6 +620,7 @@ def show_backends(serv, **kwargs):
 	if kwargs.get('ret'):
 		return ret
 		
+		
 def get_files(dir = get_config_var('configs', 'haproxy_save_configs_dir'), format = 'cfg', **kwargs):
 	import glob
 	if format == 'log':
@@ -624,6 +645,7 @@ def get_files(dir = get_config_var('configs', 'haproxy_save_configs_dir'), forma
 	else: 
 		return files
 	
+	
 def get_key(item):
 	return item[0]
 	
diff --git a/app/haproxy-wi.db.sql b/app/haproxy-wi.db.sql
index ce3c9f53..3014aed4 100644
--- a/app/haproxy-wi.db.sql
+++ b/app/haproxy-wi.db.sql
@@ -9,12 +9,12 @@ INSERT INTO `role` (name, description) VALUES ('editor','Can edit configs');
 INSERT INTO `role` (name, description) VALUES ('guest','Read only access');
 CREATE TABLE IF NOT EXISTS `groups` (`id`	INTEGER NOT NULL AUTO_INCREMENT,`name`	VARCHAR ( 80 ) UNIQUE,`description`	VARCHAR ( 255 ),PRIMARY KEY(`id`));
 INSERT INTO `groups` (name, description) VALUES ('All','All servers enter in this group');	
-CREATE TABLE IF NOT EXISTS `uuid` (`user_id` INTEGER NOT NULL, `uuid` varchar ( 64 ),`exp` DATETIME default '0000-00-00 00:00:00');
-CREATE TABLE IF NOT EXISTS `token` (`user_id` INTEGER, `token` varchar(64), `exp` timestamp default '0000-00-00 00:00:00');
+CREATE TABLE IF NOT EXISTS `uuid` (`user_id` INTEGER NOT NULL, `uuid` varchar ( 64 ),`exp` DATETIME default CURRENT_TIMESTAMP);
+CREATE TABLE IF NOT EXISTS `token` (`user_id` INTEGER, `token` varchar(64), `exp` timestamp default CURRENT_TIMESTAMP);
 CREATE TABLE IF NOT EXISTS `cred` (`id` integer primary key AUTO_INCREMENT, `name` VARCHAR ( 64 ) UNIQUE, `enable` INTEGER NOT NULL DEFAULT 1, `username` VARCHAR ( 64 ) NOT NULL, `password` VARCHAR ( 64 ) NOT NULL, groups INTEGER NOT NULL DEFAULT 1 );
 CREATE TABLE IF NOT EXISTS `telegram` (`id` integer primary key auto_increment, `token` VARCHAR ( 64 ), `chanel_name` INTEGER NOT NULL DEFAULT 1, `groups` INTEGER NOT NULL DEFAULT 1);
 CREATE TABLE IF NOT EXISTS `metrics` (`serv` varchar(64), curr_con INTEGER, cur_ssl_con INTEGER, sess_rate INTEGER, max_sess_rate INTEGER,`date`  DATETIME default '0000-00-00 00:00:00');
 CREATE TABLE IF NOT EXISTS `settings` (`param` varchar(64) UNIQUE, value varchar(64), section varchar(64), `desc` varchar(100));
-CREATE TABLE IF NOT EXISTS `version` (`version` varchar(64), `hash` INTEGER NOT NULL DEFAULT 1,);
+CREATE TABLE IF NOT EXISTS `version` (`version` varchar(64));
 CREATE TABLE IF NOT EXISTS `options` ( `id`	INTEGER NOT NULL, `options`	VARCHAR ( 64 ), `groups`	VARCHAR ( 120 ), PRIMARY KEY(`id`));
 CREATE TABLE IF NOT EXISTS `saved_servers` ( `id` INTEGER NOT NULL, `server` VARCHAR ( 64 ), `description` VARCHAR ( 120 ), `groups` VARCHAR ( 120 ), PRIMARY KEY(`id`)); 
diff --git a/app/hapservers.py b/app/hapservers.py
index 5bc0d6d1..73a2f250 100644
--- a/app/hapservers.py
+++ b/app/hapservers.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 import funct, sql
 import os, http.cookies
+import cgi
 from jinja2 import Environment, FileSystemLoader
 env = Environment(loader=FileSystemLoader('templates/'))
 template = env.get_template('hapservers.html')
@@ -15,12 +16,21 @@ try:
 	users = sql.select_users()
 	groups = sql.select_groups()
 	token = sql.get_token(user_id.value)
-	servers = sql.get_dick_permit()
 	cmd = "ps ax |grep -e 'keep_alive.py' |grep -v grep |wc -l"
 	keep_alive, stderr = funct.subprocess_execute(cmd)
 except:
 	pass
+	
+form = cgi.FieldStorage()
+serv = form.getvalue('serv')
 
+if serv:
+	servers = sql.select_servers(server=serv)
+	autorefresh = 1
+else:
+	servers = sql.get_dick_permit()
+	autorefresh = 0
+	
 haproxy_sock_port = sql.get_setting('haproxy_sock_port')
 haproxy_config_path  = sql.get_setting('haproxy_config_path')
 commands = [ "ls -l %s |awk '{ print $6\" \"$7\" \"$8}'" % haproxy_config_path ]
@@ -47,10 +57,10 @@ for s in servers:
 		servers_with_status.append('Cannot get last date')
 	
 	servers_with_status1.append(servers_with_status)
-
+	
 
 template = template.render(h2 = 1,
-							autorefresh = 0,
+							autorefresh = autorefresh,
 							title = "HAProxy servers overview",
 							role = sql.get_user_role_by_uuid(user_id.value),
 							user = user,
@@ -59,5 +69,6 @@ template = template.render(h2 = 1,
 							servers = servers_with_status1,
 							versions = funct.versions(),
 							keep_alive = ''.join(keep_alive),
+							serv = serv,
 							token = token)
 print(template)											
diff --git a/app/options.py b/app/options.py
index adc04ee7..b8f42c78 100644
--- a/app/options.py
+++ b/app/options.py
@@ -209,7 +209,7 @@ if act == "overviewwaf":
 	
 async def async_get_overviewServers(serv1, serv2):
 	server_status = ()
-	commands =  [ "top -u haproxy -b -n 1 -w 67 |grep -e 'haproxy\|PID\|Cpu\|KiB' |grep -v Swap" ]
+	commands =  [ "top -u haproxy -b -n 1" ]
 	cmd = 'echo "show info" |nc %s %s -w 1|grep -e "Ver\|CurrConns\|Maxco\|MB\|Uptime:"' % (serv2, sql.get_setting('haproxy_sock_port'))
 	out = funct.subprocess_execute(cmd)
 	out1 = ""
diff --git a/app/sections.py b/app/sections.py
index 08b3ffb7..6e670081 100644
--- a/app/sections.py
+++ b/app/sections.py
@@ -72,12 +72,7 @@ if serv is not None and form.getvalue('config') is not None:
 	except IOError:
 		error = "Can't read import config file"
 	
-	MASTERS = sql.is_master(serv)
-	for master in MASTERS:
-		if master[0] != None:
-			funct.upload_and_restart(master[0], cfg, just_save=save)
-		
-	stderr = funct.upload_and_restart(serv, cfg, just_save=save)
+	stderr = funct.master_slave_upload_and_restart(serv, cfg, just_save=save)
 		
 	funct.diff_config(oldcfg, cfg)
 	
diff --git a/app/sql.py b/app/sql.py
index e0feb09e..d97683e4 100644
--- a/app/sql.py
+++ b/app/sql.py
@@ -275,7 +275,7 @@ def select_servers(**kwargs):
 	if kwargs.get("server") is not None:
 		sql = """select * from servers where ip='%s' """ % kwargs.get("server")
 	if kwargs.get("full") is not None:
-		sql = """select * from servers ORDER BY groups """ 
+		sql = """select * from servers ORDER BY hostname """ 
 	if kwargs.get("get_master_servers") is not None:
 		sql = """select id,hostname from servers where master = 0 and type_ip = 0 and enable = 1 ORDER BY groups """ 
 	if kwargs.get("get_master_servers") is not None and kwargs.get('uuid') is not None:
@@ -846,6 +846,20 @@ def select_waf_servers(serv):
 	cur.close()    
 	con.close()
 	
+	
+def select_all_waf_servers():
+	con, cur = create_db.get_cur()
+	sql = """ select serv.ip from waf left join servers as serv on waf.server_id = serv.id """
+	try:    
+		cur.execute(sql)
+	except sqltool.Error as e:
+		out_error(e)
+	else:
+		return cur.fetchall()
+	cur.close()    
+	con.close()
+	
+	
 def select_waf_servers_metrics(uuid, **kwargs):
 	con, cur = create_db.get_cur()
 	sql = """ select * from user where username = '%s' """ % get_user_name_by_uuid(uuid)
@@ -1299,8 +1313,8 @@ def show_update_telegram(token, page):
 
 def show_update_user(user,page):
 	from jinja2 import Environment, FileSystemLoader
-	env = Environment(loader=FileSystemLoader('templates/ajax'))
-	template = env.get_template('/new_user.html')
+	env = Environment(loader=FileSystemLoader('templates/'))
+	template = env.get_template('ajax/new_user.html')
 
 	print('Content-type: text/html\n')
 	template = template.render(users = select_users(user=user),
@@ -1311,8 +1325,8 @@ def show_update_user(user,page):
 		
 def show_update_server(server, page):
 	from jinja2 import Environment, FileSystemLoader
-	env = Environment(loader=FileSystemLoader('templates/ajax/'))
-	template = env.get_template('/new_server.html')
+	env = Environment(loader=FileSystemLoader('templates/'))
+	template = env.get_template('ajax/new_server.html')
 
 	print('Content-type: text/html\n')
 	output_from_parsed_template = template.render(groups = select_groups(),
diff --git a/app/templates/add.html b/app/templates/add.html
index 7ddc794f..9b9b20e5 100644
--- a/app/templates/add.html
+++ b/app/templates/add.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block content %}
+{% from 'include/input_macros.html' import input, checkbox, select %}
 <style>
 .container {
 	margin-right: 0;
@@ -19,148 +20,9 @@ h3 {
 		<li><a href="#option">Options</a></li>
 		<li><a href="#add-servers">Servers</a></li>
 		<li><a href="#userlist">Userlist</a></li>
-		{% if user %}
-			<a href=/app/login.py?logout=logout title="Logout, user name: {{ user }}" class="login"> Logout</a>						
-		{% else %}
-			<a href=/app/login.py title="Login" class="login"> Login</a>
-		{% endif %}
+		{% include 'include/login.html' %}
 	</ul>
-	<div id="create" style="height: 95%;">
-		<div id="left-collumn">
-			<div class="div-pannel">
-				<div class="div-server">
-					<div class="server-name">
-						<span title="Create Listen" class="redirectListen span-link">Create Listen</span>
-					</div>
-					<div class="server-desc">
-							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.
-					</div>
-					
-				</div>
-			</div>
-			<div class="div-pannel">
-				<div class="div-server">
-					<div class="server-name">
-						<span title="Create HTTP Listen" class="redirectListen span-link" id="create-http-listen">Create HTTP Listen</span>
-					</div>
-					<div class="server-desc">
-							Create HTTP proxy
-					</div>				
-				</div>
-			</div>
-			<div class="div-pannel">
-				<div class="div-server">
-					<div class="server-name">
-						<span title="Create SSL Listen" class="redirectListen span-link" id="create-ssl-listen">Create SSL Listen</span>
-					</div>
-					<div class="server-desc">
-							Create HTTPS Proxy with the SSL termination on HAProxy and SSL offload. 
-							HAProxy will send to backends HTTP traffic. You need have <span title="Upload SSL" class="redirectSsl span-link" style="color: #5d9ceb">uploaded a PEM certificat</span>
-					</div>				
-				</div>
-			</div>
-			<div class="div-pannel">
-				<div class="div-server">
-					<div class="server-name">
-						<span title="Create SSL Listen" class="redirectListen span-link" id="create-https-listen">Create HTTPS Listen</span>
-					</div>
-					<div class="server-desc">
-							Create HTTPS Proxy without the SSL termination on HAProxy and SSL offload. HAProxy will send to backends HTTPS traffic
-					</div>				
-				</div>
-			</div>
-		</div>
-		<div id="middle-collumn">
-			<div class="div-pannel">
-				<div class="div-server">
-					<div class="server-name">
-						<span title="Create Frontend" class="redirectFrontend span-link">Create Frontend</span>
-					</div>
-					<div class="server-desc">
-						A "frontend" section describes a set of listening sockets accepting client connections.
-						And forwards them to backend
-						<br />
-					</div>			
-				</div>
-			</div>
-			<div class="div-server">
-				<div class="server-name">
-					<span title="Create HTTP Frontend" class="redirectListen span-link" id="create-http-frontend">Create HTTP Frontend</span>
-				</div>
-				<div class="server-desc">
-						Create HTTP Frontend
-				</div>				
-			</div>
-			<div class="div-pannel">
-				<div class="div-server">
-					<div class="server-name">
-						<span title="Create SSL Frontend" class="redirectListen span-link" id="create-ssl-frontend">Create SSL Frontend</span>
-					</div>
-					<div class="server-desc">
-							Create HTTPS Frontend with the SSL termination on HAProxy and SSL offload. HAProxy will send to backends HTTP traffic. You need have <span title="Upload SSL" class="redirectSsl span-link" style="color: #5d9ceb">uploaded a PEM certificat</span>
-					</div>				
-				</div>
-			</div>
-			<div class="div-pannel">
-				<div class="div-server">
-					<div class="server-name">
-						<span title="Create HTTPS Frontend" class="redirectListen span-link" id="create-https-frontend">Create HTTPS Frontend</span>
-					</div>
-					<div class="server-desc">
-							Create HTTPS Frontend without the SSL termination on HAProxy and SSL offload. HAProxy will send to backends HTTPS traffic
-					</div>				
-				</div>
-			</div>
-		</div>
-		<div id="right-collumn">
-			<div class="div-pannel">
-				<div class="div-server">
-					<div class="server-name">
-						<span title="Create Backend" class="redirectBackend span-link">Create Backend</span>
-					</div>
-					<div class="server-desc">
-						A "backend" section describes a set of servers to which the proxy will connect to forward incoming connections. 
-						<br />
-						<br />
-					</div>			
-				</div>
-			</div>
-			<div class="div-server">
-				<div class="server-name">
-					<span title="Create SSL Backend" class="redirectListen span-link" id="create-http-backend">Create HTTP Backend</span>
-				</div>
-				<div class="server-desc">
-						Create HTTP Backend
-				</div>				
-			</div>
-			<div class="div-pannel">
-				<div class="div-server">
-					<div class="server-name">
-						<span title="Create HTTPS Backend" class="redirectListen span-link" id="create-ssl-backend">Create SSL Backend</span>
-					</div>
-					<div class="server-desc">
-							Create HTTPS Backend with the SSL termination on HAProxy and SSL offload. HAProxy will send to backends HTTP traffic. You need have <span title="Upload SSL" class="redirectSsl span-link" style="color: #5d9ceb">uploaded a PEM certificat</span>
-					</div>				
-				</div>
-			</div>
-			<div class="div-pannel">
-				<div class="div-server">
-					<div class="server-name">
-						<span title="Create SSL Backend" class="redirectListen span-link" id="create-https-backend">Create HTTPS Backend</span>
-					</div>
-					<div class="server-desc">
-							Create HTTPS Backend without the SSL termination on HAProxy and SSL offload. HAProxy will send to backends HTTPS traffic
-					</div>				
-				</div>
-			</div>
-		</div>
-		{% if add %}
-		<div class="alert alert-success" style="margin-left: 20px; clear: both;">	
-			<h3>{{ add }} was success added</h3>
-			{{ conf_add }}
-		</div>
-		{% endif %}
-	</div>
+	{% include 'include/add_proxy.html' %}
 	<div id="listen">
 		<form name="add-listner" action="/app/add.py">
 		<table class="add-table">
@@ -193,31 +55,30 @@ h3 {
 		<tr>
 			<td class="addName">Name:</td>
 			<td class="addOption">
-				<input type="text" name="listner" id="name" required title="Name Listner" placeholder="web_80" class="form-control">
+				{{ input('name', name='listner', title="Name Listner", placeholder="web_80", required='required') }}
 			</td>
 		</tr>
 		<tr>
 			<td class="addName">IP and Port:</td>
 			<td class="addOption">
-				<input type="text" name="ip" id="ip" title="" size="15" placeholder="Any" class="form-control"><b>:</b>
-				<input type="number" name="port" id="listen-port" required title="Port for bind listen" size="5" placeholder="8080" class="form-control">
+				{{ input('ip', placeholder="Any", size='15') }}<b>:</b>
+				{{ input('listen-port', name='port', type="number", title="Port for bind listen", placeholder="8080", size='5', required='required') }}
 				<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">
 			<td class="addName">Mode: </td>
 			<td class="addOption">
-				<select required name="mode" id="listen-mode-select">
-					<option value="http" selected>http</option>
-					<option value="tcp">tcp</option>
-				</select>
+				{% set values = dict() %}
+				{% set values = {'http':'http','tcp':'tcp'} %}
+				{{ select('listen-mode-select', name='mode', values=values, selected='http', required='required', class='force_close') }}
 				<span id="https-listen-span">
 					<label for="https-listen" style="margin-top: 5px;" title="Enable ssl">SSL?</label>
 					<input type="checkbox" id="https-listen" name="ssl" value="https" >
 				</span>
 				<div id="https-hide-listen" 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-listen"><br />
+					{{ input('path-cert-listen', name="cert", placeholder="some_cert.pem", size='39') }}<br />
 					<label for="ssl-check-listen" style="margin-top: 5px;">Disable ssl verify on servers?</label><input type="checkbox" id="ssl-check-listen" name="ssl-check" value="ssl-check" checked>
 				</div>
 			</td>
@@ -225,29 +86,25 @@ h3 {
 		<tr class="advance">
 			<td class="addName">Maxconn: </td>
 			<td class="addOption">
-				<input type="number" name="maxconn" required title="Fix the maximum number of concurrent connections on a frontend" size="5" value="2000" class="form-control">
+				{{ input('maxconn', value='2000', type="number", title="Fix the maximum number of concurrent connections on a frontend", size='5', required='required') }}
 				<div class="tooltip tooltipTop">This value should not exceed the global maxconn. Default global maxconn value: 2000</div>
 			</td>
 		</tr>
 		<tr class="advance">
 			<td class="addName">Balance: </td>
-			<td class="addOption">
-				<select required name="balance">
-					<option value="roundrobin" selected>roundrobin</option>
-					<option value="source">source</option>
-					<option value="leastconn">leastconn</option>
-					<option value="first">first</option>
-					<option value="rdp-cookie">rdp-cookie</option>
-				</select>
-			</td>
+				<td class="addOption">
+					{% set values = dict() %}
+					{% set values = {'roundrobin':'roundrobin','source':'source','leastconn':'leastconn', 'first':'first', 'rdp-cookie':'rdp-cookie'} %}
+					{{ select('balance', values=values, selected='roundrobin', required='required', class='force_close') }}
+				</td>
 		</tr>
 		<tr class="advance">
 			<td class="addName"><span title="Cache support start 1.8 and latter">Web acceleration(?):</span></td>
 			<td class="addOption">
 				<span class="controlgroup">	
-					<label for="compression" title="Enable Compression">Compression</label><input type="checkbox" id="compression" name="compression" value="1">
-					<label for="cache" title="Enable Compression">Cache</label><input type="checkbox" id="cache" name="cache" value="2">
-					<label for="ssl_offloading" title="Enable SSL Offloading">SSL Offloading</label><input type="checkbox" id="ssl_offloading">
+					{{ checkbox('compression', title='Enable Compression', value='1', desc='Compression') }}
+					{{ checkbox('cache', title='Enable cache', value='2', desc='Cache') }}
+					{{ checkbox('ssl_offloading', title='Enable SSL Offloading', desc='SSL Offloading') }}
 				</span>
 			</td>
 		</tr>
@@ -255,14 +112,14 @@ h3 {
 			<td class="addName"><span title="Web application firewall">WAF(?):</span></td>
 			<td class="addOption">
 				<span class="controlgroup">
-					<label for="slow_atack" title="Slow atack protect">Slow atack</label><input type="checkbox" id="slow_atack">
-					<label for="ddos" title="DDOS atack protect">DDOS</label><input type="checkbox" id="ddos">
-					<label for="blacklist_checkbox" title="Enable SSL Offloading">Blacklist</label><input type="checkbox" id="blacklist_checkbox">
-					<label for="waf" title="Web application firewall">WAF</label><input type="checkbox" id="waf" name="waf" value="1">
+					{{ checkbox('slow_atack', title='Slow atack protect', desc='Slow atack') }}
+					{{ checkbox('ddos', title='DDOS atack protect', desc='DDOS') }}
+					{{ checkbox('blacklist_checkbox', title='Use blacklist', desc='Blacklist') }}
+					{{ checkbox('waf', title='Web application firewall', desc='WAF', value='1') }}
 				</span>
 				<div id="blacklist-hide" style="display: none;">
 					<br /><span class="tooltip tooltipTop">Enter the name of the blacklist, or press down:</span><br />
-					<input type="text" name="blacklist" placeholder="blacklist.lst" class="form-control" size="39" id="blacklist-hide-input"><br />
+					{{ input('blacklist-hide-input', size='39', name="blacklist", placeholder="blacklist.lst") }}
 				</div>
 			</td>
 		</tr>
@@ -270,53 +127,42 @@ h3 {
 			<td class="addName">Optinons:</td>
 			<td class="addOption">
 				<span class="controlgroup">				
-					<label for="forward_for" title="Option Forward for if none">Forward for</label><input type="checkbox" id="forward_for">
-					<label for="redispatch" title="Enable Redispatch">Redispatch</label><input type="checkbox" id="redispatch">					
-					<select name="force_close" class="force_close">
-						<option disabled selected>Force HTTP close</option>
-						<option>Off</option>
-						<option value="1">Server only</option>
-						<option value="2">Force close</option>
-						<option value="3">Pretend keep alive</option>
-					</select>	
-					<label for="cookie" title="Enable Redispatch">Set cookie</label><input type="checkbox" id="cookie" name="cookie" value="1">
-					<label for="options-listen-show" title="Set options manualy">Set options</label><input type="checkbox" id="options-listen-show">
+					{{ checkbox('forward_for', title='Option Forward for if none', desc='Forward for') }}
+					{{ checkbox('redispatch', title='Enable Redispatch', desc='Redispatch') }}	
+					{% set values = dict() %}
+					{% set values = {'Off':'Off','Server only':'Server only','Force close':'Force close','Pretend keep alive':'Pretend keep alive'} %}
+					{{ select('force_close', values=values, first='Force HTTP close', class='force_close') }}	
+					{{ checkbox('cookie', title='Set cookie', desc='Set cookie', value='1') }}
+					{{ checkbox('options-listen-show', title='Set options manualy', desc='Set options') }}
 				</span>
 				<br>
 				<span id="cookie_div" style="display: none;">
 					<input type="text" placeholder="name" name="cookie_name" id="cookie_name" class="form-control"><br><br>
 					<input type="text" placeholder="domain" name="cookie_domain" class="form-control"><br><br>
 					<span class="controlgroup">
-						<select name="rewrite" id="rewrite" class="force_close">
-							<option disabled selected>rewrite/indirect/insert</option>
-							<option>None</option>
-							<option value="rewrite">rewrite</option>
-							<option value="indirect">indirect</option>
-							<option value="insert">insert</option>
-						</select>
-						<label for="prefix" title="This keyword indicates that instead of relying on a dedicated cookie for the persistence, an existing one will be completed.">prefix</label>
-						<input type="checkbox" name="prefix" value="prefix" id="prefix">
-						<label for="nocache" title="This option is recommended in conjunction with the insert mode when there is a cache between the client and HAProxy.">nocache</label>
-						<input type="checkbox" name="nocache" value="nocache" id="nocache">
-						<label for="postonly" title="This option ensures that cookie insertion will only be performed on responses to POST requests.">postonly</label>
-						<input type="checkbox" name="postonly" value="postonly" id="postonly">
-						<label for="dynamic" title="Activate dynamic cookies. When used, a session cookie is dynamically created for each server.">dynamic</label>
-						<input type="checkbox" name="dynamic" value="dynamic" id="dynamic">
+						{% set values = dict() %}
+						{% set values = {'None':'None','rewrite':'rewrite','indirect':'indirect','insert':'insert'} %}
+						{{ select('rewrite', values=values, first='rewrite/indirect/insert', class='force_close') }}	
+						{{ checkbox('prefix', title='This keyword indicates that instead of relying on a dedicated cookie for the persistence, an existing one will be completed', desc='prefix', value='prefix') }}
+						{{ checkbox('nocache', title='This option is recommended in conjunction with the insert mode when there is a cache between the client and HAProxy', desc='nocache', value='nocache') }}
+						{{ checkbox('postonly', title='This option ensures that cookie insertion will only be performed on responses to POST requests', desc='postonly', value='postonly') }}
+						{{ checkbox('dynamic', title='Activate dynamic cookies. When used, a session cookie is dynamically created for each server', desc='dynamic', value='dynamic') }}
 						<span id="dynamic_div" style="display: none;">
-							dynamic-cookie-key: <input type="text" placeholder="your-custom-key" name="dynamic-cookie-key" id="dynamic-cookie-key" class="form-control">
+							dynamic-cookie-key: {{ input('dynamic-cookie-key', placeholder="your-custom-key") }}
 						</span>
 					</span>
 				</span>
 				<div id="options-listen-show-div" style="display: none;">
 					<div class="tooltip">
 						<span style="padding-right: 10px;">Start typing options: </span>
+						{{ input('options') }}
 						<input type="text" id="options" class="form-control">
 						<span style="padding-left: 10px;">
 							or press down. <a href="http://cbonte.github.io/haproxy-dconv/1.7/configuration.html" target="_blanck" style="color: #23527c" title="HAproxy docs">Read more about options</a>
 						</span>
 						<br />
 						<span style="padding-right: 10px;">Start typing saved options: </span>
-						<input type="text" id="saved-options" class="form-control">
+						{{ input('saved-options') }}
 							It are the options that you saved in the "Options" tab
 					</div>
 					<textarea name="option" title="Options thru" id="optionsInput" cols=80 rows=5 placeholder="acl test hdr_beg(host) -i some_host"></textarea>
@@ -326,19 +172,7 @@ h3 {
 		<tr>
 			<td class="addName">Servers:</td>
 			<td class="addOption">
-				<span id="servers">
-					<input name="servers" required title="Backend IP" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control">:
-					<input name="server_port" required title="Backend IP" size=1 placeholder="yyy" class="form-control">
-					<br />
-					<input name="servers" title="Backend port" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control">:
-					<input name="server_port" title="Backend port" size=1 placeholder="yyy" class="form-control">
-					<br />
-					<input name="servers" title="Backend port" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control">:
-					<input name="server_port" title="Backend port" size=1 placeholder="yyy" class="form-control">
-				</span>
-				<span>
-					<a class="add-server" id="add-server-input" title="Add backend server" style="cursor: pointer;"></a>
-				</span>
+				{% include 'include/add_servers.html' %}
 			</td>
 		</tr>
 		<tr class="advance">
@@ -352,24 +186,15 @@ h3 {
 				<div class="controlgroup" id="controlgroup-listen" style="display: none;">
 					<label for="check-servers-listen" title="Ebable servers check">Check</label>
 					<input type="checkbox" id="check-servers-listen" name="check-servers" checked value="1">
-					<select name="inter" id="inter-listen" class="force_close">
-						<option value="inter" disabled selected>inter</option>
-						<option value="1000">1000</option>
-						<option value="2000">2000</option>
-						<option value="3000">3000</option>
-					</select>
-					<select name="rise" id="rise-listen">
-						<option value="rise" disabled selected class="force_close">rise</option>
-						<option value="1">1</option>
-						<option value="2">2</option>
-						<option value="3">3</option>
-					</select>
-					<select name="fall" id="fall-listen">
-						<option value="fall" disabled selected class="force_close">fall</option>
-						<option value="4">4</option>
-						<option value="5">5</option>
-						<option value="6">6</option>
-					</select>
+					{% set values = dict() %}
+					{% set values = {'1000':'1000','2000':'2000','3000':'3000'} %}
+					{{ select('inter', values=values, first='inter', class='force_close') }}	
+					{% set values = dict() %}
+					{% set values = {'1':'1','2':'2','3':'3'} %}
+					{{ select('rise-listen', name='rise-listen', values=values, first='rise', class='force_close') }}
+					{% set values = dict() %}
+					{% set values = {'4':'4','5':'5','6':'6'} %}
+					{{ select('fall-listen', name='fall', values=values, first='fall', class='force_close') }}
 				</div>
 			</td>
 		</tr>
@@ -434,24 +259,23 @@ h3 {
 		<tr class="advance">
 			<td class="addName">Mode: </td>
 			<td class="addOption">
-				<select required name="mode" id="frontend-mode-select">
-					<option value="http" selected>http</option>
-					<option value="tcp">tcp</option>
-				</select>
+				{% set values = dict() %}
+				{% set values = {'http':'http','tcp':'tcp'} %}
+				{{ select('frontend-mode-select', name='mode', values=values, selected='http', required='required', class='force_close') }}
 				<span id="https-frontend-span">
 					<label for="https-frontend" style="margin-top: 5px;">SSL?</label>
 					<input type="checkbox" id="https-frontend" name="ssl" value="https">
 				</span>
 				<div id="https-hide-frontend" 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-frontend">					
+					{{ input('path-cert-frontend', name="cert", placeholder="some_cert.pem", size='39') }}	
 				</div>				
 			</td>
 		</tr>
 		<tr class="advance">
 			<td class="addName">Maxconn: </td>
 			<td class="addOption">
-				<input type="number" name="maxconn" required title="Fix the maximum number of concurrent connections on a frontend" size="5" value="2000" class="form-control">
+				{{ input('maxconn', value='2000', type="number", title="Fix the maximum number of concurrent connections on a frontend", size='5', required='required') }}
 				<div class="tooltip tooltipTop">This value should not exceed the global maxconn. Default global maxconn value: 2000</div>
 			</td>
 		</tr>
@@ -459,9 +283,9 @@ h3 {
 			<td class="addName"><span title="Cache support start 1.8 and latter">Web acceleration(?):</span></td>
 			<td class="addOption">
 				<span class="controlgroup">	
-					<label for="compression2" title="Enable Compression">Compression</label><input type="checkbox" id="compression2" name="compression" value="1">
-					<label for="cache2" title="Enable Compression">Cache</label><input type="checkbox" id="cache2" name="cache" value="2">
-					<label for="ssl_offloading1" title="Enable SSL Offloading">SSL Offloading</label><input type="checkbox" id="ssl_offloading1">
+					{{ checkbox('compression2', title='Enable Compression', value='1', desc='Compression') }}
+					{{ checkbox('cache2', title='Enable cache', value='2', desc='Cache') }}
+					{{ checkbox('ssl_offloading1', title='Enable SSL Offloading', desc='SSL Offloading') }}
 				</span>	
 			</td>
 		</tr>
@@ -469,13 +293,14 @@ h3 {
 			<td class="addName"><span title="Web application firewall">WAF(?):</span></td>
 			<td class="addOption">
 				<span class="controlgroup">
-					<label for="slow_atack1" title="Slow atack protect">Slow atack</label><input type="checkbox" id="slow_atack1">
-					<label for="ddos1" title="DDOS atack protect">DDOS</label><input type="checkbox" id="ddos1">
-					<label for="blacklist_checkbox1" title="Enable SSL Offloading">Blacklist</label><input type="checkbox" id="blacklist_checkbox1">
+					{{ checkbox('slow_atack1', title='Slow atack protect', desc='Slow atack') }}
+					{{ checkbox('ddos1', title='DDOS atack protect', desc='DDOS') }}
+					{{ checkbox('blacklist_checkbox1', title='Use blacklist', desc='Blacklist') }}
+					{{ checkbox('waf2', name='waf', title='Web application firewall', desc='WAF', value='1') }}
 				</span>
 				<div id="blacklist-hide1" style="display: none;">
 					<br /><span class="tooltip tooltipTop">Enter the name of the blacklist, or press down:</span><br />
-					<input type="text" name="blacklist" placeholder="blacklist.lst" class="form-control" size="39" id="blacklist-hide-input1"><br />
+					{{ input('blacklist-hide-input1', size='39', name="blacklist", placeholder="blacklist.lst") }}
 				</div>
 			</td>
 		</tr>
@@ -483,26 +308,22 @@ h3 {
 			<td class="addName">Optinons:</td>
 			<td class="addOption">
 				<span class="controlgroup">
-					<label for="forward_for1" title="Option Forward for if none">Forward for</label><input type="checkbox" id="forward_for1">					
-					<select name="force_close" class="force_close">
-						<option disabled selected>Force HTTP close</option>
-						<option>Off</option>
-						<option value="1">Server only</option>
-						<option value="2">Force close</option>
-						<option value="3">Pretend keep alive</option>
-					</select>	
-					<label for="options-frontend-show" title="Set options manualy">Set options</label><input type="checkbox" id="options-frontend-show">
+					{{ checkbox('forward_for1', title='Option Forward for if none', desc='Forward for') }}
+					{% set values = dict() %}
+					{% set values = {'Off':'Off','Server only':'Server only','Force close':'Force close','Pretend keep alive':'Pretend keep alive'} %}
+					{{ select('force_close', values=values, first='Force HTTP close', class='force_close') }}	
+					{{ checkbox('options-frontend-show', title='Set options manualy', desc='Set options') }}
 				</span>
 				<div id="options-frontend-show-div" style="display: none;">
 					<div style="font-size: 12px; padding-bottom: 10px;">
 						<span style="padding-right: 10px;">Start typing options: </span>
-						<input type="text" id="options1" class="form-control">
+						{{ input('options2') }}
 						<span style="padding-left: 10px;">
 							or press down. <a href="http://cbonte.github.io/haproxy-dconv/1.7/configuration.html" target="_blanck"  style="color: #23527c" title="HAproxy docs">Read more about options</a>
 						</span>
 						<br />
 						<span style="padding-right: 10px;">Start typing saved options: </span>
-						<input type="text" id="saved-options1" class="form-control">
+						{{ input('saved-options1') }}
 							It are the options that you saved in the "Options" tab
 					</div>
 					<textarea name="option" title="Options thru" cols=80 rows=5 id="optionsInput1" placeholder="acl test hdr_beg(host) -i some_host"></textarea>
@@ -513,9 +334,9 @@ h3 {
 			<td class="addName">Default backend</td>
 			<td class="addOption">
 				<div style="font-size: 12px; padding-bottom: 10px;">Start typing backend, or press down</div>
-				<input  name="backend" id="backends" required size="30" placeholder="some_backend" class="form-control">
+				{{ input('backends', name='backends', placeholder="some_backend", size='30') }}
 				<span style="font-size: 12px; padding-left: 10px;"> .</span>
-				<p style="font-size: 12px"><b>Note:</b> If backend don\t exist, you must <a href="#" style="color: #23527c"  title="Create backend" class="redirectBackend">create backend first</a>.</p>
+				<p style="font-size: 12px"><b>Note:</b> If backend don't exist, you have to <a href="#" style="color: #23527c"  title="Create backend" class="redirectBackend">create backend first</a>.</p>
 			</td>
 		</tr>
 		<tr class="advance-show">
@@ -565,16 +386,15 @@ h3 {
 		<tr>
 			<td class="addName">Name:</td>
 			<td class="addOption">
-				<input type="text" name="new_backend" id="new_backend" required title="Name backend"  placeholder="web_80" class="form-control">
+				{{ input('new_backend', title="Name backend", placeholder="web_80", required='required') }}
 			</td>
 		</tr>
 		<tr class="advance">
 			<td class="addName">Mode: </td>
 			<td class="addOption">
-				<select required name="mode" id="backend-mode-select">
-					<option value="http" selected>http</option>
-					<option value="tcp">tcp</option>
-				</select>
+				{% set values = dict() %}
+				{% set values = {'http':'http','tcp':'tcp'} %}
+				{{ select('backend-mode-select', name='mode', values=values, selected='http', required='required', class='force_close') }}
 				<span id="https-backend-span">
 					<label for="https-backend" style="margin-top: 5px;">SSL enabled on frontend?</label>
 					<input type="checkbox" id="https-backend" name="ssl" value="https">
@@ -586,23 +406,19 @@ h3 {
 		</tr>
 		<tr class="advance">
 			<td class="addName">Balance: </td>
-			<td class="addOption">
-				<select required name="balance">
-					<option value="roundrobin" selected>roundrobin</option>
-					<option value="source">source</option>
-					<option value="leastconn">leastconn</option>
-					<option value="first">first</option>
-					<option value="rdp-cookie">rdp-cookie</option>
-				</select>
-			</td>
+				<td class="addOption">
+					{% set values = dict() %}
+					{% set values = {'roundrobin':'roundrobin','source':'source','leastconn':'leastconn', 'first':'first', 'rdp-cookie':'rdp-cookie'} %}
+					{{ select('balance', values=values, selected='roundrobin', required='required', class='force_close') }}
+				</td>
 		</tr>
 		<tr class="advance">
 			<td class="addName"><span title="Cache support start 1.8 and latter">Web acceleration(?):</span></td>
 			<td class="addOption">
 				<span class="controlgroup">
-					<label for="compression3" title="Enable Compression">Compression</label><input type="checkbox" id="compression3" name="compression" value="1">
-					<label for="cache3" title="Enable Compression">Cache</label><input type="checkbox" id="cache3" name="cache" value="2">
-					<label for="ssl_offloading2" title="Enable SSL Offloading">SSL Offloading</label><input type="checkbox" id="ssl_offloading2">
+					{{ checkbox('compression3', title='Enable Compression', value='1', desc='Compression') }}
+					{{ checkbox('cache3', title='Enable cache', value='2', desc='Cache') }}
+					{{ checkbox('ssl_offloading2', title='Enable SSL Offloading', desc='SSL Offloading') }}
 				</span>
 			</td>
 		</tr>
@@ -610,47 +426,35 @@ h3 {
 			<td class="addName">Optinons:</td>
 			<td class="addOption">
 				<span class="controlgroup">					
-					<label for="forward_for2" title="Option Forward for if none">Forward for</label><input type="checkbox" id="forward_for2">
-					<label for="redispatch2" title="Enable Redispatch">Redispatch</label><input type="checkbox" id="redispatch2">				
-					<select name="force_close" class="force_close">
-						<option disabled selected>Force HTTP close</option>
-						<option>Off</option>
-						<option value="1">Server only</option>
-						<option value="2">Force close</option>
-						<option value="3">Pretend keep alive</option>
-					</select>	
-					<label for="cookie2" title="Enable Redispatch">Set cookie</label><input type="checkbox" id="cookie2" name="cookie" value="1">				
-					<label for="options-backend-show" title="Set options manualy">Set options</label><input type="checkbox" id="options-backend-show">
+					{{ checkbox('forward_for2', title='Option Forward for if none', desc='Forward for') }}
+					{{ checkbox('redispatch2', title='Enable Redispatch', desc='Redispatch') }}	
+					{% set values = dict() %}
+					{% set values = {'Off':'Off','Server only':'Server only','Force close':'Force close','Pretend keep alive':'Pretend keep alive'} %}
+					{{ select('force_close', values=values, first='Force HTTP close', class='force_close') }}	
+					{{ checkbox('cookie2', title='Set cookie', desc='Set cookie', value='1') }}
+					{{ checkbox('options-backend-show', title='Set options manualy', desc='Set options') }}
 				</span>
 				<br>
 				<span id="cookie_div2" style="display: none;">
 					<input type="text" placeholder="name" name="cookie_name" id="cookie_name2" class="form-control"><br><br>
 					<input type="text" placeholder="domain" name="cookie_domain" class="form-control"><br><br>
 					<span class="controlgroup">
-						<select name="rewrite" id="rewrite2">
-							<option disabled selected>rewrite/indirect/insert</option>
-							<option>None</option>
-							<option value="rewrite">rewrite</option>
-							<option value="indirect">indirect</option>
-							<option value="insert">insert</option>
-						</select>
-						<label for="prefix2" title="This keyword indicates that instead of relying on a dedicated cookie for the persistence, an existing one will be completed.">prefix</label>
-						<input type="checkbox" name="prefix" value="prefix" id="prefix2">
-						<label for="nocache2" title="This option is recommended in conjunction with the insert mode when there is a cache between the client and HAProxy.">nocache</label>
-						<input type="checkbox" name="nocache" value="nocache" id="nocache2">
-						<label for="postonly2" title="This option ensures that cookie insertion will only be performed on responses to POST requests..">postonly</label>
-						<input type="checkbox" name="postonly" value="postonly" id="postonly2">
-						<label for="dynamic2" title="Activate dynamic cookies. When used, a session cookie is dynamically created for each server.">dynamic</label>
-						<input type="checkbox" name="dynamic" value="dynamic" id="dynamic2">
+						{% set values = dict() %}
+						{% set values = {'None':'None','rewrite':'rewrite','indirect':'indirect','insert':'insert'} %}
+						{{ select('rewrite2', values=values, first='rewrite/indirect/insert', class='force_close') }}	
+						{{ checkbox('prefix2', name='prefix', title='This keyword indicates that instead of relying on a dedicated cookie for the persistence, an existing one will be completed', desc='prefix', value='prefix') }}
+						{{ checkbox('nocache2', name='nocache', title='This option is recommended in conjunction with the insert mode when there is a cache between the client and HAProxy', desc='nocache', value='nocache') }}
+						{{ checkbox('postonly2', name='postonly', title='This option ensures that cookie insertion will only be performed on responses to POST requests', desc='postonly', value='postonly') }}
+						{{ checkbox('dynamic2', name='dynamic', title='Activate dynamic cookies. When used, a session cookie is dynamically created for each server', desc='dynamic', value='dynamic') }}
 						<span id="dynamic_div2" style="display: none;">
-							dynamic-cookie-key: <input type="text" placeholder="your-custom-key" name="dynamic-cookie-key" id="dynamic-cookie-key2" class="form-control">
+							dynamic-cookie-key: {{ input('dynamic-cookie-key2', name='dynamic-cookie-key', placeholder="your-custom-key") }}
 						</span>
 					</span>
 				</span>
 				<div id="options-backend-show-div" style="display: none;">
 					<div style="font-size: 12px; padding-bottom: 10px;">
 						<span style="padding-right: 10px;">Start typing options: </span>
-						<input type="text" id="options2" class="form-control">
+						{{ input('options2') }}
 						<span style="padding-left: 10px;">
 							or press down. <a href="http://cbonte.github.io/haproxy-dconv/1.7/configuration.html" target="_blanck" style="color: #23527c" title="HAproxy docs">Read more about options</a>
 						</span>
@@ -666,50 +470,29 @@ h3 {
 		<tr>
 			<td class="addName">Servers:</td>
 			<td class="addOption">
-				<span id="servers2">
-					<input name="servers" required title="Backend IP" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control">:
-					<input name="server_port" required title="Backend IP" size=1 placeholder="yyy" class="form-control">
-					<br />
-					<input name="servers" title="Backend port" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control">:
-					<input name="server_port" title="Backend port" size=1 placeholder="yyy" class="form-control">
-					<br />
-					<input name="servers" title="Backend port" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control">:
-					<input name="server_port" title="Backend port" size=1 placeholder="yyy" class="form-control">
-				</span>
-				<span>
-					<a class="add-server" id="add-server-input2" title="Add backend server" style="cursor: pointer;"></a>
-				</span>
+				{% include 'include/add_servers.html' %}
 			</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>
+					<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">
 					<span class="tooltip tooltipTop"> Default params: inter 2000 rise 2 fall 5</span>
 				</div>
 				<div class="controlgroup" id="controlgroup-backend" style="display: none;">
 					<label for="check-servers-backend" title="Ebable servers check">Check</label>
 					<input type="checkbox" id="check-servers-backend" name="check-servers" checked value="1">
-					<select name="inter" id="inter-backend">
-						<option value="inter" disabled selected>inter</option>
-						<option value="1000">1000</option>
-						<option value="2000">2000</option>
-						<option value="3000">3000</option>
-					</select>
-					<select name="rise" id="rise-backend">
-						<option value="rise" disabled selected>rise</option>
-						<option value="1">1</option>
-						<option value="2">2</option>
-						<option value="3">3</option>
-					</select>
-					<select name="fall" id="fall-backend">
-						<option value="fall" disabled selected>fall</option>
-						<option value="4">4</option>
-						<option value="5">5</option>
-						<option value="6">6</option>
-					</select>
+					{% set values = dict() %}
+					{% set values = {'1000':'1000','2000':'2000','3000':'3000'} %}
+					{{ select('inter-backend', values=values, first='inter', class='force_close') }}	
+					{% set values = dict() %}
+					{% set values = {'1':'1','2':'2','3':'3'} %}
+					{{ select('rise-backend', name='rise-listen', values=values, first='rise', class='force_close') }}
+					{% set values = dict() %}
+					{% set values = {'4':'4','5':'5','6':'6'} %}
+					{{ select('fall-backend', name='fall', values=values, first='fall', class='force_close') }}
 				</div>
 			</td>
 		</tr>
@@ -768,7 +551,7 @@ h3 {
 					</select>
 				</td>
 				<td valign="top" style="padding-top: 27px;">
-					<input type="text" id="ssl_name" class="form-control">
+					{{ input('ssl_name') }}
 				</td>
 				<td style="padding-top: 15px; padding-bottom: 15px;">
 					<textarea id="ssl_cert" cols="50" rows="5"></textarea><br /><br />
@@ -814,7 +597,7 @@ h3 {
 					Enter option for save:
 				</td>
 				<td style="width: 77%;">
-					<input type="text" name="new-option" id="new-option" class="form-control" size="60">
+					{{ input('new-option', size='60') }}
 				</td>
 				<td>
 					<a class="add-admin" id="add-option-new" title="Add new option" style="cursor: pointer;"></a>
@@ -866,10 +649,10 @@ h3 {
 			</tr>
 			<tr>
 				<td class="padding10 first-collumn">
-					<input type="text" name="new-saved-servers" id="new-saved-servers" class="form-control" size="15">
+					{{ input('new-saved-servers', size='15') }}
 				</td>
 				<td style="width: 77%;">
-					<input type="text" name="new-saved-servers-description" id="new-saved-servers-description" class="form-control" size="50">
+					{{ input('new-saved-servers-description', size='50') }}
 				</td>
 				<td>
 					<a class="add-admin" id="add-saved-server-new" title="Add new server" style="cursor: pointer;"></a>
@@ -911,14 +694,14 @@ h3 {
 			<tr>
 				<td class="addName">Userlist name:</td>
 				<td class="addOption">
-					<input type="text" name="new_userlist" id="new_userlist" required title="Userlist name"  placeholder="basic-auth-list" class="form-control">
+					{{ input('new_userlist', required='required', title="Userlist name", placeholder="basic-auth-list") }}
 				</td>
 			</tr>
 			<tr>
 				<td class="addName">Groups:</td>
 				<td class="addOption">
 					<span id="userlist-groups">
-						<input name="userlist-group" title="User`s group" placeholder="group_name" class="form-control">			
+						{{ input('userlist-group', title="User`s group", placeholder="group_name") }}			
 					</span>
 					<span>
 						<a class="add-server" id="add-userlist-group" title="Add extra group" style="cursor: pointer;"></a>
@@ -930,9 +713,9 @@ h3 {
 				<td class="addName">User:</td>
 				<td class="addOption">
 					<span id="userlist-users">
-						<input name="userlist-user" required title="User name" placeholder="user_name" class="form-control">	
-						<input name="userlist-password" required title="User password. By default it insecure-password" placeholder="password" class="form-control">	
-						<input name="userlist-user-group" title="User`s group" placeholder="user`s group" class="form-control">			
+						{{ input('userlist-user', required='required', title="User name", placeholder="user_name") }}	
+						{{ input('userlist-password', required='required', title="User password. By default it insecure-password", placeholder="password") }}	
+						{{ input('userlist-user-group', title="User`s group",  placeholder="user`s group") }}			
 					</span>
 					<span>
 						<a class="add-server" id="add-userlist-user" title="Add extra user" style="cursor: pointer;"></a>
@@ -956,20 +739,19 @@ h3 {
 				<b>here</b>
 			</a>
 		</div>
-	</div>
-	
-	<div id="dialog-confirm-delete" title="Are you sure you want to delete?" style="display: none;">
-	  <p><span class="ui-icon ui-icon-alert" style="float:left; margin:3px 12px 20px 0;"></span>Deleting all data will be lost?</p>
-	</div>
-	<div id="dialog-confirm" title="View certificate " style="display: none;">
+	</div>	
+	{% include 'include/del_confirm.html' %}
+	<div id="dialog-confirm-cert" title="View certificate " style="display: none;">
 		<center><pre id="dialog-confirm-body"></pre></center>
 	</div>
 	<input type="hidden" id="group" value="{{ group }}">
 </div>
 </div>
 <script>
-$( ".force_close" ).selectmenu({
-  width: 180
+$( function() {
+	$( ".force_close" ).selectmenu({
+	  width: 180
+	});
 });
 </script>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin.html b/app/templates/admin.html
index a8aedc9b..aeb98c9c 100644
--- a/app/templates/admin.html
+++ b/app/templates/admin.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block content %}
+{% from 'include/input_macros.html' import input %}
 <style>
 .container {
 	margin-right: 0;
@@ -7,9 +8,7 @@
 </style>
 <script src="/inc/users.js"></script>
 <script src="/inc/fontawesome.min.js"></script>
-<div id="dialog-confirm" title="Are you sure you want to delete?" style="display: none;">
-  <p><span class="ui-icon ui-icon-alert" style="float:left; margin:3px 12px 20px 0;"></span>Deleting irreversibly all data will be lost?</p>
-</div>
+{% include 'include/del_confirm.html' %}
 <div id="tabs">
 	<ul>
 		<li><a href="#users">Users</a></li>
@@ -19,11 +18,7 @@
 		<li><a href="#checker">Checker</a></li>
 		<li><a href="#settings">Settings</a></li>
 		<li><a href="#updatehapwi">Update</a></li>
-		{% if user %}
-			<a href=/app/login.py?logout=logout title="Logout, user name: {{ user }}" class="login"> Logout</a>						
-		{% else %}
-			<a href=/app/login.py title="Login" class="login"> Login</a>
-		{% endif %}
+		{% include 'include/login.html' %}
 	</ul>
 	<div id="users">
 		<table class="overview" id="ajax-users">
@@ -64,34 +59,7 @@
 			</script>
 		{% for user in users %}
 			<tr id="user-{{user.0}}" class="{{ loop.cycle('odd', 'even') }}">
-				<td class="padding10 first-collumn">
-					{% if user.6 == 1%}
-						<input type="text" id="login-{{user.0}}" value="{{user.1}}" class="form-control" readonly>
-					{% else %}
-						<input type="text" id="login-{{user.0}}" value="{{user.1}}" class="form-control">
-					{% endif %}
-				</td> 
-				<td>
-					{% if user.6 != 1%}
-					<span  title="Change password" style="cursor: pointer">
-						<img src="/inc/images/edit.png" alt="Edit" width="15" style="margin-bottom: -3px; padding-left: 15px;" onclick="openChangeUserPasswordDialog('{{user.0}}')" />
-					</span>
-					{% endif %}
-				</td>
-				<td class="checkbox">
-					{% if user.7 == 1 %}
-						<label for="activeuser-{{user.0}}"></label><input type="checkbox" id="activeuser-{{user.0}}" checked>
-					{% else %}
-						<label for="activeuser-{{user.0}}"></label><input type="checkbox" id="activeuser-{{user.0}}">
-					{% endif %}
-				</td>
-				<td>
-					{% if user.6 == 1%}
-						<input type="text" id="email-{{user.0}}" value="{{user.2}}" class="form-control" readonly>
-					{% else %}
-						<input type="text" id="email-{{user.0}}" value="{{user.2}}" class="form-control">
-					{% endif %}
-				</td>
+				{% include 'include/admin_users.html' %}
 				<td>
 					<select id="role-{{user.0}}" name="role-{{user.0}}">
 						<option disabled selected>Choose role</option>
@@ -145,7 +113,7 @@
 				<td class="padding10 first-collumn">
 					<input type="text" id="name-{{ group.0 }}" value="{{ group.1 }}" class="form-control">
 				</td>
-				<td>
+				<td style="width: 100%;">
 					{% if group.2  != "None" %}
 						<input type="text" id="descript-{{ group.0 }}" value="{{ group.2 }}" class="form-control" size="60">
 					{% else %}
@@ -169,10 +137,10 @@
 			</tr>
 			<tr>
 				<td class="padding10 first-collumn">
-					<input type="text" name="new-group-add" id="new-group-add" class="form-control">
+					{{ input('new-group-add') }}
 				</td>
 				<td>
-					<input type="text" name="new-desc" id="new-desc" class="form-control" size="100">
+					{{ input('new-desc', size="60") }}
 				</td>
 				<td>
 					<a class="add-admin" id="add-group" title="Add new group" style="cursor: pointer;"></a>
@@ -200,8 +168,7 @@
 				<td>Description</td>
 				<td></td>
 				<td></td>
-			</tr>
-						
+			</tr>						
 		{% for server in servers %}
 			<tr id="server-{{server.0}}" class="{{ loop.cycle('odd', 'even') }}">
 				<td class="padding10 first-collumn">
@@ -225,81 +192,7 @@
 						{% endfor %}
 					</select>
 				</td>
-				<td class="checkbox">
-					{% if server.5 == 1 %}
-						<label for="enable-{{server.0}}"></label><input type="checkbox" id="enable-{{server.0}}" checked>
-					{% else %}
-						<label for="enable-{{server.0}}"></label><input type="checkbox" id="enable-{{server.0}}">
-					{% endif %}
-				</td>
-				<td class="checkbox">
-					{% if server.4 == 1 %}
-						<label for="typeip-{{server.0}}"></label><input type="checkbox" id="typeip-{{server.0}}" checked>
-					{% else %}
-						<label for="typeip-{{server.0}}"></label><input type="checkbox" id="typeip-{{server.0}}">
-					{% endif %}
-				</td>
-				<td class="checkbox">
-					{% if server.8 == 1 %}
-						<label for="alert-{{server.0}}"></label><input type="checkbox" id="alert-{{server.0}}" checked>
-					{% else %}
-						<label for="alert-{{server.0}}"></label><input type="checkbox" id="alert-{{server.0}}">
-					{% endif %}
-				</td>
-				<td class="checkbox">
-					{% if server.9 == 1 %}
-						<label for="metrics-{{server.0}}"></label><input type="checkbox" id="metrics-{{server.0}}" checked>
-					{% else %}
-						<label for="metrics-{{server.0}}"></label><input type="checkbox" id="metrics-{{server.0}}">
-					{% endif %}
-				</td>
-				<td class="checkbox">
-					{% if server.12 == 1 %}
-						<label for="active-{{server.0}}"></label><input type="checkbox" id="active-{{server.0}}" checked>
-					{% else %}
-						<label for="active-{{server.0}}"></label><input type="checkbox" id="active-{{server.0}}">
-					{% endif %}
-				</td>
-				<td>
-					<select id="slavefor-{{server.0}}">
-						<option value="0" selected>Not slave</option>
-						{% for master in masters %}
-							{% if master.0 == server.6 %}
-								<option value="{{master.0}}" selected>{{master.1}}</option>
-							{% else %}
-								<option value="{{master.0}}">{{master.1}}</option>
-							{% endif %}
-						{% endfor %}
-					</select>
-				</td>
-				<td>
-					<div class="controlgroup">
-						<select id="credentials-{{server.0}}">
-							<option disabled selected>Choose credentials</option>
-							{% for ssh in sshs %}
-								{% if ssh.0 == server.7	%}
-									<option value="{{ssh.0}}" selected>{{ssh.1}}</option>
-								{% else %}
-									<option value="{{ssh.0}}">{{ssh.1}}</option>
-								{% endif %}
-							{% endfor %}
-						</select>
-						<button onclick="checkSshConnect('{{server.2}}')" title="Check SSH connect to the server {{server.1}}">check</button>
-					</div>
-				</td>
-				<td>
-					{% if server.11  != "None" %}
-						<input type="text" id="desc-{{server.0}}" value="{{server.11}}" size="20" class="form-control">
-					{% else %}
-						<input type="text" id="desc-{{server.0}}" value="" size="20" class="form-control">
-					{% endif %}
-				</td>
-				<td>
-					<a class="add" onclick="cloneServer({{server.0}})" id="clone-{{server.0}}" title="Clone {{server.1}}" style="cursor: pointer;"></a>
-				</td> 
-				<td>
-					<a class="delete" onclick="confirmDeleteServer({{server.0}})" title="Delete server {{server.1}}" style="cursor: pointer;"></a>
-				</td> 
+				{% include 'include/admin_servers.html' %}
 			</tr>
 		{% endfor %}
 		</table>
@@ -378,7 +271,7 @@
 			</tr>
 			<tr>
 				<td class="padding10 first-collumn">
-					<input type="text" name="new-ssh-add" id="new-ssh-add" class="form-control">
+					{{ input('new-ssh-add') }}	
 				</td>
 				<td>
 					<label for="new-ssh_enable">Enable SSH key</label><input type="checkbox" id="new-ssh_enable" checked>
@@ -392,9 +285,9 @@
 				</td>
 				<td style="padding-top: 15px;">
 					<p>
-						<input type="text" id="ssh_user" class="form-control" value="{{ssh_user}}">		
+						{{ input('ssh_user', value=ssh_user) }}	
 					</p>
-						<input type="password" id="ssh_pass" class="form-control" value="{{ssh_pass}}" style="display: none;">
+						{{ input('ssh_pass', type='password', value=ssh_pass, style="display: none;") }}
 					<br>
 				</td>
 				<td>
@@ -486,10 +379,10 @@
 			</tr>
 			<tr>
 				<td class="padding10 first-collumn">
-					<input type="text" name="telegram-token-add" id="telegram-token-add" class="form-control">
+					{{ input('telegram-token-add') }}
 				</td>
 				<td>
-					<input type="text" id="telegram-chanel-add" class="form-control">
+					{{ input('telegram-chanel-add') }}	
 				</td>
 				<td>
 					<select id="new-telegram-group-add" name="new-telegram-group-add">
@@ -575,8 +468,7 @@
 			<td class="padding10">
 				<b>{{new_ver}}</b>
 			</td>
-			<td>
-				
+			<td>			
 				{% if new_ver_without_dots > current_ver_without_dots and new_ver != "Sorry cannot get current version" %}
 				<a class="ui-button ui-widget ui-corner-all" id="update_haproxy_wi" title="Update HAProxy">Update</a>
 				{% endif %}
@@ -585,11 +477,9 @@
 		<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
 			<b style="font-size: 20px; display: block; padding-bottom: 10px;">Note:</b>
 			For update you have to use HAProxy-WI repository. How start use repository read <a href="https://haproxy-wi.org/installation.py" title="HAProxy-WI installation" target="_blank">here</a>	
-			<br />
-			<br />
+			<br /><br />
 			If server uses proxy to connection Internet add proxy settings in yum.conf
-			<br />
-			<br />
+			<br /><br />
 			Read more about update in <a href="https://haproxy-wi.org/updates.py" title="Doc" target="_blank">docs</a>
 			and <a href="https://haproxy-wi.org/changelog.py" title="Changelog" target="_blank">changelog</a>
 		</div>
@@ -598,46 +488,7 @@
 </div>
 <div id="user-add-table" style="display: none;">	
 	<table class="overview">
-		<tr>
-			<td colspan="2">
-				  <p class="validateTips alert alert-success">Form fields tag "<span class="need-field">*</span>" are required.</p>
-			</td>
-		</tr>
-		<tr>
-			<td class="padding20">
-				New user
-				<span class="need-field">*</span>
-			</td>
-			<td>
-				<input type="text" name="new-username" id="new-username" class="form-control">
-				{% if ldap_enable == '1' %}
-					<a href="#" title="Search user in AD" id="search_ldap_user">Search user in AD</a>
-				{% endif %}
-			</td>
-		</tr>
-		<tr>
-			<td class="padding20">
-				Password
-				<span class="need-field">*</span>
-			</td>
-			<td>
-				<input type="password" name="new-password" id="new-password" class="form-control">
-			</td>
-		</tr>
-		<tr>
-			<td class="padding20">Active</td>
-			<td>
-				<label for="activeuser"></label><input type="checkbox" id="activeuser" checked>
-			</td>
-		</tr>
-		<tr>
-			<td class="padding20">
-				Email
-			</td>
-			<td>
-				<input type="text" name="new-email" id="new-email" class="form-control">
-			</td>
-		</tr>
+		{% include 'include/admin_add_user.html' %}
 		<tr>
 			<td class="padding20">
 				Role
@@ -670,96 +521,12 @@
 </div>
 <div id="server-add-table" title="View certificate " style="display: none;">	
 	<table class="overview">
+		{% include 'include/admin_add_server.html' %}
 		<tr>
-			<td colspan="2">
-				  <p class="validateTips alert alert-success">Form fields tag "<span class="need-field">*</span>" are required.</p>
+			<td class="padding20">
+				Credentials
+				<span class="need-field">*</span>
 			</td>
-		</tr>
-			<tr>
-				<td class="padding20">
-					New hostname
-					<span class="need-field">*</span>
-				</td>
-				<td>
-					<input type="text" name="new-server-add" id="new-server-add" class="form-control">
-				</td>
-			<tr>
-				<td class="padding20">
-					IP
-					<span class="need-field">*</span>
-				</td>
-				<td>
-					<input type="text" name="new-ip" id="new-ip" size="14" class="form-control">
-				</td>
-			<tr>
-				<td class="padding20" title="SSH port">
-						Port
-						<span class="need-field">*</span>
-				</td>
-				<td>
-					<input type="text" name="new-port" id="new-port" size=1 class="form-control" value="22">
-				</td>
-			</tr>
-			<tr>
-				<td class="padding20">
-					Group
-					<span class="need-field">*</span>
-				</td>
-				<td>
-					<select id="new-server-group-add" name="new-server-group-add">
-						<option disabled selected value="0">Choose group</option>
-						{% for group in groups %}
-							<option value="{{ group.0 }}">{{ group.1 }}</option>
-						{% endfor %}
-					</select>
-				</td>
-			</tr>
-			<tr>
-				<td class="padding20">Enable</td>
-				<td>
-					<label for="enable"></label><input type="checkbox" id="enable" checked>
-				</td>
-			</tr>
-			<tr>
-				<td class="padding20" title="Vitrual IP, something like VRRP">Virt</td>
-				<td>
-					<label for="typeip"></label><input type="checkbox" id="typeip" name="typeip">
-				</td>
-			</tr>
-			<tr>
-				<td class="padding20" title="Alert if backend change status">Alert</td>
-				<td>
-					<label for="alert"></label><input type="checkbox" id="alert">
-				</td>
-			</tr>
-			<tr>
-				<td class="padding20" title="Enable save and show metrics">Metrics</td>
-				<td>
-					<label for="metrics"></label><input type="checkbox" id="metrics">
-				</td>
-			</tr>
-			<tr>
-			<td class="padding20" title="Keep start HAProxy service if down">Start</td>
-			<td>
-				<label for="active"></label><input type="checkbox" id="active">
-			</td>
-		</tr>
-			<tr>
-				<td class="padding20" title="Actions with master config will automatically apply on slave">Slave for</td>
-				<td>
-					<select id="slavefor">
-						<option value="0" selected>Not slave</option>
-						{% for master in masters %}
-							<option value="{{master.0}}">{{master.1}}</option>
-						{% endfor %}
-					</select>
-				</td>
-			</tr>
-			<tr>
-				<td class="padding20">
-					Credentials
-					<span class="need-field">*</span>
-				</td>
 			<td>
 				<select id="credentials" required>
 					<option disabled selected>Choose credentials</option>
@@ -768,45 +535,25 @@
 					{% endfor %}
 				</select>
 			</td>
-			</tr>
-			<tr>
-				<td class="padding20">Description</td>
-				<td>
-					<input type="text" id="desc" size="30" class="form-control">
-				</td>
-			</tr>
-		</table>
-	</div>	
-	<div id="user-change-password-table" style="display: none;">	
-		<table class="overview">
-			<tr>
-				<td colspan="2">
-					  <p class="validateTips alert alert-success">Enter password and confirm</p>
-				</td>
-			</tr>
-			<tr>
-				<td class="padding20">
-					Password				
-				</td>
-				<td>
-					<input type="password" name="change-password" id="change-password" class="form-control">
-				</td>
-			</tr>
-			<tr>
-				<td class="padding20">
-					Confirm password
-				</td>
-				<td>
-					<input type="password" name="change2-password" id="change2-password" class="form-control">
-				</td>
-			</tr>
-			<tr id="missmatchpass" style="display: none;">
-				<td colspan="2">
-					  <p class="validateTips alert alert-danger" style="margin-top: 10px;">Passwords are mismatched</p>
-				</td>
-			</tr>
-		</table>
-	</div>
+		</tr>
+		<tr>
+			<td class="padding20">
+				Group
+				<span class="need-field">*</span>
+			</td>
+			<td>
+				<select id="new-server-group-add" name="new-server-group-add">
+					<option disabled selected value="0">Choose group</option>
+					{% for group in groups %}
+						<option value="{{ group.0 }}">{{ group.1 }}</option>
+					{% endfor %}
+				</select>
+			</td>
+		</tr>
+		
+	</table>
+</div>	
+{% include 'include/change_pass_form.html' %}
 <style>
 .ui-selectmenu-button.ui-button {
     width: 10em;
diff --git a/app/templates/ajax/config_show.html b/app/templates/ajax/config_show.html
index 360c32f0..7813a070 100644
--- a/app/templates/ajax/config_show.html
+++ b/app/templates/ajax/config_show.html
@@ -72,7 +72,7 @@
 			{% continue %} 
 		{% endif %}
 		{% if line.startswith('backend') %}
-			</div><span class="param"> {{ line }} 
+			</div><span class="param">{{ line }} 
 				{% if role %}
 					<span class="accordion-link">
 						<a href="/app/sections.py?serv={{serv}}&section={{ line }}">Edit</a>
@@ -86,7 +86,7 @@
 			{% continue %}
 		{% endif %}
 		{% if line.startswith('cache') %}
-			</div><span class="param"> {{ line }} 
+			</div><span class="param">{{ line }} 
 				{% if role %}
 					<span class="accordion-link">
 						<a href="/app/sections.py?serv={{serv}}&section={{ line }}">Edit</a>
@@ -96,7 +96,7 @@
 			{% continue %}
 		{% endif %}
 		{% if line.startswith('peers') %}
-			</div><span class="param"> {{ line }}
+			</div><span class="param">{{ line }}
 				{% if role %}
 					<span class="accordion-link">
 						<a href="/app/sections.py?serv={{serv}}&section={{ line }}">Edit</a>
@@ -106,7 +106,7 @@
 			{% continue %}
 		{% endif %}
 		{% if line.startswith('userlist') %}
-			</div><span class="param"> {{ line }}
+			</div><span class="param">{{ line }}
 				{% if role %}
 					<span class="accordion-link">
 						<a href="/app/sections.py?serv={{serv}}&section={{ line }}">Edit</a>
@@ -131,7 +131,7 @@
 				<span class="numRow">
 					{{ i }}
 				</span>
-				{{ line }}
+					{{ line }}
 			</span><br />
 			{% continue %}	
 		{% endif %}
@@ -142,7 +142,6 @@
 			</span><br />	
 		{% endif %}
 	{% endfor %}
-
 	</div>
 	</div>
 	{% if configver %}
@@ -158,4 +157,4 @@
 		</form>
 		<div class="alert alert-info"><b>Note:</b> If you reconfigure Master server, Slave will reconfigured automatically</div>
 	</center>
-	{% endif %}
+	{% endif %}
\ No newline at end of file
diff --git a/app/templates/ajax/new_group.html b/app/templates/ajax/new_group.html
index 41fb49d9..e8fbc644 100644
--- a/app/templates/ajax/new_group.html
+++ b/app/templates/ajax/new_group.html
@@ -3,8 +3,8 @@
 		<td class="padding10 first-collumn">
 			<input type="text" id="name-{{ group.0 }}" value="{{ group.1 }}" class="form-control">
 		</td>
-		<td>
-			<input type="text" id="descript-{{ group.0 }}" value="{{ group.2 }}" class="form-control" size="100">
+		<td style="width: 100%;">
+			<input type="text" id="descript-{{ group.0 }}" value="{{ group.2 }}" class="form-control" size="60">
 		</td>
 		<td>
 			<a class="delete" onclick="removeGroup({{ group.0 }})"  style="cursor: pointer;"></a>
diff --git a/app/templates/ajax/new_server.html b/app/templates/ajax/new_server.html
index 777812a8..a85e9e16 100644
--- a/app/templates/ajax/new_server.html
+++ b/app/templates/ajax/new_server.html
@@ -1,5 +1,4 @@
 {% for server in servers %}
-	
 			<tr id="server-{{server.0}}" class="newserver">
 				<td class="padding10 first-collumn" style="padding-top: 20px;">
 					<input type="text" id="hostname-{{server.0}}" value="{{server.1}}" class="form-control">
@@ -26,82 +25,7 @@
 						{% endfor %}
 					</select>
 				{% endif %}
-				<td>
-					{% if server.5 == 1 %}
-						<label for="enable-{{server.0}}"></label><input type="checkbox" id="enable-{{server.0}}" checked>
-					{% else %}
-						<label for="enable-{{server.0}}"></label><input type="checkbox" id="enable-{{server.0}}">
-					{% endif %}
-				</td>
-				<td>
-					{% if server.4 == 1 %}
-						<label for="typeip-{{server.0}}"></label><input type="checkbox" id="typeip-{{server.0}}" checked>
-					{% else %}
-						<label for="typeip-{{server.0}}"></label><input type="checkbox" id="typeip-{{server.0}}">
-					{% endif %}
-				</td>
-				<td>
-					{% if server.8 == 1 %}
-						<label for="alert-{{server.0}}"></label><input type="checkbox" id="alert-{{server.0}}" checked>
-					{% else %}
-						<label for="alert-{{server.0}}"></label><input type="checkbox" id="alert-{{server.0}}">
-					{% endif %}
-				</td>
-				<td>
-					{% if server.9 == 1 %}
-						<label for="metrics-{{server.0}}"></label><input type="checkbox" id="metrics-{{server.0}}" checked>
-					{% else %}
-						<label for="metrics-{{server.0}}"></label><input type="checkbox" id="metrics-{{server.0}}">
-					{% endif %}
-				</td>
-				<td>
-					{% if server.11 == 1 %}
-						<label for="active-{{server.0}}"></label><input type="checkbox" id="active-{{server.0}}" checked>
-					{% else %}
-						<label for="active-{{server.0}}"></label><input type="checkbox" id="active-{{server.0}}">
-					{% endif %}
-				</td>
-				<td>
-					<select id="slavefor-{{server.0}}">
-						<option value="0" selected>Not slave</option>
-						{% for master in masters %}
-							{% if master.0 == server.6 %}
-								<option value="{{master.0}}" selected>{{master.1}}</option>
-							{% else %}
-								<option value="{{master.0}}">{{master.1}}</option>
-							{% endif %}
-						{% endfor %}
-					</select>
-				</td>
-				<td>
-					<div class="controlgroup">
-						<select id="credentials-{{server.0}}">
-							<option value="0" selected>Choose credentials</option>
-							{% for ssh in sshs %}
-								{% if ssh.0 == server.7	%}
-									<option value="{{ssh.0}}" selected>{{ssh.1}}</option>
-								{% else %}
-									<option value="{{ssh.0}}">{{ssh.1}}</option>
-								{% endif %}
-							{% endfor %}
-						</select>
-						<button onclick="checkSshConnect('{{server.2}}')" title="Check SSH connect to the server {{server.1}}">check</button>
-					</div>
-				</td>
-				<td>
-					{% if server.11  != "None" %}
-						<input type="text" id="desc-{{server.0}}" value="{{server.11}}" size="20" class="form-control">
-					{% else %}
-						<input type="text" id="desc-{{server.0}}" value="" size="20" class="form-control">
-					{% endif %}
-				</td>
-				<td>
-					<a class="add" onclick="cloneServer({{server.0}})" id="clone-{{server.0}}" title="Clone {{server.1}}" style="cursor: pointer;"></a>
-				</td> 
-				<td>
-					<a class="delete" onclick="removeServer({{server.0}})" title="Delete server {{server.1}}" style="cursor: pointer;"></a>
-				</td> 
-			</tr>
+				{% include 'include/admin_servers.html' %}
 	<script>
 		$( function() {
 			$("#servergroup-{{ server.0}}" ).selectmenu({
diff --git a/app/templates/ajax/new_user.html b/app/templates/ajax/new_user.html
index 3af588e7..8a125203 100644
--- a/app/templates/ajax/new_user.html
+++ b/app/templates/ajax/new_user.html
@@ -1,25 +1,6 @@
 {% for user in users %}
 			<tr id="user-{{user.0}}" class="newuser">
-				<td class="padding10 first-collumn">
-					<input type="text" id="login-{{user.0}}" value="{{user.1}}" class="form-control">
-				</td> 
-				<td>
-					{% if user.6 != 1%}
-					<span  title="Change password" style="cursor: pointer">
-						<img src="/inc/images/edit.png" alt="Edit" width="15" style="margin-bottom: -3px; padding-left: 15px;" onclick="openChangeUserPasswordDialog('{{user.0}}')" />
-					</span>
-					{% endif %}
-				</td>
-				<td class="checkbox">
-					{% if user.7 == 1 %}
-						<label for="activeuser-{{user.0}}"></label><input type="checkbox" id="activeuser-{{user.0}}" checked>
-					{% else %}
-						<label for="activeuser-{{user.0}}"></label><input type="checkbox" id="activeuser-{{user.0}}">
-					{% endif %}
-				</td>
-				<td>
-					<input type="text" id="email-{{user.0}}" value="{{user.2}}" class="form-control">
-				</td>
+				{% include 'include/admin_users.html' %}
 				<td>
 					<select id="role-{{user.0}}" name="role-{{user.0}}">
 						<option disabled selected>Choose role</option>
diff --git a/app/templates/ajax/overivewWaf.html b/app/templates/ajax/overivewWaf.html
index ae6be558..4ea75e20 100644
--- a/app/templates/ajax/overivewWaf.html
+++ b/app/templates/ajax/overivewWaf.html
@@ -14,7 +14,7 @@
 			<td>
 			{% if role <= 1 %}
 				<a id="{{ service.1 }}" class="start-waf" title="Start WAF service">
-					<img src=/inc/images/start.png alt="start" class="icon" style="margin-bottom: -2px;">
+					<img src=/inc/images/start.png alt="start" class="icon" style="margin-bottom: -4px;">
 				</a>
 				<a id="{{ service.1 }}" class="stop-waf" title="Stop WAF service">
 					<img src=/inc/images/stop.png alt="start" class="icon" width="17px">
diff --git a/app/templates/ajax/show_compare_configs.html b/app/templates/ajax/show_compare_configs.html
index 5eb58379..c790164f 100644
--- a/app/templates/ajax/show_compare_configs.html
+++ b/app/templates/ajax/show_compare_configs.html
@@ -1,3 +1,4 @@
+{% from 'include/input_macros.html' import input %}
 <form action="diff.py#diff" method="get">
 	<center>
 		<h4>
@@ -22,9 +23,8 @@
 					<option value="{{ file }}">{{ file.split('-', maxsplit=1)[1] }}</option>
 				{% endfor %}
 			</select>
-	
-			<input type="hidden" value="{{ serv }}" name="serv">
-			<input type="hidden" value="open" name="open">
+			{{ input('serv', value=serv) }}
+			{{ input('open', type='hidden', value='open') }}
 			<a class="ui-button ui-widget ui-corner-all" id="show" title="Compare" onclick="showCompare()">Show</a>
 		</p>
 	</center>
diff --git a/app/templates/base.html b/app/templates/base.html
index d5b7eee5..895fd91c 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -52,19 +52,19 @@
 				<nav id="menu">
 					<ul class="menu">
 						{% if user %}	
-						<li><a href=/app/overview.py title="Server and service status" class="overview-link">Overview</a></li>
+						<li><a href="/app/overview.py" title="Server and service status" class="overview-link">Overview</a></li>
 						<li class="p_menu"><a title="Statistics, monitoring and logs" class="stats">Monitoring</a>			
 							<ul class="v_menu">
-								<li><a href=/app/viewsttats.py title="Show stats" class="stats head-submenu">Stats</a></li>
-								<li><a href=/app/logs.py title="View logs" class="logs head-submenu"> Logs</a></li>	
-								<li><a href=/app/edit.py title="Runtime API" class="runtime head-submenu">Runtime API</a></li>
-								<li><a href=/app/metrics.py title="Metrics" class="metrics head-submenu">Metrics</a></li>
+								<li><a href="/app/viewsttats.py" title="Show stats" class="stats head-submenu">Stats</a></li>
+								<li><a href="/app/logs.py" title="View logs" class="logs head-submenu"> Logs</a></li>	
+								<li><a href="/app/edit.py" title="Runtime API" class="runtime head-submenu">Runtime API</a></li>
+								<li><a href="/app/metrics.py" title="Metrics" class="metrics head-submenu">Metrics</a></li>
 							</ul>
 						</li>
 						<li class="p_menu"><a title="Actions with Haproxy configs" class="config-show">Haproxy</a>								
 							<ul class="v_menu">
-								<li><a href=/app/hapservers.py title="Working with Haproxy Configs" class="overview-link head-submenu">Overview</a> </li>
-								<li><a href=/app/config.py title="Working with HAProxy configs" class="edit head-submenu">Configs</a></li>
+								<li><a href="/app/hapservers.py" title="Working with Haproxy Configs" class="overview-link head-submenu">Overview</a> </li>
+								<li><a href="/app/config.py" title="Working with HAProxy configs" class="edit head-submenu">Configs</a></li>
 							{% if role <= 2 %}
 								<li><a href="/app/add.py#proxy" title="Add proxy" class="add head-submenu" id="add1">Add proxy</a></li>
 								<li><a href="/app/versions.py" title="Actions with configs versions" class="version head-submenu">Versions</a></li>
@@ -82,8 +82,8 @@
 							<li class="p_menu">
 								<a title="Keepalived" class="ha">Keepalived</a>
 								<ul class="v_menu">
-									<li><a href=/app/ha.py title="Create HA cluster" class="keepalived head-submenu">HA</a></li>
-									<li><a href=/app/keepalivedconfig.py title="Edit keepalived config" class="edit head-submenu">Edit config</a></li>		
+									<li><a href="/app/ha.py" title="Create HA cluster" class="keepalived head-submenu">HA</a></li>
+									<li><a href="/app/keepalivedconfig.py" title="Edit keepalived config" class="edit head-submenu">Edit config</a></li>		
 								</ul>
 							</li>
 							<li class="p_menu">
@@ -123,11 +123,7 @@
 			{% if h2 %}
 				<h2>
 					{{title}}
-					{% if user %}
-						<a href=/app/login.py?logout=logout title="Logout, user name: {{ user }}" class="login"> Logout</a>						
-					{% else %}
-						<a href=/app/login.py title="Login" class="login"> Login</a>
-					{% endif %}
+					{% include 'include/login.html' %}
 					{% if autorefresh %}
 						<span class="auto-refresh">
 							<a onclick="pauseAutoRefresh()" class="auto-refresh-pause" style="display: none; margin-top: 4px;"></a>
@@ -211,8 +207,7 @@
 			{% endif %}
 			{% block content %}{% endblock %}
 			<div id="ajax-compare"></div>
-			<div id="ajax"></div>
-			
+			<div id="ajax"></div>			
 		</div>	
 		<div id="show-updates" style="display: none;">	
 			<div>
diff --git a/app/templates/config.html b/app/templates/config.html
index 51eed515..d831d2e6 100644
--- a/app/templates/config.html
+++ b/app/templates/config.html
@@ -46,13 +46,7 @@
 	</p>
 	{% if not aftersave %}
 		{% if stderr or error %}
-			<div class="alert alert-danger" style="margin-bottom: 10px;">
-				Some errors:
-				<br> 
-				<br> 
-				{{stderr}} 
-				{{error}} 
-			</div>
+			{% include 'include/errors.html' %}
 		{% endif %}
 	{% endif %}
 	{% if config %}
@@ -79,15 +73,9 @@
 	{% if aftersave %}
 		<div class="alert alert-info">New config was saved as: {{ cfg }} </div>
 		{% if stderr or error %}
-			<div class="alert alert-danger">
-				Some errors:
-				<br> 
-				<br> 
-					{{stderr}} 
-					{{error}} 
-			</div>
+			{% include 'include/errors.html' %}
 		{% else %}
-			<div class="alert alert-success">Config ok</div>
+			<div class="alert alert-success">Config is ok</div>
 			<a href="viewsttats.py?serv={{ serv }}" target="_blank" title="View stats">Go to view stats</a>
 		{% endif %}
 		<script>window.history.pushState("Config", "Config", cur_url[0])</script>
diff --git a/app/templates/configver.html b/app/templates/configver.html
index ca6e07f0..ebe4b5c1 100644
--- a/app/templates/configver.html
+++ b/app/templates/configver.html
@@ -2,73 +2,47 @@
 {% block content %}
 <center>
 	<h3>Choose server</h3>
-	<p>
+	<p>	
 		<form action="{{ action }}" method="get">
 			<a class="ui-button ui-widget ui-corner-all" title="Return back" onclick="history.back()">Back</a>
-			<select autofocus required name="serv" id="{{ select_id }}">
-				<option disabled>Choose server</option>
-					{% for select in selects %}
-						{% if select.2 == serv %}
-							<option value="{{ select.2 }}" selected>{{ select.1 }}</option>
-						{% else %}
-							<option value="{{ select.2 }}">{{ select.1 }}</option>
-						{% endif %}
-					{% endfor %}
-			</select>
+			{% include 'include/select.html' %}
 			<button type="submit" value="open" name="open" class="btn btn-default">Open</button>
 		</form>
 	</p>
 	{% if not aftersave %}
 		{% if stderr or error %}
-			<div class="alert alert-danger" style="margin-bottom: 10px;">
-				Some errors:
-				<br> 
-				<br> 
-				{{stderr}} 
-				{{error}} 
-			</div>
+			{% include 'include/errors.html' %}
 		{% endif %}
 	{% endif %}
-
 	{% if open %}
 		<center>
 			<h4>Choose old version</h4>
-			<form action="configver.py#conf" method="get">
-				<p>
-					<select autofocus required name="configver" id="configver">
-						<option disabled selected>Choose version</option>
-							{% for file in return_files %}
-								{% if file == configver %}
-									<option value="{{file}}" selected>{{file.split('-', maxsplit=1)[1]}}</option>
-								{% else %}
-									<option value="{{file}}">{{file.split('-', maxsplit=1)[1]}}</option>
-								{% endif %}
-							{% endfor %}
-					</select>
-					<input type="hidden" value="{{serv}}" name="serv">
-					<input type="hidden" value="open" name="open">
-					<a class="ui-button ui-widget ui-corner-all" id="show" title="Enter" onclick="showUploadConfig()">Select</a>
-				</p>
-			</form> 
-			
+			<p>
+				<select autofocus required name="configver" id="configver">
+					<option disabled selected>Choose version</option>
+						{% for file in return_files %}
+							{% if file == configver %}
+								<option value="{{file}}" selected>{{file.split('-', maxsplit=1)[1]}}</option>
+							{% else %}
+								<option value="{{file}}">{{file.split('-', maxsplit=1)[1]}}</option>
+							{% endif %}
+						{% endfor %}
+				</select>
+				<input type="hidden" value="{{serv}}" name="serv">
+				<input type="hidden" value="open" name="open">
+				<a class="ui-button ui-widget ui-corner-all" id="show" title="Enter" onclick="showUploadConfig()">Select</a>
+			</p>		
 		</center>
 	{% endif %}
 	{% if aftersave %}
-		<div class="alert alert-info">Uploaded old config ver: {{ configver }} </div>
+		<div class="alert alert-info">Was uploaded old version of config: {{ configver }} </div>
 		{% if stderr or error %}
-			<div class="alert alert-danger">
-				Some errors:
-				<br> 
-				<br> 
-					{{stderr}} 
-					{{error}} 
-			</div>
-			
+			{% include 'include/errors.html' %}	
 		{% else %}
-			<div class="alert alert-success">Config ok</div>
+			<div class="alert alert-success">Config is ok</div>
 			<a href="viewsttats.py?serv={{ serv }}" target="_blank" title="View stats">Go to view stats</a>
-			<script>window.history.pushState("Map", "Map", cur_url[0])</script>
 		{% endif %}
+		<script>window.history.pushState("Config", "Config", cur_url[0])</script>
 	{% endif %}
 </center>
 {% if aftersave != 1 %}
diff --git a/app/templates/delver.html b/app/templates/delver.html
index ca4a3757..e35aa103 100644
--- a/app/templates/delver.html
+++ b/app/templates/delver.html
@@ -5,16 +5,7 @@
 	<p>
 		<form action="{{ action }}" method="get">
 			<a class="ui-button ui-widget ui-corner-all" title="Return back" onclick="history.back()">Back</a>
-			<select autofocus required name="serv" id="{{ select_id }}">
-				<option disabled>Choose server</option>
-					{% for select in selects %}
-						{% if select.2 == serv %}
-							<option value="{{ select.2 }}" selected>{{ select.1 }}</option>
-						{% else %}
-							<option value="{{ select.2 }}">{{ select.1 }}</option>
-						{% endif %}
-					{% endfor %}
-			</select>
+			{% include 'include/select.html' %}
 			<button type="submit" value="open" name="open" class="btn btn-default">Open</button>
 		</form>
 		{% if not aftersave and not open %}
@@ -42,18 +33,12 @@
 					<button type="submit" value="" name="" class="btn btn-default">Delete</button>
 				</p>
 			</form> 
-		</center>
-		
+		</center>	
 	{% endif %}
 	{% if aftersave %}
 		<div class="alert alert-info"><b>The following files were deleted:</b><br /> </div>
 		{% if stderr %}
-			<div class="alert alert-danger">
-				Some errors:
-				<br> 
-				<br> 
-					{{stderr}} 
-			</div>
+			{% include 'include/errors.html' %}
 		{% else %}
 			<div class="alert alert-success">
 			{% for f in file %}
diff --git a/app/templates/ha.html b/app/templates/ha.html
index 82a3690f..3d0bb176 100644
--- a/app/templates/ha.html
+++ b/app/templates/ha.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block content %}	
+{% from 'include/input_macros.html' import input, checkbox %}
 <script src="/inc/users.js"></script>
 <table class="overview">
 	<caption><h3>Create new HA cluster</h3></caption>
@@ -29,18 +30,10 @@
 				{% endfor %}
 			</select>
 		</td>
-		<td>
-			<input type="text" id="interface" class="form-control">
-		</td>
-		<td>
-			<input type="text" id="vrrp-ip" class="form-control">
-		</td>
-		<td>
-			<label for="hap"></label><input type="checkbox" id="hap">
-		</td>
-		<td>
-			<label for="syn_flood" title="Enable SYN flood protect"><input type="checkbox" id="syn_flood" checked>
-		</td>
+		<td>{{ input('interface') }}</td>
+		<td>{{ input('vrrp-ip') }}</td>
+		<td>{{ checkbox('hap') }}</td>
+		<td>{{ checkbox('syn_flood', checked='checked') }}</td>
 		<td>
 			<a class="ui-button ui-widget ui-corner-all" id="create" title="Create HA configuration">Create</a>
 		</td>
@@ -75,15 +68,9 @@
 				{% endfor %}
 			</select>
 		</td>
-		<td>
-			<input type="text" id="interface-add" class="form-control">
-		</td>
-		<td>
-			<input type="text" id="vrrp-ip-add" class="form-control">
-		</td>
-		<td>
-			<label for="kp"></label><input type="checkbox" id="kp">
-		</td>
+		<td>{{ input('interface-add') }}</td>
+		<td>{{ input('vrrp-ip-add') }}</td>
+		<td>{{ checkbox('kp') }}</td>
 		<td></td>
 		<td>
 			<a class="ui-button ui-widget ui-corner-all" id="add-vrrp" title="Add HA configuration">Add</a>
diff --git a/app/templates/hapservers.html b/app/templates/hapservers.html
index 5f0f21bb..ebc478b1 100644
--- a/app/templates/hapservers.html
+++ b/app/templates/hapservers.html
@@ -1,7 +1,31 @@
 {% extends "base.html" %}
 {% block content %}	
+{% if serv %}
+<style>
+@media (max-width: 1280px) {
+	.div-pannel {
+		height: 430px !important;
+	}
+}
+</style>
+{% endif %}
 <div id="up-pannel">
 	{% for s in servers %}
+	{% if serv %}
+		<link href="/inc/chart.min.css" rel="stylesheet">
+		<script src="/inc/metrics.js"></script>
+		<script src="/inc/chart.min.js"></script>
+		<script>
+			function showMetrics() {
+				{% for s in servers %}
+					getChartData('{{s.2}}')
+					getWafChartData('{{s.2}}')
+				{% endfor %}
+				showOverviewServer('{{s.1}}', '{{s.2}}', '{{s.0}}');
+			}
+			showMetrics();
+		</script>
+	{% endif %}
 	<div class="div-pannel" id="div-pannel-{{s.0}}">
 		<div id="div-server-{{s.0}}" class="div-server">
 			<div class="server-name">				
@@ -10,9 +34,11 @@
 				{% else %}
 					<span class="serverDown server-status" title="HAProxy is down"></span>
 				{% endif %}
-				<span title="Show info about {{s.2}}" onclick="showOverviewServer('{{s.1}}', '{{s.2}}', '{{s.0}}')" style="cursor: pointer;">
+				{% if not serv %}
+					<a href="/app/hapservers.py?serv={{s.2}}" title="More about {{s.1}}" style="color: #5d9ceb">{{s.1}}</a>
+				{% else %}
 					{{s.1}}
-				</span>
+				{% endif %}
 				{% if s.6|int() >= 1 %}
 					<img 
 						{% if keep_alive|int() >= 1 %}
@@ -24,14 +50,14 @@
 				{% endif %}
 				{% if role <= 1 %}
 				<span class="server-action">
-					<a id="{{ s.2 }}" class="start" title="Start HAProxy service">
-						<img src=/inc/images/start.png alt="start" class="icon" style="margin-bottom: -2px;" onclick="confirmAjaxAction('start', 'hap', '{{s.2}}')">
+					<a id="start-{{ s.2 }}" class="start" title="Start HAProxy service">
+						<img src=/inc/images/start.png alt="start" class="icon-hapservs" style="margin-bottom: -2px;" onclick="confirmAjaxAction('start', 'hap', '{{s.2}}')">
 					</a>
-					<a id="{{ s.2 }}" class="stop" title="Stop HAProxy service">
-						<img src=/inc/images/stop.png alt="stop" class="icon" width="17px" onclick="confirmAjaxAction('stop', 'hap', '{{s.2}}')">
+					<a id="stop-{{ s.2 }}" class="stop" title="Stop HAProxy service">
+						<img src=/inc/images/stop.png alt="stop" class="icon-hapservs" width="17px" onclick="confirmAjaxAction('stop', 'hap', '{{s.2}}')">
 					</a>
-					<a id="{{ s.2 }}" class="restart" title="Restart HAProxy service" onclick="confirmAjaxAction('restart', 'hap', '{{s.2}}')">
-						<img src=/inc/images/update.png alt="restart" class="icon">
+					<a id="restart-{{ s.2 }}" class="restart" title="Restart HAProxy service" onclick="confirmAjaxAction('restart', 'hap', '{{s.2}}')">
+						<img src=/inc/images/update.png alt="restart" class="icon-hapservs">
 					</a>
 				</span>
 				{% endif %}
@@ -68,9 +94,21 @@
 	</div>
 	{% endfor %}
 </div>
+{% if serv %}
+	<div id="refresh" style="text-align: right;margin-right: 105px;clear: both;display: block;padding-top: 20px;margin-bottom: -25px;" title="Refresh metrics" onclick="showMetrics()">
+		<img  src="/inc/images/update.png" alt="Refresh" class="icon">
+	</div>
+	{% for s in servers %}
+		<div class="chart-container" style="display: block; width: 46%;">
+			<canvas id="{{s.2}}" role="img"></canvas>
+		</div>
+		<div class="chart-container" style="display: block; width: 46%;">
+			<canvas id="s_{{s.2}}" role="img"></canvas>
+		</div>
+	{% endfor %}
+{% endif %}
 <div id="dialog-confirm" style="display: none;">
   <p><span class="ui-icon ui-icon-alert" style="float:left; margin:3px 12px 20px 0;"></span>Are you sure?</p>
 </div>
 <script src="/inc/overview.js"></script>
-
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/include/add_proxy.html b/app/templates/include/add_proxy.html
new file mode 100644
index 00000000..84f54a36
--- /dev/null
+++ b/app/templates/include/add_proxy.html
@@ -0,0 +1,135 @@
+<div id="create" style="height: 95%;">
+		<div id="left-collumn">
+			<div class="div-pannel">
+				<div class="div-server">
+					<div class="server-name">
+						<span title="Create Listen" class="redirectListen span-link">Create Listen</span>
+					</div>
+					<div class="server-desc">
+							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.
+					</div>					
+				</div>
+			</div>
+			<div class="div-pannel">
+				<div class="div-server">
+					<div class="server-name">
+						<span title="Create HTTP Listen" class="redirectListen span-link" id="create-http-listen">Create HTTP Listen</span>
+					</div>
+					<div class="server-desc">
+							Create HTTP proxy
+					</div>				
+				</div>
+			</div>
+			<div class="div-pannel">
+				<div class="div-server">
+					<div class="server-name">
+						<span title="Create SSL Listen" class="redirectListen span-link" id="create-ssl-listen">Create SSL Listen</span>
+					</div>
+					<div class="server-desc">
+							Create HTTPS Proxy with the SSL termination on HAProxy and SSL offload. 
+							HAProxy will send to backends HTTP traffic. You need have <span title="Upload SSL" class="redirectSsl span-link" style="color: #5d9ceb">uploaded a PEM certificat</span>
+					</div>				
+				</div>
+			</div>
+			<div class="div-pannel">
+				<div class="div-server">
+					<div class="server-name">
+						<span title="Create SSL Listen" class="redirectListen span-link" id="create-https-listen">Create HTTPS Listen</span>
+					</div>
+					<div class="server-desc">
+							Create HTTPS Proxy without the SSL termination on HAProxy and SSL offload. HAProxy will send to backends HTTPS traffic
+					</div>				
+				</div>
+			</div>
+		</div>
+		<div id="middle-collumn">
+			<div class="div-pannel">
+				<div class="div-server">
+					<div class="server-name">
+						<span title="Create Frontend" class="redirectFrontend span-link">Create Frontend</span>
+					</div>
+					<div class="server-desc">
+						A "frontend" section describes a set of listening sockets accepting client connections.
+						And forwards them to backend
+						<br />
+					</div>			
+				</div>
+			</div>
+			<div class="div-server">
+				<div class="server-name">
+					<span title="Create HTTP Frontend" class="redirectListen span-link" id="create-http-frontend">Create HTTP Frontend</span>
+				</div>
+				<div class="server-desc">
+						Create HTTP Frontend
+				</div>				
+			</div>
+			<div class="div-pannel">
+				<div class="div-server">
+					<div class="server-name">
+						<span title="Create SSL Frontend" class="redirectListen span-link" id="create-ssl-frontend">Create SSL Frontend</span>
+					</div>
+					<div class="server-desc">
+							Create HTTPS Frontend with the SSL termination on HAProxy and SSL offload. HAProxy will send to backends HTTP traffic. You need have <span title="Upload SSL" class="redirectSsl span-link" style="color: #5d9ceb">uploaded a PEM certificat</span>
+					</div>				
+				</div>
+			</div>
+			<div class="div-pannel">
+				<div class="div-server">
+					<div class="server-name">
+						<span title="Create HTTPS Frontend" class="redirectListen span-link" id="create-https-frontend">Create HTTPS Frontend</span>
+					</div>
+					<div class="server-desc">
+							Create HTTPS Frontend without the SSL termination on HAProxy and SSL offload. HAProxy will send to backends HTTPS traffic
+					</div>				
+				</div>
+			</div>
+		</div>
+		<div id="right-collumn">
+			<div class="div-pannel">
+				<div class="div-server">
+					<div class="server-name">
+						<span title="Create Backend" class="redirectBackend span-link">Create Backend</span>
+					</div>
+					<div class="server-desc">
+						A "backend" section describes a set of servers to which the proxy will connect to forward incoming connections. 
+						<br />
+						<br />
+					</div>			
+				</div>
+			</div>
+			<div class="div-server">
+				<div class="server-name">
+					<span title="Create SSL Backend" class="redirectListen span-link" id="create-http-backend">Create HTTP Backend</span>
+				</div>
+				<div class="server-desc">
+						Create HTTP Backend
+				</div>				
+			</div>
+			<div class="div-pannel">
+				<div class="div-server">
+					<div class="server-name">
+						<span title="Create HTTPS Backend" class="redirectListen span-link" id="create-ssl-backend">Create SSL Backend</span>
+					</div>
+					<div class="server-desc">
+							Create HTTPS Backend with the SSL termination on HAProxy and SSL offload. HAProxy will send to backends HTTP traffic. You need have <span title="Upload SSL" class="redirectSsl span-link" style="color: #5d9ceb">uploaded a PEM certificat</span>
+					</div>				
+				</div>
+			</div>
+			<div class="div-pannel">
+				<div class="div-server">
+					<div class="server-name">
+						<span title="Create SSL Backend" class="redirectListen span-link" id="create-https-backend">Create HTTPS Backend</span>
+					</div>
+					<div class="server-desc">
+							Create HTTPS Backend without the SSL termination on HAProxy and SSL offload. HAProxy will send to backends HTTPS traffic
+					</div>				
+				</div>
+			</div>
+		</div>
+		{% if add %}
+		<div class="alert alert-success" style="margin-left: 20px; clear: both;">	
+			<h3>{{ add }} was success added</h3>
+			{{ conf_add }}
+		</div>
+		{% endif %}
+	</div>
\ No newline at end of file
diff --git a/app/templates/include/add_servers.html b/app/templates/include/add_servers.html
new file mode 100644
index 00000000..29b10bcb
--- /dev/null
+++ b/app/templates/include/add_servers.html
@@ -0,0 +1,13 @@
+<span name="add_servers">
+	<input name="servers" required title="Backend IP" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control">:
+	<input name="server_port" required title="Backend IP" size=1 placeholder="yyy" class="form-control">
+	<br />
+	<input name="servers" title="Backend port" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control">:
+	<input name="server_port" title="Backend port" size=1 placeholder="yyy" class="form-control">
+	<br />
+	<input name="servers" title="Backend port" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control">:
+	<input name="server_port" title="Backend port" size=1 placeholder="yyy" class="form-control">
+</span>
+<span>
+	<a class="add-server" name="add-server-input" title="Add backend server" style="cursor: pointer;"></a>
+</span>
\ No newline at end of file
diff --git a/app/templates/include/admin_add_server.html b/app/templates/include/admin_add_server.html
new file mode 100644
index 00000000..68105d90
--- /dev/null
+++ b/app/templates/include/admin_add_server.html
@@ -0,0 +1,62 @@
+{% from 'include/input_macros.html' import input, checkbox %}
+<tr>
+	<td colspan="2">
+		<p class="validateTips alert alert-success">
+			Form fields tag "<span class="need-field">*</span>" are required.
+		</p>
+	</td>
+</tr>
+<tr>
+	<td class="padding20">
+		New hostname
+		<span class="need-field">*</span>
+	</td>
+	<td>{{ input('new-server-add') }}</td>
+<tr>
+	<td class="padding20">
+		IP
+		<span class="need-field">*</span>
+	</td>
+	<td>{{ input('new-ip', size='14') }}</td>
+<tr>
+	<td class="padding20" title="SSH port">
+		Port
+		<span class="need-field">*</span>
+	</td>
+	<td>{{ input('new-port', value='22', size='1') }}</td>
+</tr>
+<tr>
+	<td class="padding20">Enable</td>
+	<td>{{ checkbox('enable', checked='checked') }}</td>
+</tr>
+<tr>
+	<td class="padding20" title="Vitrual IP, something like VRRP">Virt</td>
+	<td>{{ checkbox('typeip') }}</td>
+</tr>
+<tr>
+	<td class="padding20" title="Alert if backend change status">Alert</td>
+	<td>{{ checkbox('alert') }}	</td>
+</tr>
+<tr>
+	<td class="padding20" title="Enable save and show metrics">Metrics</td>
+	<td>{{ checkbox('metrics') }}</td>
+</tr>
+<tr>
+	<td class="padding20" title="Keep start HAProxy service if down">Start</td>
+	<td>{{ checkbox('active') }}</td>
+</tr>
+<tr>
+	<td class="padding20" title="Actions with master config will automatically apply on slave">Slave for</td>
+	<td>
+		<select id="slavefor">
+			<option value="0" selected>Not slave</option>
+			{% for master in masters %}
+				<option value="{{master.0}}">{{master.1}}</option>
+			{% endfor %}
+		</select>
+	</td>
+</tr>
+<tr>
+	<td class="padding20">Description</td>
+	<td>{{ input('desc', size='30') }}</td>
+</tr>
\ No newline at end of file
diff --git a/app/templates/include/admin_add_user.html b/app/templates/include/admin_add_user.html
new file mode 100644
index 00000000..53a11bbc
--- /dev/null
+++ b/app/templates/include/admin_add_user.html
@@ -0,0 +1,38 @@
+{% from 'include/input_macros.html' import input, checkbox %}
+<tr>
+	<td colspan="2">
+		<p class="validateTips alert alert-success">
+			Form fields tag "<span class="need-field">*</span>" are required.
+		</p>
+	</td>
+</tr>
+<tr>
+	<td class="padding20">
+		New user
+		<span class="need-field">*</span>
+	</td>
+	<td>
+		{{ input('new-username') }}
+			{% if ldap_enable == '1' %}
+				<a href="#" title="Search user in AD" id="search_ldap_user">Search user in AD</a>
+			{% endif %}
+	</td>
+</tr>
+<tr>
+	<td class="padding20">
+		Password
+		<span class="need-field">*</span>
+	</td>
+	<td>{{ input('new-password', type='password') }}</td>
+</tr>
+<tr>
+	<td class="padding20">Active</td>
+	<td>{{ checkbox('activeuser', checked='checked') }}</td>
+</tr>
+<tr>
+	<td class="padding20">
+		Email
+		<span class="need-field">*</span>
+	</td>
+	<td>{{ input('new-email') }}</td>
+</tr>
\ No newline at end of file
diff --git a/app/templates/include/admin_servers.html b/app/templates/include/admin_servers.html
new file mode 100644
index 00000000..f374ba96
--- /dev/null
+++ b/app/templates/include/admin_servers.html
@@ -0,0 +1,82 @@
+{% from 'include/input_macros.html' import input, checkbox %}
+<td class="checkbox">
+	{% set id = 'enable-' + server.0|string() %}
+	{% if server.5 == 1 %}
+		{{ checkbox(id, checked='checked') }}
+	{% else %}
+		{{ checkbox(id) }}
+	{% endif %}
+</td>
+<td class="checkbox">
+	{% set id = 'typeip-' + server.0|string() %}
+	{% if server.4 == 1 %}
+		{{ checkbox(id, checked='checked') }}
+	{% else %}
+		{{ checkbox(id) }}
+	{% endif %}
+</td>
+<td class="checkbox">
+	{% set id = 'alert-' + server.0|string() %}
+	{% if server.8 == 1 %}
+		{{ checkbox(id, checked='checked') }}
+	{% else %}
+		{{ checkbox(id) }}
+	{% endif %}
+</td>
+<td class="checkbox">
+	{% set id = 'metrics-' + server.0|string() %}
+	{% if server.9 == 1 %}
+		{{ checkbox(id, checked='checked') }}
+	{% else %}
+		{{ checkbox(id) }}
+	{% endif %}
+</td>
+<td class="checkbox">
+	{% set id = 'active-' + server.0|string() %}
+	{% if server.12 == 1 %}
+		{{ checkbox(id, checked='checked') }}
+	{% else %}
+		{{ checkbox(id) }}
+	{% endif %}
+</td>
+<td>
+	<select id="slavefor-{{server.0}}">
+		<option value="0" selected>Not slave</option>
+		{% for master in masters %}
+			{% if master.0 == server.6 %}
+				<option value="{{master.0}}" selected>{{master.1}}</option>
+			{% else %}
+				<option value="{{master.0}}">{{master.1}}</option>
+			{% endif %}
+		{% endfor %}
+	</select>
+</td>
+<td>
+	<div class="controlgroup">
+		<select id="credentials-{{server.0}}">
+			<option disabled selected>Choose credentials</option>
+			{% for ssh in sshs %}
+				{% if ssh.0 == server.7	%}
+					<option value="{{ssh.0}}" selected>{{ssh.1}}</option>
+				{% else %}
+					<option value="{{ssh.0}}">{{ssh.1}}</option>
+				{% endif %}
+			{% endfor %}
+		</select>
+		<button onclick="checkSshConnect('{{server.2}}')" title="Check SSH connect to the server {{server.1}}">check</button>
+	</div>
+</td>
+<td>
+	{% set id = 'desc-' + server.0|string() %}
+	{% if server.11  != "None" %}
+		{{ input(id, value=server.11, size='20') }}
+	{% else %}
+		{{ input(id, size='20') }}
+	{% endif %}
+</td>
+<td>
+	<a class="add" onclick="cloneServer({{server.0}})" id="clone-{{server.0}}" title="Clone {{server.1}}" style="cursor: pointer;"></a>
+</td> 
+<td>
+	<a class="delete" onclick="confirmDeleteServer({{server.0}})" title="Delete server {{server.1}}" style="cursor: pointer;"></a>
+</td> 
\ No newline at end of file
diff --git a/app/templates/include/admin_user.html b/app/templates/include/admin_user.html
new file mode 100644
index 00000000..4d99c4a1
--- /dev/null
+++ b/app/templates/include/admin_user.html
@@ -0,0 +1,28 @@
+<td class="padding10 first-collumn">
+					{% if user.6 == 1%}
+						<input type="text" id="login-{{user.0}}" value="{{user.1}}" class="form-control" readonly>
+					{% else %}
+						<input type="text" id="login-{{user.0}}" value="{{user.1}}" class="form-control">
+					{% endif %}
+				</td> 
+				<td>
+					{% if user.6 != 1%}
+					<span  title="Change password" style="cursor: pointer">
+						<img src="/inc/images/edit.png" alt="Edit" width="15" style="margin-bottom: -3px; padding-left: 15px;" onclick="openChangeUserPasswordDialog('{{user.0}}')" />
+					</span>
+					{% endif %}
+				</td>
+				<td class="checkbox">
+					{% if user.7 == 1 %}
+						<label for="activeuser-{{user.0}}"></label><input type="checkbox" id="activeuser-{{user.0}}" checked>
+					{% else %}
+						<label for="activeuser-{{user.0}}"></label><input type="checkbox" id="activeuser-{{user.0}}">
+					{% endif %}
+				</td>
+				<td>
+					{% if user.6 == 1%}
+						<input type="text" id="email-{{user.0}}" value="{{user.2}}" class="form-control" readonly>
+					{% else %}
+						<input type="text" id="email-{{user.0}}" value="{{user.2}}" class="form-control">
+					{% endif %}
+				</td>
\ No newline at end of file
diff --git a/app/templates/include/admin_users.html b/app/templates/include/admin_users.html
new file mode 100644
index 00000000..4fd0a115
--- /dev/null
+++ b/app/templates/include/admin_users.html
@@ -0,0 +1,32 @@
+{% from 'include/input_macros.html' import input, checkbox %}
+<td class="padding10 first-collumn">
+	{% set login_id = 'login-' + user.0|string() %}
+	{% if user.6 == 1%}
+		{{ input(login_id, value=user.1, readonly='readonly') }}
+	{% else %}
+		{{ input(login_id, value=user.1) }}
+	{% endif %}
+</td> 
+<td>
+	{% if user.6 != 1%}
+	<span  title="Change password" style="cursor: pointer">
+		<img src="/inc/images/edit.png" alt="Edit" width="15" style="margin-bottom: -3px; padding-left: 15px;" onclick="openChangeUserPasswordDialog('{{user.0}}')" />
+	</span>
+	{% endif %}
+</td>
+<td class="checkbox">
+	{% set activeuser_id = 'activeuser-' + user.0|string() %}
+	{% if user.7 == 1 %}
+		{{ checkbox(activeuser_id, checked='checked') }}
+	{% else %}
+		{{ checkbox(activeuser_id) }}
+	{% endif %}
+</td>
+<td>
+	{% set email_id = 'email-' + user.0|string() %}
+	{% if user.6 == 1%}
+		{{ input(email_id, value=user.2, readonly='readonly') }}
+	{% else %}
+		{{ input(email_id, value=user.2) }}
+	{% endif %}
+</td>
\ No newline at end of file
diff --git a/app/templates/include/change_pass_form.html b/app/templates/include/change_pass_form.html
new file mode 100644
index 00000000..b4e07852
--- /dev/null
+++ b/app/templates/include/change_pass_form.html
@@ -0,0 +1,23 @@
+{% from 'include/input_macros.html' import input %}
+<div id="user-change-password-table" style="display: none;">	
+	<table class="overview">
+		<tr>
+			<td colspan="2">
+				  <p class="validateTips alert alert-success">Enter password and confirm</p>
+			</td>
+		</tr>
+		<tr>
+			<td class="padding20">Password</td>
+			<td>{{ input('change-password', type='password') }}</td>
+		</tr>
+		<tr>
+			<td class="padding20">Confirm password</td>
+			<td>{{ input('change2-password', type='password') }}</td>
+		</tr>
+		<tr id="missmatchpass" style="display: none;">
+			<td colspan="2">
+				  <p class="validateTips alert alert-danger" style="margin-top: 10px;">Passwords are mismatched</p>
+			</td>
+		</tr>
+	</table>
+</div>
\ No newline at end of file
diff --git a/app/templates/include/del_confirm.html b/app/templates/include/del_confirm.html
new file mode 100644
index 00000000..7d0941db
--- /dev/null
+++ b/app/templates/include/del_confirm.html
@@ -0,0 +1,3 @@
+<div id="dialog-confirm" title="Are you sure you want to delete?" style="display: none;">
+  <p><span class="ui-icon ui-icon-alert" style="float:left; margin:3px 12px 20px 0;"></span>Deleting irreversibly all data will be lost?</p>
+</div>
\ No newline at end of file
diff --git a/app/templates/include/errors.html b/app/templates/include/errors.html
new file mode 100644
index 00000000..f4e3d47d
--- /dev/null
+++ b/app/templates/include/errors.html
@@ -0,0 +1,6 @@
+<div class="alert alert-danger" style="margin-bottom: 10px;">
+	Some errors:
+	<br> <br> 
+	{{stderr}} 
+	{{error}} 
+</div>
\ No newline at end of file
diff --git a/app/templates/include/input_macros.html b/app/templates/include/input_macros.html
new file mode 100644
index 00000000..e6a172ae
--- /dev/null
+++ b/app/templates/include/input_macros.html
@@ -0,0 +1,31 @@
+{% macro input(id, name='', value='', type='text', size='', readonly='', required='', placeholder='', title='', class='form-control', style='') -%}
+	{% if name == '' %}
+		{% set name = id %}
+	{% endif %}
+    <input type="{{ type }}" name="{{name}}" value="{{ value|e }}" id="{{ id }}" size="{{size}}" style="{{style}}" {{readonly}} {{required}} placeholder="{{placeholder}}" title="{{title}}" class="{{class}}">
+{%- endmacro %}
+
+{%- macro checkbox(id, name='', checked='', title='', value='', desc='') -%}
+	{% if name == '' %}
+		{% set name = id %}
+	{% endif %}
+	<label for="{{id}}" title="{{title}}">{{desc}}</label><input name="{{name}}" type="checkbox" id="{{id}}" value="{{value|e}}" {{checked}}>
+{%- endmacro %}
+
+{%- macro select(id, values, name='', required='', first='', class='', selected='') -%}
+	{% if name == '' %}
+		{% set name = id %}
+	{% endif %}
+	<select required="{{required}}" name="{{name}}" id="{{id}}" class="{{class}}">
+		{% if first %}
+			<option disabled selected>{{first}}</option>
+		{% endif %}
+		{% for v, des in values|dictsort(false, 'value') %}
+			{% if v == selected %}
+				<option value="{{v}}" selected>{{des}}</option>
+			{% else %}
+				<option value="{{v}}">{{des}}</option>
+			{% endif %}
+		{% endfor %}
+	</select>
+{%- endmacro %}
\ No newline at end of file
diff --git a/app/templates/include/login.html b/app/templates/include/login.html
new file mode 100644
index 00000000..7bc347ee
--- /dev/null
+++ b/app/templates/include/login.html
@@ -0,0 +1,5 @@
+{% if user %}
+	<a href=/app/login.py?logout=logout title="Logout, user name: {{ user }}" class="login"> Logout</a>						
+{% else %}
+	<a href=/app/login.py title="Login" class="login"> Login</a>
+{% endif %}
\ No newline at end of file
diff --git a/app/templates/include/select.html b/app/templates/include/select.html
new file mode 100644
index 00000000..f11c06a1
--- /dev/null
+++ b/app/templates/include/select.html
@@ -0,0 +1,11 @@
+	<select autofocus required name="serv" id="{{ select_id }}">
+		<option disabled>Choose server</option>
+		{% for select in selects %}
+			{% if select.2 == serv %}
+				<option value="{{ select.2 }}" selected>{{ select.1 }}</option>
+			{% else %}
+				<option value="{{ select.2 }}">{{ select.1 }}</option>
+			{% endif %}
+		{% endfor %}
+	</select>
+	
\ No newline at end of file
diff --git a/app/templates/lists.html b/app/templates/lists.html
index 56730016..76fe2d2e 100644
--- a/app/templates/lists.html
+++ b/app/templates/lists.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block content %}
+{% from 'include/input_macros.html' import input %}
 	<table class="overview">
 		<tr class="overviewHead">
 			<td class="padding10 first-collumn">New black list</th>
@@ -9,7 +10,7 @@
 		</tr>
 		<tr>
 			<td class="padding10 first-collumn" style="width: 25%;">
-				Name: <input type="text" id="new_blacklist_name" class="form-control">
+				Name: {{ input('new_blacklist_name') }}
 				<button onclick="createList('black')">Create</button>
 			</td>
 			<td style="width: 30%;">
@@ -18,7 +19,7 @@
 				{% endfor %}
 			</td>
 			<td class="padding10 first-collumn" style="width: 25%;">
-				Name: <input type="text" id="new_whitelist_name" class="form-control">
+				Name: {{ input('new_whitelist_name') }}
 				<button onclick="createList( 'white')">Create</button>
 			</td>
 			<td style="width: 30%;">
@@ -27,7 +28,7 @@
 				{% endfor %}
 			</td>
 		</tr>
-		<input type="hidden" id="group" value="{{group}}">
+		{{ input('group', value=group, type='hidden') }}
 	</table>
 	<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
 		In this section you can create and edit black and white lists. And after use them in the HAProxy configs or in the "Add proxy" pages
@@ -35,6 +36,6 @@
 	<div id="ajax"></div>
 	<div id="dialog-confirm" title="View certificate " style="display: none;">
 		<span><b>Note:</b> Each new address should be specified from a new line</span>
-		<textarea id="edit_lists" cols=95 rows=20></textarea>
+		<textarea id="edit_lists" style="width: 100%" rows=20></textarea>
 	</div>	
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/login.html b/app/templates/login.html
index ff25dcdb..37c2d571 100644
--- a/app/templates/login.html
+++ b/app/templates/login.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block content %}	
+{% from 'include/input_macros.html' import input %}
 <style>
 body, .container {
 	background-color: #fff;
@@ -12,14 +13,6 @@ body, .container {
 	width: 100% !important;
 	max-width: 100% !important;
 }
-.form-control {
-	text-align: center;
-	background-color: #fff;
-	padding: 10px;
-	width: 220px;
-	background-size: 0 !important;
-	border: 0 !important;
-}
 #enter {
 	width: 220px !important; 
 	padding: 10px !important; 
@@ -32,15 +25,14 @@ body, .container {
 		{{error}}
 		{{db_create}}
 	<div id="login-form" style="padding-top: 40px; padding-bottom: 50px; height: 250px; color: #000;">
-		<!-- <span style="font-size: 50px; font-weight: bold; color: #fff;">HAProxy-WI</span> -->
 		<span id="logo_span">
 			<img src="/inc/images/logo_login.png" width="330">
 		</span>
 		<form name="auth" id="auth" action="login.py" class="form-horizontal" method="post" style="margin-top: 40px;left: 0;float: left;margin-left: 93px;">
 			<br>
-			<input type="text" name="login" id="login"  required class="form-control" placeholder="Login"><br /><br />
-			<input type="password" name="pass" id="pass" required class="form-control" placeholder="Password"><br /><br />
-			<input type="hidden" value="{{reff}}" name="ref" id="ref">
+			{{ input('login', class='form-login', placeholder='Login', required='required') }}<br /><br />
+			{{ input('pass', type='password', class='form-login', placeholder='Password', required='required') }}<br /><br />
+			{{ input('ref', type='hidden', value=ref) }}
 			<button type="submit" name="Login" value="Enter" id="enter">Login</button>
 		</form>
 		<div class="alert alert-danger wrong-login">
@@ -53,12 +45,4 @@ body, .container {
 		</div>
 		<br /><br />
 </center>
-<div id="dialog-confirm" title="View certificate " style="display: none;">
-	<center>
-		<div id="dialog-confirm-body">Hello! Do not pass by, support the project! 
-			<b><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=5XVQTMKQS57NE&lc=US&Z3JncnB0=" title="Paypal" style="color: red" target="_blank">Paypal</a> or 
-			<a href="https://www.patreon.com/haproxy_wi/overview" title="Patreon" style="color: red" target="_blank">Patreon</a></b>
-		</div>
-	</center>
-</div>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/logs.html b/app/templates/logs.html
index f41bcb6b..1463f075 100644
--- a/app/templates/logs.html
+++ b/app/templates/logs.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block content %}	
+{% from 'include/input_macros.html' import input, checkbox %}
 <script src="/inc/users.js"></script>
 <table class="overview">
 	<tr class="overviewHead">
@@ -17,16 +18,16 @@
 		<td class="padding10" style="width: 10%;">Ex for grep</td>
 		<td style="width: 10%;">
 			<label for="time_range_out_hour" style="padding: 0">Time range:</label>
-			<input type="text" id="time_range_out_hour" readonly class="time-range" value="{{hour}}">:<input type="text" id="time_range_out_minut" readonly class="time-range" value="{{minut}}"> -
-			<input type="text" id="time_range_out_hour1" readonly class="time-range"  value="{{hour1}}">:<input type="text" id="time_range_out_minut1" readonly class="time-range"  value="{{minut1}}">	
+			{{ input('time_range_out_hour', value=hour, class='time-range', readonly='readonly') }}:{{ input('time_range_out_minut', value=minut, class='time-range', readonly='readonly') }}
+			{{ input('time_range_out_hour1', value=hour1, class='time-range', readonly='readonly') }}:{{ input('time_range_out_minut1', value=minut1, class='time-range', readonly='readonly') }}	
 		</td>
 		<td style="width: 10%;"> </td>
 	</tr>
 	<tr>
 		<td class="padding10 first-collumn" style="width: 10%;">
 			<form action="" method="get">
-				<select autofocus required name="serv" id="{{ select_id }}">					
-					{% if onclick == 'viewLogs()' %}
+				{% if onclick == 'viewLogs()' %}
+					<select autofocus required name="serv" id="{{ select_id }}">									
 						<option disabled selected>Choose log</option>
 						{% for select in selects %}
 							{% if select.0 == serv %}
@@ -35,28 +36,21 @@
 								<option value="{{ select.0 }}">{{ select.1 }}</option>
 							{% endif %}
 						{% endfor %}
+					</select>
 					{% else %}
-						<option disabled selected>Choose server</option>
-						{% for select in selects %}						
-							{% if select.2 == serv %}
-								<option value="{{ select.2 }}" selected>{{ select.1 }}</option>
-							{% else %}
-								<option value="{{ select.2 }}">{{ select.1 }}</option>
-							{% endif %}
-						{% endfor %}
-					{% endif %}
-				</select>
+						{% include 'include/select.html' %}
+					{% endif %}			
 		</td>
 		{% if onclick != 'viewLogs()' %}
 		<td>
-			<label for="waf"></label><input type="checkbox" id="waf"> 
+			{{ checkbox('waf') }}
 		</td>
 		{% endif %}
 		<td class="padding10" style="width: 10%;">
-			<input type="number" name="rows" id="rows" value="{{ rows }}" class="form-control" required>
+			{{ input('rows', type='number', value=rows, required='required') }}
 		</td> 
 		<td class="padding10" style="width: 10%;">
-			<input type="text" name="grep" id="grep" class="form-control" value="{{ grep }}" >
+			{{ input('grep', value=grep) }}
 		</td>
 		<td class="padding10" style="width: 10%;">
 			<div id="time-range"></div>			
diff --git a/app/templates/metrics.html b/app/templates/metrics.html
index 4c46b8f9..b1c59aa9 100644
--- a/app/templates/metrics.html
+++ b/app/templates/metrics.html
@@ -27,11 +27,15 @@ th, tr, td {
 
 <script>
 function showMetrics() {
-	{% for s in servers %}
-		getChartData('{{s.0}}')
-	{% endfor %}
+	let metrics = new Promise(
+		(resolve, reject) => {
+			{% for s in servers %}
+				getChartData('{{s.0}}')
+			{% endfor %}
+			loadMetrics()
+		});	
+	metrics.then();
 }
-	showMetrics()
-	loadMetrics()
+showMetrics()
  </script>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/ovw.html b/app/templates/ovw.html
index 10037ef2..5c928b04 100644
--- a/app/templates/ovw.html
+++ b/app/templates/ovw.html
@@ -25,7 +25,7 @@
 <tbody id="ajaxstatus"></tbody>
 </table>
 <table class="overview-wi" style="height: 170;">
-	<tr class="overviewHead" style="height: 43px;">
+	<tr class="overviewHead" style="height: 40px;">
 		<td class="padding10 first-collumn-wi">
 			{% if role <= 1 %}
 				<a href="/app/viewlogs.py?viewlogs=haproxy-wi-{{date}}.log&rows=10&grep=&hour=00&minut=00&hour1=24&minut1=00" title="View HAProxy-WI logs" class="logs_link">			
@@ -154,7 +154,6 @@
 							<img src="/inc/images/edit.png" alt="Edit" width="15" style="margin-bottom: -3px;" />
 						</a>
 					</td>
-					 <!-- <td class="padding10 second-collumn"> {{ USER.2 }}</td>  -->
 					{% for group in groups %}
 						{% if USER.5 == group.0|string() %}
 							<td class="third-collumn-wi">{{ group.1 }}</td>
@@ -170,7 +169,6 @@
 							<img src="/inc/images/edit.png" alt="Edit" width="15" style="margin-bottom: -3px;" />
 						</a>
 					</td>
-					<!-- <td class="padding10"> {{ USER.2 }}</td> -->
 					{% for group in groups %}
 						{% if group.0|string() == USER.5 %}
 							<td class="third-collumn-wi">{{ group.1 }}</td>
diff --git a/app/templates/runtimeapi.html b/app/templates/runtimeapi.html
index 7eec6206..7aff776c 100644
--- a/app/templates/runtimeapi.html
+++ b/app/templates/runtimeapi.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% block content %}
+{% from 'include/input_macros.html' import input, checkbox %}
 	<table class="overview">
 		<tr class="overviewHead">
 			<td class="padding10 first-collumn">Server</td>
@@ -11,16 +12,7 @@
 		<tr>
 			<td class="padding10 first-collumn" style="width: 25%;">
 				<form action="{{ action }}" method="get" id="runtimeapiform">
-					<select autofocus required id="{{ select_id }}" name="{{ select_id }}">
-						<option disabled>Choose server</option>
-						{% for select in selects %}
-							{% if serv == select.2 %}
-								<option value="{{ select.2 }}" selected>{{ select.1 }}</option>
-							{% else %}
-								<option value="{{ select.2 }}">{{ select.1 }}</option>
-							{% endif %}
-						{% endfor %}
-					</select>
+					{% include 'include/select.html' %}
 			</td>
 			<td style="width: 30%;">
 				<select required name="servaction" id="servaction">
@@ -34,11 +26,11 @@
 				</select>
 			</td>
 			<td>
-				<input type="text" name="servbackend" id="servbackend" size=35 title="Frontend, backend/server, show: info, pools or help" required class="form-control" value="{{ servbackend }}">
+				{{ input('servbackend', value=servbackend, title='Frontend, backend/server, show: info, pools or help', required='required') }}
 			</td>
 			<td class="checkbox">
 				{% if role <= 2 %}
-					<label for="save"></label><input type="checkbox" name="save" id="save" value="123">
+					{{ checkbox('save', value='123') }}
 				{% endif %}
 			</td>
 			<td>
diff --git a/app/templates/sections.html b/app/templates/sections.html
index d2070925..3471e4d6 100644
--- a/app/templates/sections.html
+++ b/app/templates/sections.html
@@ -12,7 +12,6 @@
 			<select autofocus required name="section" id="{{ select_id }}">
 				<option disabled>Choose a section</option>
 					{% for s in sections %}
-
 							{% if s == section %}
 								<option value="{{ s }}" selected>{{ s }}</option>								
 							{% else %}
@@ -52,15 +51,9 @@
 	{% if aftersave %}
 		<div class="alert alert-info">New config was saved as: {{ cfg }} </div>
 		{% if stderr or error %}
-			<div class="alert alert-danger">
-				Some errors:
-				<br> 
-				<br> 
-					{{ stderr }} 
-					{{ error }} 
-			</div>
+			{% include 'include/errors.html' %}
 		{% else %}
-			<div class="alert alert-success">Config ok</div>
+			<div class="alert alert-success">Config is ok</div>
 			<a href="config.py?serv={{ serv }}" title="Working with HAProxy configs">Configs</a> | 
 			<a href="viewsttats.py?serv={{ serv }}" target="_blank" title="View stats">Go to view stats</a>
 		{% endif %}
diff --git a/app/templates/servers.html b/app/templates/servers.html
index 1e93757c..b97a37bb 100644
--- a/app/templates/servers.html
+++ b/app/templates/servers.html
@@ -1,14 +1,13 @@
 {% extends "base.html" %}
 {% block content %}
+{% from 'include/input_macros.html' import input, checkbox, select %}
 <style>
 .container {
 	margin-right: 0;
 }
 </style>
 <script src="/inc/users.js"></script>
-<div id="dialog-confirm" title="Are you sure you want to delete?" style="display: none;">
-  <p><span class="ui-icon ui-icon-alert" style="float:left; margin:3px 12px 20px 0;"></span>Deleting irreversibly all data will be lost?</p>
-</div>
+{% include 'include/del_confirm.html' %}
 <input type="hidden" id="new-group" name="new-group" value="{{ group }}">
 <input type="hidden" id="new-server-group-add" name="new-server-group-add" value="{{ group }}" >
 <input type="hidden" id="new-ssh-group-add" name="new-ssh-group-add" value="{{ group }}" >
@@ -19,11 +18,7 @@
 		<li><a href="#ssh">SSH credentials</a></li>
 		<li><a href="#checker">Checker</a></li>
 		<li><a href="#installhaproxy">Install HAProxy</a></li>
-		{% if user %}
-			<a href=/app/login.py?logout=logout title="Logout, user name: {{ user }}" class="login"> Logout</a>						
-		{% else %}
-			<a href=/app/login.py title="Login" class="login"> Login</a>
-		{% endif %}
+		{% include 'include/login.html' %}
 	</ul>
 	<div id="users">
 		<table class="overview" id="ajax-users">
@@ -40,35 +35,7 @@
 		{% for user in users %}
 			{% if user.5 == group %}
 			<tr id="user-{{user.0}}" class="{{ loop.cycle('odd', 'even') }}">
-				<td class="padding10 first-collumn">
-					{% if user.6 == 1%}
-						<input type="text" id="login-{{user.0}}" value="{{user.1}}" class="form-control" readonly>
-					{% else %}
-						<input type="text" id="login-{{user.0}}" value="{{user.1}}" class="form-control">
-					{% endif %}
-					<input type="hidden" id="usergroup-{{user.0}}" name="usergroup-{{user.0}}" value="{{ group }}">					
-				</td> 
-				<td>
-					{% if user.6 != 1%}
-					<span  title="Change password" style="cursor: pointer" class="passwordChange">
-						<img src="/inc/images/edit.png" alt="Edit" width="15" style="margin-bottom: -3px; padding-left: 15px;" onclick="openChangeUserPasswordDialog('{{user.0}}')" />
-					</span>
-					{% endif %}
-				</td> 
-				<td class="checkbox">
-					{% if user.7 == 1 %}
-						<label for="activeuser-{{user.0}}"></label><input type="checkbox" id="activeuser-{{user.0}}" checked>
-					{% else %}
-						<label for="activeuser-{{user.0}}"></label><input type="checkbox" id="activeuser-{{user.0}}">
-					{% endif %}
-				</td>
-				<td>
-					{% if user.6 == 1%}
-						<input type="text" id="email-{{user.0}}" value="{{user.2}}" class="form-control" readonly>
-					{% else %}
-						<input type="text" id="email-{{user.0}}" value="{{user.2}}" class="form-control">
-					{% endif %}
-				</td>
+				{% include 'include/admin_users.html' %}
 				<td>
 					<select id="role-{{user.0}}" name="role-{{user.0}}">
 						<option disabled selected>Choose role</option>
@@ -128,81 +95,7 @@
 				<td>
 					<input type="text" id="port-{{server.0}}" value="{{server.10}}" size="1" class="form-control">
 				</td>
-				<td  class="checkbox">
-					{% if server.5 == 1 %}
-						<label for="enable-{{server.0}}"></label><input type="checkbox" id="enable-{{server.0}}" checked>
-					{% else %}
-						<label for="enable-{{server.0}}"></label><input type="checkbox" id="enable-{{server.0}}">
-					{% endif %}
-				</td>
-				<td  class="checkbox">
-					{% if server.4 == 1 %}
-						<label for="typeip-{{server.0}}"></label><input type="checkbox" id="typeip-{{server.0}}" checked>
-					{% else %}
-						<label for="typeip-{{server.0}}"></label><input type="checkbox" id="typeip-{{server.0}}">
-					{% endif %}
-				</td>
-				<td  class="checkbox">
-					{% if server.8 == 1 %}
-						<label for="alert-{{server.0}}"></label><input type="checkbox" id="alert-{{server.0}}" checked>
-					{% else %}
-						<label for="alert-{{server.0}}"></label><input type="checkbox" id="alert-{{server.0}}">
-					{% endif %}
-				</td>
-				<td  class="checkbox">
-					{% if server.9 == 1 %}
-						<label for="metrics-{{server.0}}"></label><input type="checkbox" id="metrics-{{server.0}}" checked>
-					{% else %}
-						<label for="metrics-{{server.0}}"></label><input type="checkbox" id="metrics-{{server.0}}">
-					{% endif %}
-				</td>
-				<td class="checkbox">
-					{% if server.12 == 1 %}
-						<label for="active-{{server.0}}"></label><input type="checkbox" id="active-{{server.0}}" checked>
-					{% else %}
-						<label for="active-{{server.0}}"></label><input type="checkbox" id="active-{{server.0}}">
-					{% endif %}
-				</td>
-				<td>
-					<select id="slavefor-{{server.0}}">
-						<option selected value="0">Not slave</option>
-						{% for master in masters %}
-							{% if master.0 == server.6 %}
-								<option value="{{master.0}}" selected>{{master.1}}</option>
-							{% else %}
-								<option value="{{master.0}}">{{master.1}}</option>
-							{% endif %}
-						{% endfor %}
-					</select>
-				</td>
-				<td>
-					<div class="controlgroup">
-						<select id="credentials-{{server.0}}">
-							<option disabled selected>Choose credentials</option>
-							{% for ssh in sshs %}
-									{% if ssh.0 == server.7	%}
-										<option value="{{ssh.0}}" selected>{{ssh.1}}</option>
-									{% else %}
-										<option value="{{ssh.0}}">{{ssh.1}}</option>
-									{% endif %}
-							{% endfor %}
-						</select>
-						<button onclick="checkSshConnect('{{server.2}}')" title="Check SSH connect to the server {{server.1}}">check</button>
-					</div>
-				</td>
-				<td>
-					{% if server.11  != "None" %}
-						<input type="text" id="desc-{{server.0}}" value="{{server.11}}" size="30" class="form-control">
-					{% else %}
-						<input type="text" id="desc-{{server.0}}" value="" size="30" class="form-control">
-					{% endif %}
-				</td>
-				<td>
-					<a class="add" onclick="cloneServer({{server.0}})" id="clone-{{server.0}}" title="Clone {{server.1}}" style="cursor: pointer;"></a>
-				</td> 
-				<td>
-					<a class="delete" onclick="confirmDeleteServer({{server.0}})" title="Delete server {{server.1}}" style="cursor: pointer;"></a>
-				</td> 
+				{% include 'include/admin_servers.html' %}
 			</tr>
 		{% endfor %}
 		</table>
@@ -270,16 +163,16 @@
 			</tr>
 			<tr>
 				<td class="padding10 first-collumn">
-					<input type="text" name="new-ssh-add" id="new-ssh-add" class="form-control">
+					{{ input('new-ssh-add') }}	
 				</td>
 				<td>
 					<label for="new-ssh_enable">Enable SSH key</label><input type="checkbox" id="new-ssh_enable" checked>
 				</td>
 				<td style="padding-top: 15px;">
 					<p>
-						<input type="text" id="ssh_user" class="form-control" value="{{ssh_user}}">		
+						{{ input('ssh_user', value=ssh_user) }}	
 					</p>
-						<input type="password" id="ssh_pass" class="form-control" value="{{ssh_pass}}" style="display: none;">
+						{{ input('ssh_pass', type='password', value=ssh_pass, style="display: none;") }}
 					<br>
 				</td>
 				<td>
@@ -359,13 +252,13 @@
 			</tr>
 			<tr>
 				<td class="padding10 first-collumn">
-					<input type="text" name="telegram-token-add" id="telegram-token-add" class="form-control">
+					{{ input('telegram-token-add') }}
 					{% for group in ssh_group %}
-						<input type="hidden" id="new-telegram-group-add" name="new-telegram-group-add" value="{{ group.0 }}" >
+						{{ input('new-telegram-group-add', value=group.0) }}
 					{% endfor %}
 				</td>
 				<td>
-					<input type="text" id="telegram-chanel-add" class="form-control">
+					{{ input('telegram-chanel-add') }}	
 				</td>
 				<td>
 					<a class="add-admin" id="add-telegram" title="Add new Telegram channel" style="cursor: pointer;"></a>
@@ -387,12 +280,9 @@
 			</tr>
 			<tr>
 				<td class="padding10 first-collumn" style="width: 20%;">
-					<select id="hapver" name="hapver" required>
-						<option disabled>Choose HAProxy version</option>
-						<option value="2.0.4-1">2.0.4-1</option>
-						<option value="2.0.6-1">2.0.6-1</option>
-						<option value="2.0.7-1" selected>2.0.7-1</option>
-					</select>
+					{% set values = dict() %}
+					{% set values = {'2.0.4-1':'2.0.4-1','2.0.6-1':'2.0.6-1', '2.0.7-1':'2.0.7-1'} %}
+					{{ select('hapver',  values=values, selected='2.0.7-1', required='required') }}
 				</td>
 				<td class="padding10 first-collumn">
 					<select autofocus required name="haproxyaddserv" id="haproxyaddserv">
@@ -403,7 +293,7 @@
 					</select>
 				</td>
 				<td>
-					<label for="syn_flood" title="Enable SYN flood protect"><input type="checkbox" id="syn_flood" checked>
+					{{ checkbox('syn_flood', title="Enable SYN flood protect", checked='checked') }}
 				</td>
 				<td>
 					<a class="ui-button ui-widget ui-corner-all" id="install" title="Install HAProxy">Install</a>
@@ -420,47 +310,7 @@
 </div>
 <div id="user-add-table" style="display: none;">	
 	<table class="overview">
-		<tr>
-			<td colspan="2">
-				  <p class="validateTips alert alert-success">Form fields tag "<span class="need-field">*</span>" are required.</p>
-			</td>
-		</tr>
-		<tr>
-			<td class="padding20">
-				New user
-				<span class="need-field">*</span>
-			</td>
-			<td>
-				<input type="text" name="new-username" id="new-username" class="form-control">
-				{% if ldap_enable == '1' %}
-					<a href="#" title="Search user in AD" id="search_ldap_user">Search user in AD</a>
-				{% endif %}
-			</td>
-		</tr>
-		<tr>
-			<td class="padding20">
-				Password
-				<span class="need-field">*</span>
-			</td>
-			<td>
-				<input type="password" name="new-password" id="new-password" class="form-control">
-			</td>
-		</tr>
-		<tr>
-				<td class="padding20">Active</td>
-				<td>
-					<label for="activeuser"></label><input type="checkbox" id="activeuser" checked>
-				</td>
-		</tr>
-		<tr>
-			<td class="padding20">
-				Email
-			</td>
-			<td>
-				<input type="text" name="new-email" id="new-email" class="form-control">
-			</td>
-		</tr>
-		<tr>
+		{% include 'include/admin_add_user.html' %}
 			<td class="padding20">
 				Role
 				<span class="need-field">*</span>
@@ -481,80 +331,7 @@
 <div id="server-add-table" style="display: none;">	
 	<form id="server-add-form">
 	<table class="overview">
-		<tr>
-			<td colspan="2">
-				  <p class="validateTips alert alert-success">Form fields tag "<span class="need-field">*</span>" are required.</p>
-			</td>
-		</tr>
-		<tr>
-			<td class="padding20">
-				New hostname
-				<span class="need-field">*</span>
-			</td>
-			<td>
-				<input type="text" name="new-server-add" id="new-server-add" class="form-control">
-			</td>
-		</tr>
-		<tr>
-			<td class="padding20">
-				IP
-				<span class="need-field">*</span>
-			</td>
-			<td>
-				<input type="text" name="new-ip" id="new-ip" size="14" class="form-control">
-				<input type="hidden" id="new-sshgroup" name="new-sshgroup" value="{{ group }}" >
-			</td>
-		</tr>
-		<tr>
-			<td class="padding20" title="SSH port">
-				Port
-				<span class="need-field">*</span>
-			</td>
-			<td>
-				<input type="text" name="new-port" id="new-port" size=1 class="form-control" value="22">
-			</td>	
-		</tr>
-		<tr>
-			<td class="padding20">Enable</td>
-			<td>
-				<label for="enable"></label><input type="checkbox" id="enable" checked>
-			</td>
-		</tr>
-		<tr>
-			<td class="padding20" title="Vitrual IP, something like VRRP">Virt</td>
-			<td>
-				<label for="typeip"></label><input type="checkbox" id="typeip">
-			</td>
-		</tr>
-		<tr>
-			<td class="padding20" title="Alert if backend change status">Alert</td>
-			<td>
-				<label for="alert"></label><input type="checkbox" id="alert">
-			</td>
-		</tr>
-		<tr>
-			<td class="padding20" title="Enable save and show metrics">Metrics</td>
-			<td>
-				<label for="metrics"></label><input type="checkbox" id="metrics">
-			</td>
-		</tr>
-		<tr>
-			<td class="padding20" title="Keep start HAProxy service if down">Start</td>
-			<td>
-				<label for="active"></label><input type="checkbox" id="active">
-			</td>
-		</tr>
-		<tr>
-			<td class="padding20" title="Actions with master config will automatically apply on slave">Slave for</td>
-			<td>
-				<select id="slavefor">
-					<option selected value="0">Not slave</option>
-					{% for master in masters %}
-						<option value="{{master.0}}">{{master.1}}</option>
-					{% endfor %}
-				</select>
-			</td>
-		</tr>
+		{% include 'include/admin_add_server.html' %}
 		<tr>
 			<td class="padding20">
 				Credentials
@@ -571,46 +348,11 @@
 				</select>
 			</td>
 		</tr>
-		<tr>
-			<td class="padding20">Desciption</td>
-			<td>
-				<input type="text" id="desc" size="30" class="form-control">
-			</td>
-		</tr>
 	</table>
 	<input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
 	</form>
 </div>
-<div id="user-change-password-table" style="display: none;">	
-		<table class="overview">
-			<tr>
-				<td colspan="2">
-					  <p class="validateTips alert alert-success">Enter password and confirm</p>
-				</td>
-			</tr>
-			<tr>
-				<td class="padding20">
-					Password				
-				</td>
-				<td>
-					<input type="password" name="change-password" id="change-password" class="form-control">
-				</td>
-			</tr>
-			<tr>
-				<td class="padding20">
-					Confirm password
-				</td>
-				<td>
-					<input type="password" name="change2-password" id="change2-password" class="form-control">
-				</td>
-			</tr>
-			<tr id="missmatchpass" style="display: none;">
-				<td colspan="2">
-					  <p class="validateTips alert alert-danger" style="margin-top: 10px;">Passwords are mismatched</p>
-				</td>
-			</tr>
-		</table>
-	</div>
+{% include 'include/change_pass_form.html' %}
 <script>
 	if($('#new-server-group-add').val() == 1) {
 		$('#group_error').css('display', 'block');
diff --git a/app/templates/viewstats.html b/app/templates/viewstats.html
index 1fc93938..907eb1f9 100644
--- a/app/templates/viewstats.html
+++ b/app/templates/viewstats.html
@@ -22,11 +22,7 @@
 <script> 
 	if (cur_url[1]) {
 		showStats();		
-	}
-	
-	function sleep(ms) {
-	  return new Promise(resolve => setTimeout(resolve, ms));
-	}
+	}	
 	async function wait() {
 		$('form').append('<input type="hidden" name="serv" value='+$("#serv").val()+'>');
 		$('form').append('<input type="hidden" name="token" value='+$('#token').val()+'>');
@@ -43,7 +39,7 @@
 		$('.v_menu').css('left', '200px');		
 		$('table.tbl th.pxname').css('width', '100%');
 		$('a.px:link').css('color', '#fff');
-		$('td').css('font-family', '"Helvetica Neue", Helvetica, Arial, sans-serif');
+		$('td').css('font-family', '-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol');
 		$('td').css('font-size', '11');
 		$('h1').css('display', 'none');
 		$('td').css('border-color', '#ddd');
@@ -76,8 +72,7 @@
 	}
 	$('#serv').on('selectmenuchange',function() {
 		showStats();		
-	});	
-	
+	});		
 </script>
 <link href="/inc/style.css" rel="stylesheet">
 {% endblock %}
\ No newline at end of file
diff --git a/app/tools/metrics_master.py b/app/tools/metrics_master.py
index 6ef99284..24691ff5 100644
--- a/app/tools/metrics_master.py
+++ b/app/tools/metrics_master.py
@@ -38,24 +38,28 @@ def main():
 	if need_start:
 		for serv in need_start:
 			start_worker(serv)
-			
-	waf_servers = sql.select_waf_servers()
-	waf_started_workers = get_waf_worker()
-	waf_servers_list = []
-			
-	for serv in waf_servers:
-		waf_servers_list.append(serv[0])
-			
-	waf_need_kill=list(set(waf_started_workers) - set(waf_servers_list))
-	waf_need_start=list(set(waf_servers_list) - set(waf_started_workers))
 	
-	if waf_need_kill:
-		for serv in waf_need_kill:
-			kill_waf_worker(serv)
-			
-	if waf_need_start:
-		for serv in waf_need_start:
-			start_waf_worker(serv)
+	try:
+		waf_servers = sql.select_all_waf_servers()
+		waf_started_workers = get_waf_worker()
+		waf_servers_list = []
+				
+		for serv in waf_servers:
+			waf_servers_list.append(serv[0])
+				
+		waf_need_kill=list(set(waf_started_workers) - set(waf_servers_list))
+		waf_need_start=list(set(waf_servers_list) - set(waf_started_workers))
+		
+		if waf_need_kill:
+			for serv in waf_need_kill:
+				kill_waf_worker(serv)
+				
+		if waf_need_start:
+			for serv in waf_need_start:
+				start_waf_worker(serv)
+	except Exception as e:
+		funct.logging("localhost", 'Problems with WAF worker metrics '+e, metrics=1)
+		pass
 	
 def start_worker(serv):
 	port = sql.get_setting('haproxy_sock_port')
diff --git a/app/versions.py b/app/versions.py
index d6210491..21ed45be 100644
--- a/app/versions.py
+++ b/app/versions.py
@@ -57,12 +57,7 @@ if serv is not None and form.getvalue('config') is not None:
 	except:
 		pass
 
-	MASTERS = sql.is_master(serv)
-	for master in MASTERS:
-		if master[0] != None:
-			funct.upload_and_restart(master[0], configver, just_save=save)
-			
-	stderr = funct.upload_and_restart(serv, configver, just_save=save)
+	stderr = funct.master_slave_upload_and_restart(serv, configver, just_save=save)
 		
 		
 output_from_parsed_template = template.render(h2 = 1, title = "Working with versions HAProxy configs",
diff --git a/config_other/httpd/haproxy-wi.conf b/config_other/httpd/haproxy-wi.conf
index cf9485a6..1dc277cd 100644
--- a/config_other/httpd/haproxy-wi.conf
+++ b/config_other/httpd/haproxy-wi.conf
@@ -41,4 +41,17 @@
   		Order Deny,Allow
   		Deny from all
 	</FilesMatch>
+	
+	<IfModule mod_headers.c>
+		Header set X-XSS-Protection: 1;
+		Header set X-Frame-Options: deny
+		Header set X-Content-Type-Options: nosniff
+		Header set Strict-Transport-Security: max-age=3600;
+		Header set Cache-Control no-cache
+		Header set Expires: 0
+
+		<filesMatch ".(ico|css|js|gif|jpeg|jpg|png|svg|woff|ttf|eot)$">
+			Header set Cache-Control "max-age=86400, public"
+		</filesMatch>
+	</IfModule>
 </VirtualHost>
diff --git a/image/haproxy-wi-hapserver.png b/image/haproxy-wi-hapserver.png
new file mode 100644
index 00000000..ed4088a2
Binary files /dev/null and b/image/haproxy-wi-hapserver.png differ
diff --git a/inc/add.js b/inc/add.js
index 95d2ffe8..f5915c13 100644
--- a/inc/add.js
+++ b/inc/add.js
@@ -264,7 +264,10 @@ $( function() {
 			} );
 		},
 		autoFocus: true,
-		minLength: -1
+		minLength: -1,
+		select: function( event, ui ) {
+			$(this).next().next().focus();				
+		}
 	});
 	$( "#backends" ).autocomplete({
 		source: function( request, response ) {
@@ -825,11 +828,8 @@ $( function() {
 		} );
 	});
 	var add_server_var = '<br /><input name="servers" title="Backend IP" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control">: <input name="server_port" title="Backend port" size=1 placeholder="yyy" class="form-control">'
-	$('#add-server-input').click(function() {
-		$('#servers').append(add_server_var);		
-	});
-	$('#add-server-input2').click(function() {
-		$('#servers2').append(add_server_var);		
+	$('[name=add-server-input]').click(function() {
+		$("[name=add_servers]").append(add_server_var);			
 	});
 	var add_userlist_var = '<br /><input name="userlist-user" title="User name" placeholder="user_name" class="form-control"> <input name="userlist-password" required title="User password. By default it insecure-password" placeholder="password" class="form-control"> <input name="userlist-user-group" title="User`s group" placeholder="user`s group" class="form-control">'
 	$('#add-userlist-user').click(function() {
@@ -971,7 +971,7 @@ function createHttps(TabId, proxy) {
 	history.pushState('Add'+proxy, 'Add'+proxy, 'add.py#'+proxy)
 }
 function confirmDeleteOption(id) {
-	 $( "#dialog-confirm-delete" ).dialog({
+	 $( "#dialog-confirm" ).dialog({
       resizable: false,
       height: "auto",
       width: 400,
@@ -1034,7 +1034,7 @@ function updateOptions(id) {
 	} );
 }
 function confirmDeleteSavedServer(id) {
-	 $( "#dialog-confirm-delete" ).dialog({
+	 $( "#dialog-confirm" ).dialog({
       resizable: false,
       height: "auto",
       width: 400,
@@ -1096,4 +1096,35 @@ function updateSavedServer(id) {
 			}
 		}
 	} );
+}
+function view_ssl(id) {
+	$.ajax( {
+		url: "options.py",
+		data: {
+			serv: $('#serv5').val(),
+			getcert: id,
+			token: $('#token').val()
+		},
+		type: "GET",
+		success: function( data ) {
+			if (data.indexOf('danger') != '-1') {
+				$("#ajax-show-ssl").html(data);
+			} else {
+				$('.alert-danger').remove();
+				$('#dialog-confirm-body').text(data);
+				$( "#dialog-confirm-cert" ).dialog({
+					resizable: false,
+					height: "auto",
+					width: 650,
+					modal: true,
+					title: "Certificate from "+$('#serv5').val()+", name: "+id,
+					buttons: {
+						Ok: function() {
+							$( this ).dialog( "close" );
+						}
+					  }
+				});					
+			} 
+		}
+	} );
 }
\ No newline at end of file
diff --git a/inc/metrics.js b/inc/metrics.js
index b7624f1b..22f24258 100644
--- a/inc/metrics.js
+++ b/inc/metrics.js
@@ -107,7 +107,7 @@ function renderWafChart(data, labels, server) {
         options: {
 			title: {
 				display: true,
-				text: data[1],
+				text: "WAF "+data[1],
 				fontSize: 20,
 				padding: 0,
 			},
diff --git a/inc/overview.js b/inc/overview.js
index 82ac864b..09a4ebea 100644
--- a/inc/overview.js
+++ b/inc/overview.js
@@ -51,14 +51,17 @@ function ajaxActionWafServers(action, id) {
 $( function() {
 	$('.start').click(function() {
 		var id = $(this).attr('id');
+		id = id.split('-')[1]
 		confirmAjaxAction("start", "hap", id);
 	});
 	$('.stop').click(function() {
 		var id = $(this).attr('id');
+		id = id.split('-')[1]
 		confirmAjaxAction("stop", "hap", id);
 	});
 	$('.restart').click(function() {
 		var id = $(this).attr('id');
+		id = id.split('-')[1]
 		confirmAjaxAction("restart", "hap", id);
 	});
 	$('.start-waf').click(function() {
diff --git a/inc/script.js b/inc/script.js
index 15263c61..13f95ad2 100644
--- a/inc/script.js
+++ b/inc/script.js
@@ -154,6 +154,12 @@ function startSetInterval(interval) {
 			intervalId = setInterval('showOverviewWaf()', interval);
 			showOverviewWaf();
 			showWafMetrics();
+		} else if (cur_url[0] == "hapservers.py") {
+			if(interval < 60000) {
+				interval = 60000;
+			}
+			intervalId = setInterval('showMetrics()', interval);
+			showMetrics();
 		} 
 	} else {
 		pauseAutoRefresh();
@@ -223,8 +229,8 @@ function showOverviewServer(name,ip,id) {
 		success: function( data ) {
 			$("#ajax-server-"+id).empty();
 			$("#ajax-server-"+id).css('display', 'block');
-			$("#ajax-server-"+id).css('background-color', '#f9fff8');
-			$("#ajax-server-"+id).css('border', '1px solid #ddd');
+			$("#ajax-server-"+id).css('background-color', '#fbfbfb');
+			$("#ajax-server-"+id).css('border', '1px solid #A4C7F5');
 			$(".ajax-server").css('display', 'block');
 			$(".div-server").css('clear', 'both');
 			$(".div-pannel").css('clear', 'both');
@@ -233,14 +239,6 @@ function showOverviewServer(name,ip,id) {
 			$(".div-pannel").css('height', '70px');
 			$("#div-pannel-"+id).insertBefore('#up-pannel')
 			$("#ajax-server-"+id).html(data);
-			$([document.documentElement, document.body]).animate({
-				scrollTop: $("#ajax-server-"+id).offset().top
-			}, 200);
-			$("#ajax-server-"+id).addClass( "update", 1000 );
-				setTimeout(function() {
-					$("#ajax-server-"+id).removeClass( "update" );
-					$("#ajax-server-"+id).css('background-color', '#f9fff8');			
-			}, 2500 );
 		}					
 	} );
 }
@@ -539,14 +537,6 @@ $( function() {
 			autoRefreshStyle(autoRefresh);
 		}
 	}
-	/* $("body").mCustomScrollbar({
-		theme:"minimal-dark",
-		scrollInertia:30
-		});
-	$(".diff").mCustomScrollbar({
-		theme:"minimal-dark",
-		scrollInertia:30
-		});	 */
 	$( "#tabs" ).tabs();
 	$( "select" ).selectmenu();
 		
@@ -682,7 +672,6 @@ $( function() {
         }
     });
 
-	
 	 $('#runtimeapiform').submit(function() {
 		showRuntime();
 		return false;
@@ -735,7 +724,6 @@ $( function() {
 			}
 		});
 
-
 	$('#show-updates-button').click(function() {
 		showUpdates.dialog('open');		
 	});
@@ -831,7 +819,7 @@ $( function() {
 	}
 });
 function sleep(ms) {
-	  return new Promise(resolve => setTimeout(resolve, ms));
+	return new Promise(resolve => setTimeout(resolve, ms));
 }
 async function ban() {
 	$( '#login').attr('disabled', 'disabled');
@@ -900,39 +888,26 @@ function replace_text(id_textarea, text_var) {
 	var text_val = str.substring(0, beg) + str.substring(end, len);
 	$(id_textarea).text(text_val);
 }
-
-function view_ssl(id) {
-	$.ajax( {
+function changeWafMode(id) {
+	var waf_mode = $('#'+id+' option:selected').val();
+	var server_hostname = id.split('_')[0];
+	 $.ajax( {
 		url: "options.py",
 		data: {
-			serv: $('#serv5').val(),
-			getcert: id,
+			change_waf_mode: waf_mode,
+			server_hostname: server_hostname,
 			token: $('#token').val()
 		},
 		type: "GET",
 		success: function( data ) {
-			if (data.indexOf('danger') != '-1') {
-				$("#ajax-show-ssl").html(data);
-			} else {
-				$('.alert-danger').remove();
-				$('#dialog-confirm-body').text(data);
-				$( "#dialog-confirm" ).dialog({
-					resizable: false,
-					height: "auto",
-					width: 650,
-					modal: true,
-					title: "Certificate from "+$('#serv5').val()+", name: "+id,
-					buttons: {
-						Ok: function() {
-							$( this ).dialog( "close" );
-						}
-					  }
-				});					
-			} 
+			alert('Do not forget restart WAF server: '+server_hostname)
+			$( '#'+server_hostname+'-select-line' ).addClass( "update", 1000 );										
+			setTimeout(function() {
+				$( '#'+server_hostname+'-select-line' ).removeClass( "update" );
+			}, 2500 );
 		}
-	} );
+	} ); 
 }
-
 function createList(color) {
 	if(color == 'white') {
 		list = $('#new_whitelist_name').val() 
@@ -1013,24 +988,3 @@ function saveList(action, list, color) {
 		}
 	} );	
 }
-function changeWafMode(id) {
-	var waf_mode = $('#'+id+' option:selected').val();
-	var server_hostname = id.split('_')[0];
-	 $.ajax( {
-		url: "options.py",
-		data: {
-			change_waf_mode: waf_mode,
-			server_hostname: server_hostname,
-			token: $('#token').val()
-		},
-		type: "GET",
-		success: function( data ) {
-			alert('Do not forget restart WAF server: '+server_hostname)
-			$( '#'+server_hostname+'-select-line' ).addClass( "update", 1000 );										
-			setTimeout(function() {
-				$( '#'+server_hostname+'-select-line' ).removeClass( "update" );
-			}, 2500 );
-		}
-	} ); 
-}
-
diff --git a/inc/style.css b/inc/style.css
index 500006cb..4e06f8c4 100644
--- a/inc/style.css
+++ b/inc/style.css
@@ -35,11 +35,15 @@ form {
 pre {
 	padding-left: 15px;
 }
-.icon {
+.icon, .icon-hapservs {
 	max-width: 20px;
 	margin-left: 2px;
+	margin-bottom: -3px;
 	cursor: pointer;
 }
+.icon-hapservs {
+	margin-bottom: 0px;
+}
 .top-menu {	
 	position: absolute;
 	min-height: calc(99vh - 50px);
@@ -141,7 +145,7 @@ pre {
 }
 .login {
 	float: right;
-	margin-top: 5px;
+	margin-top: 3px;
 	margin-left: 14px;
 	margin-right: 20px;
 	color: #fff !important;
@@ -150,7 +154,7 @@ pre {
 .auto-refresh {
 	margin-left: auto;
 	float: right;
-	margin-top: 5px;
+	margin-top: 3.7px;
 	margin-right: 5px;
 }
 .auto-refresh a {
@@ -539,6 +543,14 @@ ul{
     transition: background 1s ease-out;
 	font-size: 15px;
 }
+.form-login {
+	text-align: center;
+	background-color: #fff;
+	padding: 10px;
+	width: 220px;
+	background-size: 0 !important;
+	border: 0 !important;
+}
 .ui-button {
 	padding-left: 10px !important;
 	padding-right: 10px !important;
@@ -547,7 +559,6 @@ ul{
 .ui-state-default {
 	background-color: #EBF1F1 !important;
 }
-
 .ui-state-active {
 	background-color: #4A89D8 !important;
 	border: none !important;
@@ -779,12 +790,15 @@ label {
 	display: inline-block;
 	width: 160px;
 	padding-left: 30px;
-	padding-top: 27px;
-	font-size: 1em;
+	padding-top: 35px;
+	font-size: 12px;
+	float: left;
 }
 .top-info {
 	display: inline-block;
 	width: 350px;
+	margin-top: 30px;
+	font-size: 10px;
 }
 .update-icon {
 	float: right;
@@ -831,7 +845,13 @@ label {
 	}
 }
 @media (max-width: 1280px) {
-
+	.div-server {
+		margin-bottom: 30px !important;
+	}
+	.ajax-server {
+		clear: both !important;
+		margin-left: 20px !important;
+	}
 }
 @media (max-width: 1080px) {
 	#logo_span {
@@ -849,6 +869,9 @@ label {
 	.wrong-login {
 		margin-right: -50px;
 	}
+	.ajax-server {
+		width: 750px !important;
+	}
 }
 @media (max-width: 1024px) {
 	#logo_span {
diff --git a/inc/waf.js b/inc/waf.js
index dc5f0ff2..636d3e33 100644
--- a/inc/waf.js
+++ b/inc/waf.js
@@ -51,4 +51,24 @@ function installWaf(ip) {
 			}	
 		}
 	} );	
+}
+function changeWafMode(id) {
+	var waf_mode = $('#'+id+' option:selected').val();
+	var server_hostname = id.split('_')[0];
+	 $.ajax( {
+		url: "options.py",
+		data: {
+			change_waf_mode: waf_mode,
+			server_hostname: server_hostname,
+			token: $('#token').val()
+		},
+		type: "GET",
+		success: function( data ) {
+			alert('Do not forget restart WAF server: '+server_hostname)
+			$( '#'+server_hostname+'-select-line' ).addClass( "update", 1000 );										
+			setTimeout(function() {
+				$( '#'+server_hostname+'-select-line' ).removeClass( "update" );
+			}, 2500 );
+		}
+	} ); 
 }
\ No newline at end of file