diff --git a/app/options.py b/app/options.py
index 2c236e1b..381b971a 100644
--- a/app/options.py
+++ b/app/options.py
@@ -453,7 +453,10 @@ if form.getvalue('new_metrics'):
 	sess_rate = ''
 
 	for i in metric:
-		labels += str(i[5].split(' ')[1])+','
+		label = str(i[5])
+		label = label.split(' ')[1]
+		label = label.split(':')
+		labels += label[0]+':'+label[1]+','
 		curr_con += str(i[1])+','
 		curr_ssl_con += str(i[2])+','
 		sess_rate += str(i[3])+','
diff --git a/app/templates/ajax/table_metrics.html b/app/templates/ajax/table_metrics.html
index 9e2a93cb..0250e283 100644
--- a/app/templates/ajax/table_metrics.html
+++ b/app/templates/ajax/table_metrics.html
@@ -1,6 +1,6 @@
-<table>
+<table style="min-width: 40%;">
 	<tr class="overviewHead">
-		<th colspan=13>Metrics</th>
+		<th colspan=13 style="background-color: #d1ecf1">Metrics</th>
 	</tr>
 	<tr>
 		<th class="padding10 first-collumn overviewTr" rowspan=2>Server</th>
diff --git a/app/templates/metrics.html b/app/templates/metrics.html
index 4211d8ea..ffe2d181 100644
--- a/app/templates/metrics.html
+++ b/app/templates/metrics.html
@@ -1,10 +1,6 @@
 {% extends "base.html" %}
 {% block content %}	
 <style>
-iframe {
-	border: none;
-	padding: 10px;
-}
 table, th, tr, td {
 	border: 1px solid #ddd;
 	align: center;
@@ -12,6 +8,7 @@ table, th, tr, td {
 }
 th, tr, td {
 	width: 6%;
+	min-width: 3%;
 	padding: 10px;
 	}
 </style>
@@ -20,16 +17,19 @@ th, tr, td {
 <script src="/inc/chart.min.js"></script>
 <div id="table_metrics"></div>
 {% for s in servers %}
-<div class="chart-container" style="">
+<div class="chart-container">
 	<canvas id="{{s.0}}" role="img"></canvas>
 </div>
-	<script>
-		getChartData('{{s.0}}')
-	</script>
 {% endfor %}
 
 <div id="metrics_iframe"></div>
 <script>
+function showMetrics() {
+	{% for s in servers %}
+		getChartData('{{s.0}}')
+	{% endfor %}
+}
+	showMetrics()
 	loadMetrics()
  </script>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/waf.html b/app/templates/waf.html
index 8526e720..1b8d16c3 100644
--- a/app/templates/waf.html
+++ b/app/templates/waf.html
@@ -30,15 +30,18 @@
 <script src="/inc/chart.min.js"></script>
 
 {% for s in servers %}
-<div class="chart-container" style="">
+<div class="chart-container">
 	<canvas id="{{s.0}}" role="img"></canvas>
 </div>
-	<script>
-		getWafChartData('{{s.0}}')
-	</script>
 {% endfor %}
 
 <script>
-showOverviewWaf()
+	function showWafMetrics() {
+		{% for s in servers %}
+			getWafChartData('{{s.0}}')
+		{% endfor %}
+	}
+	showWafMetrics()
+	showOverviewWaf()
 </script>
 {% endblock %}
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index b27d37df..aabe43f2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,6 @@ requests_toolbelt==0.8.0
 pyTelegramBotAPI==3.6.3 
 dump==0.0.4
 networkx==2.1
-numpy==1.14.0
 matplotlib==2.1.2
 future==0.13.1
 mysql-connector-python==8.0.11