diff --git a/app/views/index.jade b/app/views/index.jade
index bcc7ac5..a74f173 100755
--- a/app/views/index.jade
+++ b/app/views/index.jade
@@ -1,11 +1,4 @@
 extends layouts/default
 
 block content
-  .connection-status.container(data-ng-controller='ConnectionController')
-    .alert.alert-danger(data-ng-show='!serverOnline || !clienteOnline || !apiOnline', data-ng-init='getConnStatus()')
-        strong Error!
-        p(data-ng-show='!apiOnline') Can't connect to bitcoind.
-        p(data-ng-show='!serverOnline') Can't connect to server.
-        p(data-ng-show='!clienteOnline') Can't connect to internet. Please, check your connection.
-
   section.container(data-ng-view)
diff --git a/public/js/config.js b/public/js/config.js
index 3aeedbb..1abe75a 100755
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -20,11 +20,11 @@ angular.module('insight').config(function($routeProvider) {
       title: 'Home'
     }).
     when('/blocks', {
-      templateUrl: '/views/blocks/list.html',
+      templateUrl: '/views/blocks_list.html',
       title: 'Bitcoin Blocks solved Today'
     }).
     when('/blocks-date/:blockDate', {
-      templateUrl: '/views/blocks/list.html',
+      templateUrl: '/views/blocks_list.html',
       title: 'Bitcoin Blocks solved '
     }).
     when('/address/:addrStr', {
diff --git a/public/views/404.html b/public/views/404.html
index bb3b23f..76da6bd 100644
--- a/public/views/404.html
+++ b/public/views/404.html
@@ -1,3 +1,4 @@
+<div data-ng-include src="'/views/includes/connection.html'"></div>
 <div class="jumbotron">
   <h1>Ooops!</h1>
   <h2 class="text-muted">404 Page not found :(</h2>
diff --git a/public/views/address.html b/public/views/address.html
index c23d54e..76c06ff 100644
--- a/public/views/address.html
+++ b/public/views/address.html
@@ -1,3 +1,4 @@
+<div data-ng-include src="'/views/includes/connection.html'"></div>
 <section data-ng-controller="AddressController" data-ng-init="findOne()">
   <div class="row">
     <div class="col-xs-12 col-gray col-gray-fixed">
diff --git a/public/views/block.html b/public/views/block.html
index 2342f37..53e4aae 100644
--- a/public/views/block.html
+++ b/public/views/block.html
@@ -1,3 +1,4 @@
+<div data-ng-include src="'/views/includes/connection.html'"></div>
 <section data-ng-controller="BlocksController" data-ng-init="findOne()">
   <div class="row">
     <div class="col-xs-12 col-gray col-gray-fixed">
diff --git a/public/views/blocks/list.html b/public/views/block_list.html
similarity index 96%
rename from public/views/blocks/list.html
rename to public/views/block_list.html
index 90c999f..f826056 100644
--- a/public/views/blocks/list.html
+++ b/public/views/block_list.html
@@ -1,3 +1,4 @@
+<div data-ng-include src="'/views/includes/connection.html'"></div>
 <section data-ng-controller="BlocksController" data-ng-init="list()">
   <div class="row">
     <div class="col-xs-12 col-gray col-gray-fixed">
diff --git a/public/views/index.html b/public/views/index.html
index 2e482a6..cba1d2c 100644
--- a/public/views/index.html
+++ b/public/views/index.html
@@ -1,6 +1,7 @@
 <div class="alert alert-danger" data-ng-show="flashMessage">
   {{flashMessage}}
 </div>
+<div data-ng-include src="'/views/includes/connection.html'"></div>
 <section data-ng-controller="IndexController" data-ng-init="index()">
   <div class="container">
     <div id="home" class="row">
diff --git a/public/views/status.html b/public/views/status.html
index 68c83e6..0cf5060 100644
--- a/public/views/status.html
+++ b/public/views/status.html
@@ -1,11 +1,12 @@
+<div data-ng-include src="'/views/includes/connection.html'"></div>
 <section>
   <div class="page-header">
     <h1>
-      Application Status 
+      Application Status
     </h1>
   </div>
   <div id="status" class="row">
-      
+
     <div class="col-xs-12 col-md-8">
       <h2>Sync Status</h2>
       <table class="table"  data-ng-controller="StatusController" data-ng-init="getSync()">
@@ -15,7 +16,7 @@
         </thead>
         <tr>
           <td>Sync Progress</td>
-          <td> 
+          <td>
           <div class="progress">
             <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: {{ sync.syncPercentage}}%">
                 <span>{{sync.syncPercentage}}% Complete</span>
@@ -26,7 +27,7 @@
           <td>Current Sync Status</td>
           <td class="text-right">{{sync.status}}</td>
         </tr>
- 
+
         <tr>
           <td>Initial Block Chain Height</td>
           <td class="text-right">{{sync.blockChainHeight}}</td>
@@ -39,10 +40,10 @@
           <td class="text-right">{{sync.skippedBlocks}}</td>
         </tbody>
       </table>
-    
+
       <h2>Transaction Output Set Information</h2>
       <table class="table" style="table-layout: fixed" data-ng-controller="StatusController" data-ng-init="getStatus('TxOutSetInfo')">
-        <thead  data-ng-include src="'/views/infoStatus.html'"> </thead>
+        <thead  data-ng-include src="'/views/includes/infoStatus.html'"> </thead>
         <tbody>
         <tr>
           <td>Height</td>
@@ -74,10 +75,10 @@
         </tr>
         </tbody>
       </table>
-      
+
       <h2>Last Block</h2>
       <table class="table" style="table-layout: fixed" data-ng-controller="StatusController" data-ng-init="getStatus('LastBlockHash')">
-        <thead  data-ng-include src="'/views/infoStatus.html'"> </thead>
+        <thead  data-ng-include src="'/views/includes/infoStatus.html'"> </thead>
         <tr>
           <td>Last Block Hash</td>
           <td class="text-right ellipsis"><a href="/block/{{lastblockhash}}">{{lastblockhash}}</a></td>
@@ -89,7 +90,7 @@
     <div class="col-xs-12 col-md-4 col-gray">
       <h2>Bitcoin node information</h2>
       <table class="table" data-ng-controller="StatusController" data-ng-init="getStatus('Info')">
-        <thead  data-ng-include src="'/views/infoStatus.html'"> </thead>
+        <thead  data-ng-include src="'/views/includes/infoStatus.html'"> </thead>
         <tbody>
         <tr>
           <td>Version</td>
@@ -144,7 +145,7 @@
 
       <h4>Difficulty</h4>
       <table class="table" data-ng-controller="StatusController" data-ng-init="getStatus('Difficulty')">
-        <thead  data-ng-include src="'/views/infoStatus.html'"> </thead>
+        <thead  data-ng-include src="'/views/includes/infoStatus.html'"> </thead>
         <tbody
         <tr>
           <td>Mining Difficulty</td>
diff --git a/public/views/transaction.html b/public/views/transaction.html
index 2d378cb..abb4533 100644
--- a/public/views/transaction.html
+++ b/public/views/transaction.html
@@ -1,3 +1,4 @@
+<div data-ng-include src="'/views/includes/connection.html'"></div>
 <section data-ng-controller="transactionsController" data-ng-init="findThis()">
     <h1>
       Transaction
@@ -48,7 +49,7 @@
           </tbody>
         </table>
     </div>
- 
+
   </div>
 </section>