diff --git a/www/js/services/network-services.js b/www/js/services/network-services.js
index dbf0b26c991cb7b5773e61c642af6986edaf4dd9..a6a578d9217d53a9ad2d6f6dd6d1c2a8555f0b96 100644
--- a/www/js/services/network-services.js
+++ b/www/js/services/network-services.js
@@ -682,7 +682,7 @@ angular.module('cesium.network.services', ['ngApi', 'cesium.currency.services',
         }
 
         // Raise event on new main block
-        if (updateMainBuid && mainBlock.buid && (!data.mainBlock || data.mainBlock.buid !== mainBlock.buid)) {
+        if (updateMainBuid && mainBlock && mainBlock.buid && (!data.mainBlock || data.mainBlock.buid !== mainBlock.buid)) {
           data.mainBlock = mainBlock;
           api.data.raise.mainBlockChanged(mainBlock);
         }
diff --git a/www/plugins/es/js/controllers/network-controllers.js b/www/plugins/es/js/controllers/network-controllers.js
index ebaf126bfe0a71658896f8243d50305938ca9f65..8d259a27afd3b8272b60c1de830e4c9bcec9d466 100644
--- a/www/plugins/es/js/controllers/network-controllers.js
+++ b/www/plugins/es/js/controllers/network-controllers.js
@@ -8,7 +8,11 @@ angular.module('cesium.es.network.controllers', ['cesium.es.services'])
   if (enable) {
     PluginServiceProvider.extendState('app.network', {
       points: {
-        'buttons': {
+        'network-buttons': {
+          templateUrl: "plugins/es/templates/network/view_network_extend.html",
+          controller: 'ESExtensionCtrl'
+        },
+        'blockchain-buttons': {
           templateUrl: "plugins/es/templates/network/view_network_extend.html",
           controller: 'ESExtensionCtrl'
         }
diff --git a/www/plugins/es/templates/network/view_network.html b/www/plugins/es/templates/network/view_network.html
index d2c29d8c1ae0a65b2aed875cf89383dce2487135..21070d503c7c35a30bccf24c9aef646b6be98783 100644
--- a/www/plugins/es/templates/network/view_network.html
+++ b/www/plugins/es/templates/network/view_network.html
@@ -1,6 +1,7 @@
 <ion-view>
   <ion-nav-title>
-    <span translate>MENU.NETWORK</span>
+    <span translate>MENU.NETWORK</span>&nbsp;
+    <span translate>ES_SETTINGS.PLUGIN_NAME</span>
   </ion-nav-title>
 
   <ion-nav-buttons side="secondary">
diff --git a/www/plugins/es/templates/network/view_network_extend.html b/www/plugins/es/templates/network/view_network_extend.html
index 82470990b5f11bb36cce317561b683c82eb45b39..71ac0460c53cb61b24528e672c3d48bbae64a168 100644
--- a/www/plugins/es/templates/network/view_network_extend.html
+++ b/www/plugins/es/templates/network/view_network_extend.html
@@ -1,8 +1,19 @@
-<!-- Buttons section -->
-<ng-if ng-if=":state:enable">
+<!-- Network: buttons section -->
+<ng-if ng-if=":state:enable && extensionPoint === 'network-buttons'">
+  <a class="button button-text button-small hidden-xs hidden-sm ink"
+     title="{{'NETWORK.VIEW.ENDPOINTS.ES_USER_API'|translate}}"
+     ui-sref="app.es_network" >
+    <i class="icon ion-image"></i>
+    <span>{{'ES_SETTINGS.PLUGIN_NAME'|translate}}</span>
+  </a>
+</ng-if>
+
+<!-- Blockchain: buttons section -->
+<ng-if ng-if=":state:enable && extensionPoint === 'blockchain-buttons'">
   <a class="button button-text button-small ink"
      ui-sref="app.blockchain_search" >
     <i class="icon ion-android-search"></i>
     <span>{{'COMMON.BTN_SEARCH'|translate}}</span>
   </a>
 </ng-if>
+
diff --git a/www/templates/network/view_network.html b/www/templates/network/view_network.html
index 3a87285b371f5c41037419b4991ce4dc42c112f3..dea8005242c96767686fffff6b65f799dd2043bf 100644
--- a/www/templates/network/view_network.html
+++ b/www/templates/network/view_network.html
@@ -59,7 +59,8 @@
               </a>
 
               <!-- Allow extension here -->
-              <cs-extension-point name="filter-buttons"></cs-extension-point>
+              <cs-extension-point name="network-buttons"></cs-extension-point>
+
             </div>
           </div>
         </div>
@@ -86,7 +87,7 @@
             </a>
 
             <!-- Allow extension here -->
-            <cs-extension-point name="buttons"></cs-extension-point>
+            <cs-extension-point name="blockchain-buttons"></cs-extension-point>
 
           </div>
         </div>