diff --git a/argos/server/templates/agents.html b/argos/server/templates/agents.html
index 9cd6b1a..aa5d58f 100644
--- a/argos/server/templates/agents.html
+++ b/argos/server/templates/agents.html
@@ -9,13 +9,12 @@
         </tr>
     </thead>
     <tbody>
-
-    {% for result in last_seen %}
-    <tr>
-        <td>{{ result.agent_id }}</td>
-        <td>{{ result.submitted_at }}</td>
-    </tr>
-    {% endfor %}
+        {% for result in last_seen %}
+        <tr>
+            <td>{{ result.agent_id }}</td>
+            <td>{{ result.submitted_at }}</td>
+        </tr>
+        {% endfor %}
     </tbody>
 </table>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/argos/server/templates/base.html b/argos/server/templates/base.html
index 14e48be..d8dc26b 100644
--- a/argos/server/templates/base.html
+++ b/argos/server/templates/base.html
@@ -1,20 +1,23 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>Argos</title>
-    <link href="{{ url_for('static', path='/styles.css') }}" rel="stylesheet">
-  </head>
-  <body>
-    <main class="container">
-      <div id="header">
-        {% block title %}<a href="/"><h1 id="title">Argos monitoring</h1></a>{% endblock %}
-      </div>
-      
-      <div id="content">
-        {% block content %}
-        {% endblock %}
-      </div>
-    </main>
-  </body>
-</html>
\ No newline at end of file
+    <head>
+        <meta charset="utf-8">
+        <title>Argos</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+        <link href="{{ url_for('static', path='/styles.css') }}" rel="stylesheet">
+    </head>
+    <body>
+        <main class="container">
+            <div id="header">
+                {% block title %}
+                    <a href="/"><h1 id="title">Argos monitoring</h1></a>
+                {% endblock %}
+            </div>
+            <div id="content">
+                {% block content %}
+                {% endblock %}
+            </div>
+        </main>
+    </body>
+</html>
diff --git a/argos/server/templates/details.html b/argos/server/templates/details.html
index 64a2d36..7994606 100644
--- a/argos/server/templates/details.html
+++ b/argos/server/templates/details.html
@@ -2,34 +2,32 @@
 {% block content %}
     <div id="domains" class="frame">
         <p>
-            {{domains | length}} domains,
+            {{ domains | length}} domains,
             {{ total_task_count }} tasks,
-            <a href="/agents">{{ agents |length }} agent{% if agents|length > 1 %}s{% endif %}</a>
-
-            </p>
-    
+            <a href="/agents">{{ agents | length }} agent{% if agents | length > 1 %}s{% endif %}</a>
+        </p>
         <table id="domains-list" role="grid">
         <thead>
             <tr>
-            <th>Domain</th>
-            <th class="today">Current status</th>
-            <th>Last check</th>
+                <th>Domain</th>
+                <th class="today">Current status</th>
+                <th>Last check</th>
+            </tr>
         </thead>
 
         <tbody id="domains-body">
             {% for (domain, status) in domains %}
             <tr>
                 <td>
-                <a href="/domain/{{domain}}">
-                    {{ domain }} </a>
+                    <a href="/domain/{{ domain }}">{{ domain }}</a>
+                </td>
+                <td class="status highlight">
+                    {% if status == "ok" %}✅ OK {% elif statuts == "warning"%}⚠ Warning{% elif status == "critical"%}❌ Critical{% elif status == "to-process" %}⏱︎ Waiting for the jobs{% endif %}
                 </td>
-                
-                <td class="status highlight">{% if status == "ok" %}✅ OK {% elif statuts == "warning"%}⚠ Warning{% elif status == "critical"%}❌ Critical{% elif status == "to-process" %}⏱︎ Waiting for the jobs{% endif %}</td>
                 <td>{{ last_checks.get(domain) }}</td>
             </tr>
             {% endfor %}
-            
         </tbody>
-        </table>    
+        </table>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/argos/server/templates/domain.html b/argos/server/templates/domain.html
index 5d1d4b0..36b669d 100644
--- a/argos/server/templates/domain.html
+++ b/argos/server/templates/domain.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}<h2>{{domain}}</h2>{% endblock %}
+{% block title %}<h2>{{ domain }}</h2>{% endblock %}
 {% block content %}
     <div id="domains" class="frame">
         <table id="domains-list" role="grid">
@@ -19,12 +19,13 @@
                 <td>{{ task.url }}</td>
                 <td>{{ task.check }}</td>
                 <td>{{ task.expected }}</td>
-                <td class="status highlight"><a data-tooltip="Completed at {{ task.completed_at }}" href="/result/{{ task.last_result.id }}">{% if task.status == "success" %}✅ Success {% elif task.status == "error"%}⚠ Error{% elif task.status == "failure"%}❌ Failure{% endif %}</a></td>
+                <td class="status highlight">
+                    <a data-tooltip="Completed at {{ task.completed_at }}" href="/result/{{ task.last_result.id }}">{% if task.status == "success" %}✅ Success {% elif task.status == "error"%}⚠ Error{% elif task.status == "failure"%}❌ Failure{% endif %}</a>
+                </td>
                 <td><a href="/task/{{task.id}}/results">view all</a></td>
             </tr>
             {% endfor %}
-            
         </tbody>
-        </table>    
+        </table>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/argos/server/templates/result.html b/argos/server/templates/result.html
index a6b3eb6..3154eaa 100644
--- a/argos/server/templates/result.html
+++ b/argos/server/templates/result.html
@@ -1,17 +1,16 @@
 {% extends "base.html" %}
-{% block title %}<h2>{{result}}</h2>{% endblock %}
+{% block title %}<h2>{{ result }}</h2>{% endblock %}
 {% block content %}
 <dl>
     <dt>Task</dt>
-    <dd>{{result.task}}</dd>
+    <dd>{{ result.task }}</dd>
     <dt>Submitted at</dt>
-    <dd>{{result.submitted_at}}</dd>
+    <dd>{{ result.submitted_at }}</dd>
     <dt>Status</dt>
-    <dd>{{result.status}}</dd>
+    <dd>{{ result.status }}</dd>
     <dt>Severity</dt>
-    <dd>{{result.severity}}</dd>
+    <dd>{{ result.severity }}</dd>
     <dt>Context</dt>
-    <dd>{{result.context}}</dd>
+    <dd>{{ result.context }}</dd>
 </dl>
-
-{% endblock %}
\ No newline at end of file
+{% endblock %}
