diff --git a/README.md b/README.md
index 317cc510..3921a34b 100755
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # PHP Server Monitor
 
+Version 3.0.0
+
 ## Summary
 
 PHP Server Monitor is a script that checks whether your websites and servers are up and running.
diff --git a/src/psm/Module/Server/Controller/AbstractServerController.class.php b/src/psm/Module/Server/Controller/AbstractServerController.class.php
index 260fc606..4a763b2f 100644
--- a/src/psm/Module/Server/Controller/AbstractServerController.class.php
+++ b/src/psm/Module/Server/Controller/AbstractServerController.class.php
@@ -110,6 +110,7 @@ abstract class AbstractServerController extends AbstractController {
 			$server['status'] = 'warning';
 		}
 
+		$server['error'] = htmlentities($server['error']);
 		$server['type'] = psm_get_lang('servers', 'type_' . $server['type']);
 
 		return $server;
diff --git a/src/templates/main.tpl.html b/src/templates/main.tpl.html
index 1fc063a0..5615e375 100755
--- a/src/templates/main.tpl.html
+++ b/src/templates/main.tpl.html
@@ -9,8 +9,8 @@
     <meta name="author" content="">
 	{auto_refresh}
     <!-- Le styles -->
-    <link href="static/plugin/twitter-bootstrap/css/bootstrap.css" rel="stylesheet">
-    <link href="static/plugin/twitter-bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="static/plugin/twitter-bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <link href="static/plugin/twitter-bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet">
     <link href="static/css/style.css" rel="stylesheet">
 	<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
diff --git a/src/templates/server/history.tpl.html b/src/templates/server/history.tpl.html
index 427f775e..a36d00db 100644
--- a/src/templates/server/history.tpl.html
+++ b/src/templates/server/history.tpl.html
@@ -27,7 +27,7 @@
 	<div class="info-container">
 		<div class="info-content">
 			<div class="info-dropdown btn-group">
-				<button class="btn dropdown-toggle" data-toggle="dropdown"><i class="icon-info-sign"></i></span></button>
+				<button class="btn dropdown-toggle" data-toggle="dropdown"><i class="icon-info-sign"></i></button>
 				<ul class="dropdown-menu">
 					<li><span>{label_latency_avg}: {latency_avg}</span></li>
 				</ul>
diff --git a/src/templates/server/log.tpl.html b/src/templates/server/log.tpl.html
index 9cc631c7..c58d8123 100755
--- a/src/templates/server/log.tpl.html
+++ b/src/templates/server/log.tpl.html
@@ -22,11 +22,17 @@
 <!--%tpl_server_log_entries-->
 <!-- {logtitle} -->
 <table class="table table-bordered table-striped">
+	<colgroup>
+		<col />
+		<col />
+		<col style="width: 135px" />
+		<col />
+	</colgroup>
     <thead>
         <tr>
             <th>{label_server}</th>
             <th>{label_message}</th>
-            <th width="130">{label_date}</th>
+            <th>{label_date}</th>
             <th>{label_users}</th>
         </tr>
     </thead>
diff --git a/src/templates/server/status.tpl.html b/src/templates/server/status.tpl.html
index e5878447..b8065ec4 100755
--- a/src/templates/server/status.tpl.html
+++ b/src/templates/server/status.tpl.html
@@ -53,24 +53,24 @@
 		margin-right: 20px;
 	}
 </style>
-	<div class="offline">
-		<!--%tpl_repeat_servers_offline-->
-		<div class="entity {class_warning}" onclick="window.location.href='{url_view}'">
-			<h2>{label}</h2>
-			<p>{label_last_online}: {last_online_nice}</p>
-			<p>{label_last_check}: {last_checked_nice}</p>
-		</div>
-		<!--%%tpl_repeat_servers_offline-->
-		{servers_offline}
+<div class="offline">
+	<!--%tpl_repeat_servers_offline-->
+	<div class="entity {class_warning}" onclick="window.location.href='{url_view}'">
+		<h2>{label}</h2>
+		<p>{label_last_online}: {last_online_nice}</p>
+		<p>{label_last_check}: {last_checked_nice}</p>
 	</div>
-	<div class="online">
-		<!--%tpl_repeat_servers_online-->
-		<div class="entity" onclick="window.location.href='{url_view}'">
-			<h2>{label}</h2>
-			<p>{label_last_online}: {last_checked_nice}</p>
-			<p>{label_rtime}: {rtime}s</p>
-		</div>
-		<!--%%tpl_repeat_servers_online-->
-		{servers_online}
+	<!--%%tpl_repeat_servers_offline-->
+	{servers_offline}
+</div>
+<div class="online">
+	<!--%tpl_repeat_servers_online-->
+	<div class="entity" onclick="window.location.href='{url_view}'">
+		<h2>{label}</h2>
+		<p>{label_last_online}: {last_checked_nice}</p>
+		<p>{label_rtime}: {rtime}s</p>
 	</div>
+	<!--%%tpl_repeat_servers_online-->
+	{servers_online}
+</div>
 <!--%%tpl_server_status-->
\ No newline at end of file
diff --git a/src/templates/server/view.tpl.html b/src/templates/server/view.tpl.html
index f53bc634..efae2383 100644
--- a/src/templates/server/view.tpl.html
+++ b/src/templates/server/view.tpl.html
@@ -2,6 +2,7 @@
 <table class="table table-bordered">
 	<colgroup>
 		<col class="oce-first" />
+		<col />
 	</colgroup>
 	<thead>
 		<tr class="head">