diff --git a/views/containers.html b/views/containers.html
index d8ac3ea..815a67a 100644
--- a/views/containers.html
+++ b/views/containers.html
@@ -1,4 +1,4 @@
-<% include include/header.html %>
+<%- include('include/header.html') %>
 <div class="col-md-12">
     <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">
         <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> New container
@@ -188,4 +188,4 @@ <h4 class="modal-title" id="myModalLabel">New container</h4>
         </div>
     </div>
 </div>
-<% include include/footer.html %>
+<%- include('include/footer.html') %>
diff --git a/views/error.html b/views/error.html
index 1af1e43..82b8f53 100644
--- a/views/error.html
+++ b/views/error.html
@@ -1,4 +1,4 @@
-<% include include/header.html %>
+<%- include('include/header.html') %>
 <div class="container">
     <div class="row">
         <div class="text-center">
@@ -10,4 +10,4 @@ <h2><%= error.status %> <%= message %></h2>
         </div>
     </div>
 </div>
-<% include include/footer.html %>
+<%- include('include/footer.html') %>
diff --git a/views/images.html b/views/images.html
index 2a7de58..dd1aa3d 100644
--- a/views/images.html
+++ b/views/images.html
@@ -1,4 +1,4 @@
-<% include include/header.html %>
+<%- include('include/header.html') %>
 <div class="container">
     <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modelImage">
         <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Pull image
@@ -79,4 +79,4 @@ <h4 class="modal-title" id="myModalLabel">Pull image</h4>
         </div>
     </div>
 </div>
-<% include include/footer.html %>
+<%- include('include/footer.html') %>
diff --git a/views/login.html b/views/login.html
index daf41c7..e8df893 100644
--- a/views/login.html
+++ b/views/login.html
@@ -1,4 +1,4 @@
-<% include include/header.html %>
+<%- include('include/header.html') %>
 <div class="container" data-page="login">
     <div class="jumbotron">
         <h3>Easy Docker Web Login page</h3>
@@ -23,4 +23,4 @@ <h3>Easy Docker Web Login page</h3>
         </div>
     </form>
 </div>
-<% include include/footer.html %>
+<%- include('include/footer.html') %>
diff --git a/views/logs.html b/views/logs.html
index cbabfea..a4cec0d 100644
--- a/views/logs.html
+++ b/views/logs.html
@@ -1,5 +1,5 @@
-<% include include/header.html %>
+<%- include('include/header.html') %>
     <div class="container" data-page="logs">
         <div id="terminal"></div>
     </div>
-<% include include/footer.html %>
\ No newline at end of file
+<%- include('include/footer.html') %>
diff --git a/views/overview.html b/views/overview.html
index 587b949..9dd4ff4 100644
--- a/views/overview.html
+++ b/views/overview.html
@@ -1,86 +1,85 @@
-<% include include/header.html %>
-    <div class="container" data-page="overview">
-        <div class="row">
-            <div class="col-md-3">
-                <div class="panel panel-primary">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">OS</h3>
-                    </div>
-                    <div class="panel-body">
-                        <%= info.OperatingSystem %>
-                    </div>
+<%- include('include/header.html') %>
+<div class="container" data-page="overview">
+    <div class="row">
+        <div class="col-md-3">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <h3 class="panel-title">OS</h3>
+                </div>
+                <div class="panel-body">
+                    <%= info.OperatingSystem %>
                 </div>
             </div>
-            <div class="col-md-3">
-                <div class="panel panel-primary">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">Docker version</h3>
-                    </div>
-                    <div class="panel-body">
-                        <%= info.ServerVersion %>
-                    </div>
+        </div>
+        <div class="col-md-3">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <h3 class="panel-title">Docker version</h3>
+                </div>
+                <div class="panel-body">
+                    <%= info.ServerVersion %>
                 </div>
             </div>
+        </div>
 
-            <div class="col-md-3">
-                <div class="panel panel-primary">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">CPU</h3>
-                    </div>
-                    <div class="panel-body">
-                        <%= info.NCPU %>
-                    </div>
+        <div class="col-md-3">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <h3 class="panel-title">CPU</h3>
                 </div>
-            </div>
-            <div class="col-md-3">
-                <div class="panel panel-primary">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">Name</h3>
-                    </div>
-                    <div class="panel-body">
-                        <%= info.Name %>
-                    </div>
+                <div class="panel-body">
+                    <%= info.NCPU %>
                 </div>
             </div>
         </div>
-
-        <div class="row">
-            <div class="col-md-6">
-                <div class="panel panel-success">
-                    <a href="/containers" class="panel-heading panel-title btn btn-success btn-sm" style="width: 100%;">Containers</a>
-                    <div class="panel-body">
-                        <div class="col-md-4">
-                            <p class="text-success">Running :
-                                <%= info.ContainersRunning %>
-                            </p>
-                        </div>
-                        <div class="col-md-4">
-                            <p class="text-warning">Paused :
-                                <%= info.ContainersPaused %>
-                            </p>
-                        </div>
-                        <div class="col-md-4">
-                            <p class="text-danger">Stopped :
-                                <%= info.ContainersStopped %>
-                            </p>
-                        </div>
-                    </div>
+        <div class="col-md-3">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <h3 class="panel-title">Name</h3>
+                </div>
+                <div class="panel-body">
+                    <%= info.Name %>
                 </div>
             </div>
+        </div>
+    </div>
 
-            <div class="col-md-6">
-                <div class="panel panel-success">
-                    <a href="/images" class="panel-heading panel-title btn btn-success btn-sm" style="width: 100%;">Images</a>
-                    <div class="panel-body">
-                        <p class="text-center">
-                            <%= info.Images %>
+    <div class="row">
+        <div class="col-md-6">
+            <div class="panel panel-success">
+                <a href="/containers" class="panel-heading panel-title btn btn-success btn-sm" style="width: 100%;">Containers</a>
+                <div class="panel-body">
+                    <div class="col-md-4">
+                        <p class="text-success">Running :
+                            <%= info.ContainersRunning %>
+                        </p>
+                    </div>
+                    <div class="col-md-4">
+                        <p class="text-warning">Paused :
+                            <%= info.ContainersPaused %>
+                        </p>
+                    </div>
+                    <div class="col-md-4">
+                        <p class="text-danger">Stopped :
+                            <%= info.ContainersStopped %>
                         </p>
                     </div>
                 </div>
             </div>
-
-
         </div>
 
+        <div class="col-md-6">
+            <div class="panel panel-success">
+                <a href="/images" class="panel-heading panel-title btn btn-success btn-sm"
+                   style="width: 100%;">Images</a>
+                <div class="panel-body">
+                    <p class="text-center">
+                        <%= info.Images %>
+                    </p>
+                </div>
+            </div>
+        </div>
     </div>
-    <% include include/footer.html %>
\ No newline at end of file
+
+</div>
+<%- include('include/footer.html') %>