diff --git a/README.md b/README.md
index e04dcd6..18760fb 100644
--- a/README.md
+++ b/README.md
@@ -42,4 +42,11 @@ See [CONTRIBUTING](CONTRIBUTING.md) for how you can contribute changes back into
 
 ## Notes
 
+To setup *path* variable used add the following code in MetaDataFiles.php for getClientFileContents method in case of '.hbs' extension:
+```php
+if (inDeveloperMode()) {
+    $results[$fileInfo['subPath']]['paths'][$layoutName] = $fileInfo['path'];
+}
+```
+
 This extension is based on the [backbone-devtools](https://github.com/spect88/backbone-devtools) extension.
diff --git a/src/css/appstream.css b/src/css/appstream.css
index f55485c..b5a5a38 100644
--- a/src/css/appstream.css
+++ b/src/css/appstream.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 SugarCRM Inc.
+ * Copyright (c) 2015 SugarCRM Inc. Licensed by SugarCRM under the Apache 2.0 license.
  */
 .appstream [data-view="table"] .label {
   display: block; }
diff --git a/src/css/generate.css b/src/css/generate.css
index ad88d13..e3dc846 100644
--- a/src/css/generate.css
+++ b/src/css/generate.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 SugarCRM Inc.
+ * Copyright (c) 2015 SugarCRM Inc. Licensed by SugarCRM under the Apache 2.0 license.
  */
 .generate select {
   display: block; }
diff --git a/src/css/panel.css b/src/css/panel.css
index 1f4790a..09c4543 100644
--- a/src/css/panel.css
+++ b/src/css/panel.css
@@ -28,12 +28,17 @@ html, body {
       color: #f2f2f2; }
     #menu a:hover {
       background-color: #0e0e0e; }
+    #menu a.disabled {
+      color: #8c8c8c; }
+      #menu a.disabled:hover {
+        background-color: inherit; }
 
 #main {
   position: absolute;
   top: 0.4em;
   overflow-x: hidden;
-  overflow-y: auto; }
+  overflow-y: auto;
+  margin-bottom: 61px; }
   #main > div {
     padding-left: 1.6em;
     padding-right: 1.6em; }
@@ -139,4 +144,7 @@ select, input[type="number"], textarea {
 .red {
   color: #ff0000; }
 
+.blue {
+  color: #0000ff; }
+
 /*# sourceMappingURL=panel.css.map */
diff --git a/src/css/panel.css.map b/src/css/panel.css.map
index 49723c8..9b233fc 100644
--- a/src/css/panel.css.map
+++ b/src/css/panel.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../scss/panel.scss"],
 "names": [],
 "file": "panel.css"
diff --git a/src/css/performance.css b/src/css/performance.css
index ce6af97..109b887 100644
--- a/src/css/performance.css
+++ b/src/css/performance.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 SugarCRM Inc.
+ * Copyright (c) 2015 SugarCRM Inc. Licensed by SugarCRM under the Apache 2.0 license.
  */
 .performance #simulate, .performance #simulateAll {
   margin-bottom: 2em;
diff --git a/src/js/inject/attach.js b/src/js/inject/attach.js
index fb43f6a..7e6da8e 100644
--- a/src/js/inject/attach.js
+++ b/src/js/inject/attach.js
@@ -58,4 +58,21 @@
   if (window.sessionStorage['_sidecar_debug_injection'] === 'enabled') {
     document.addEventListener('DOMContentLoaded', inject);
   }
+
+  if (window.sessionStorage['_sidecar_debug_polygons'] === 'enabled') {
+    (function() {
+      var style = document.createElement("style");
+
+      // Add a media (and/or media query) here if you'd like!
+      // style.setAttribute("media", "screen")
+      // style.setAttribute("media", "only screen and (max-width : 1024px)")
+
+      // WebKit hack :(
+      style.appendChild(document.createTextNode(".polygonHoverView {border: 1px solid orange !important;}"));
+      style.appendChild(document.createTextNode(".polygonHoverField {border: 1px solid cornflowerblue !important;}"));
+
+      // Add the <style> element to the page
+      document.head.appendChild(style);
+    })();
+  }
 })();
diff --git a/src/js/inject/sidecar.debug.js b/src/js/inject/sidecar.debug.js
index 83e6671..94ae929 100644
--- a/src/js/inject/sidecar.debug.js
+++ b/src/js/inject/sidecar.debug.js
@@ -32,7 +32,7 @@
             path: path || ''
         };
         return def;
-    }
+    };
 
     /**
      * Adds a method to the `View.View` class to get information on the current
@@ -52,6 +52,8 @@
             name: this.name,
             type: this.type,
             compType: 'view',
+            tplName: this.tplName,
+            action: this.action,
             performance: renderTime,
             module: this.module,
             path: path || '',
@@ -72,7 +74,7 @@
     Sidecar.view.Field.prototype.getComponentInfo = function() {
         var renderTime = App.debug.getComponentRenderTime(this.cid);
         renderTime = Math.round(renderTime*10)/10;
-        var path = this.getJSPath();
+        var path = this.getJSPath(this.tplName);
         var def = {
             cid: this.cid,
             contextId: this.context.cid,
@@ -80,6 +82,8 @@
             name: !_.isEmpty(this.fields) ? this.type : this.name,
             type: this.type,
             compType: 'field',
+            tplName: this.tplName,
+            action: this.action,
             performance: renderTime,
             module: this.module,
             path: path || '',
@@ -98,12 +102,13 @@
      *
      * @return {String} path    The JS source file path
      */
-    Sidecar.view.Component.prototype.getJSPath = function() {
+    Sidecar.view.Component.prototype.getJSPath = function(tplName) {
         var name = this.type || this.name,
             type = this.debugType,
             module_prop, // property for App.metadata.getModule() output
             module = this.module,
-            path;
+            path,
+            _t;
 
         if(type == 'field') {
             module_prop = 'fieldTemplates';
@@ -119,8 +124,18 @@
         ) {
             path = App.metadata.getModule(module)[module_prop][name].path;
         } else {
-            path = App.metadata.getStrings(type)[name] ?
-                App.metadata.getStrings(type)[name].path : '';
+            _t = App.metadata.getStrings(type)[name];
+            switch (type) {
+                case 'views':
+                    path = (_t && _t['paths'] && _t['paths'][name]) ? _t['paths'][name] : '';
+                    break;
+                case 'fields':
+                    path = (_t && _t['paths'] && _t['paths'][tplName]) ? _t['paths'][tplName] : '';
+                    break;
+                default:
+                    path = _t ? _t.path : '';
+                    break;
+            }
         }
 
         return path;
@@ -304,7 +319,7 @@
 
             if(window.sessionStorage['_sidecar_debug_tooltips'] === 'enabled') {
                 // add view info widget
-                var tooltip_html = '<h5>' + this.cid + '</h5>';
+                var tooltip_html = '<h5>' + this.cid + ' (view)</h5>';
 
                 var attributes = _.pick(this, 'name', 'action', 'module');
 
@@ -320,6 +335,17 @@
 
                 createTooltip(this.$el, $parent, tooltip_html);
             }
+
+            if(window.sessionStorage['_sidecar_debug_polygons'] === 'enabled') {
+                this.$el.hover(
+                    function() {
+                        $(this).addClass('polygonHoverView');
+                    },
+                    function() {
+                        $(this).removeClass('polygonHoverView');
+                    }
+                );
+            }
         };
 
         Debug.prototype._onHookFieldRender = function() {
@@ -351,7 +377,7 @@
             if(window.sessionStorage['_sidecar_debug_tooltips'] === 'enabled') {
                 var _createFieldTooltip = function() {
                     // add field info widget
-                    var tooltip_html = '<h5>' + self.cid + '</h5>';
+                    var tooltip_html = '<h5>' + self.cid + ' (field)</h5>';
 
                     tooltip_html += '<ul class="unstyled">';
 
@@ -363,7 +389,7 @@
                         }
                     );
 
-                    attributes.path = self.getJSPath();
+                    attributes.path = self.getJSPath(self.tplName);
 
                     // check for all sugar action types (*action)
                     if(/(action|button)/.test(self.type)) {
@@ -446,6 +472,29 @@
                 _createFieldTooltip.apply();
                 self.model.on('change:' + this.name, _createFieldTooltip);
             }
+
+            if(window.sessionStorage['_sidecar_debug_polygons'] === 'enabled') {
+                var buggyFieldNames = ['salutation', 'first_name', 'last_name', 'name', 'collection-count'],
+                    element = this.$el,
+                    hoverElement;
+
+                if (element.parent().hasClass('fieldset-field') ||
+                    element.children().hasClass('btn') ||
+                    _.indexOf(buggyFieldNames, element.parent().data('fieldname') !== -1)) {
+                    hoverElement = element.children();
+                } else {
+                    hoverElement = element;
+                }
+
+                hoverElement.hover(
+                    function() {
+                        $(this).addClass('polygonHoverField');
+                    },
+                    function() {
+                        $(this).removeClass('polygonHoverField');
+                    }
+                );
+            }
         };
 
         Debug.prototype._onHookComponentTrigger = function() {
@@ -577,26 +626,10 @@
         });
 
         Debug.prototype.AppStream = new ActivityStream();
-
-        /**
-         * Override error.handleRenderError method to provide more information on render error.
-         */
-        var _handleRenderError = Sidecar.error.handleRenderError;
-
-        Debug.prototype._handleRenderError = function(component, method, additionalInfo) {
-            console.log('=== handleRenderError Information ===');
-            console.log('Name: ' + additionalInfo.name);
-            console.log('Type: ' + additionalInfo.type);
-            console.log('== ComponentInfo ==', component);
-            console.log('== AdditionalInfo ==', additionalInfo);
-            return _handleRenderError.apply(_handleRenderError, arguments);
-        };
-
         return Debug;
 
     })();
 
     Sidecar.debug = new Sidecar.Debug();
-    Sidecar.error.handleRenderError = Sidecar.error.handleRenderError ? Sidecar.debug._handleRenderError : undefined;
 
 }).call(this);
diff --git a/src/js/page.js b/src/js/page.js
index 9bde9cb..082984e 100644
--- a/src/js/page.js
+++ b/src/js/page.js
@@ -34,11 +34,14 @@
                 window.$view = sidecarComponent;
                 console.log('***** Current Sidecar Component *****');
                 console.log('* cid: ' + sidecarComponent.cid);
-                console.log('* component type: ' + sidecarComponent.debugType);
+                console.log('* Component type: ' + sidecarComponent.debugType);
                 console.log('* Name: ' + sidecarComponent.name);
                 if (sidecarComponent.type) {
                     console.log('* Type: ' + sidecarComponent.type);
                 }
+                if (sidecarComponent.tplName) {
+                    console.log('* Template: ' + sidecarComponent.tplName);
+                }
                 console.log('$view = ', sidecarComponent);
                 console.log('*************************************');
             }
@@ -173,11 +176,14 @@
 
         logComponent: function(cid) {
             var componentInfos = App.debug.getComponent(cid).getComponentInfo();
+            console.log('== Component ==');
+            console.log('Type: ' + componentInfos.compType);
+            console.log('tplName: ' + componentInfos.tplName);
+            console.log('Action: ' + componentInfos.action);
             console.log('Name: ' + componentInfos.name);
-            console.log('Comp type: ' + componentInfos.compType);
             console.log('Module: ' + componentInfos.module);
-            console.log('File path: ' + componentInfos.path);
-            console.log('Component object:', App.debug.getComponent(cid));
+            console.log('Path: ' + componentInfos.path);
+            console.log('Object:', App.debug.getComponent(cid));
         },
 
         getLayoutStructure: function() {
@@ -185,11 +191,17 @@
         },
 
         enableInjection: function() {
+            $('[name="tooltips"]').prop('disabled', false);
+            $('[name="polygons"]').prop('disabled', false);
             window.sessionStorage['_sidecar_debug_injection'] = 'enabled';
         },
 
         disableInjection: function() {
+            $('[name="tooltips"]').prop('disabled', true);
+            $('[name="polygons"]').prop('disabled', true);
             window.sessionStorage.removeItem('_sidecar_debug_injection');
+            window.sessionStorage.removeItem('_sidecar_debug_tooltips');
+            window.sessionStorage.removeItem('_sidecar_debug_polygons');
         },
 
         isInjectionEnabled: function() {
@@ -208,6 +220,18 @@
             return window.sessionStorage['_sidecar_debug_tooltips'] === 'enabled';
         },
 
+        enablePolygons: function() {
+            window.sessionStorage['_sidecar_debug_polygons'] = 'enabled';
+        },
+
+        disablePolygons: function() {
+            window.sessionStorage.removeItem('_sidecar_debug_polygons');
+        },
+
+        arePolygonsEnabled: function() {
+            return window.sessionStorage['_sidecar_debug_polygons'] === 'enabled';
+        },
+
         updateTimeout: function(ms) {
             window.sessionStorage['_sidecar_debug_injection_timeout'] = String(ms);
         },
diff --git a/src/js/views/general.js b/src/js/views/general.js
index d147b2a..b6036d6 100644
--- a/src/js/views/general.js
+++ b/src/js/views/general.js
@@ -13,6 +13,7 @@
     events: {
       'change [name="inject"]': 'toggleInjection',
       'change [name="tooltips"]': 'toggleTooltips',
+      'change [name="polygons"]': 'togglePolygons',
       'change [name="timeout"]': 'updateTimeout'
     },
 
@@ -20,11 +21,29 @@
       this.$el.empty().append(this.template());
       BDT.page.eval('isInjectionEnabled', [], function(enabled) {
         $('[name="inject"]').prop('checked', enabled);
+        $('[name="tooltips"]')
+            .prop('disabled', !enabled);
+
+        $('[name="polygons"]')
+            .prop('disabled', !enabled);
+
         BDT.page.eval('getTimeout', [], function(ms){
           if (ms !== undefined) {
             $('[name="timeout"]').val(ms/1000);
           }
-        })
+        });
+
+        BDT.page.eval('arePolygonsEnabled', [], function(enabled) {
+          $('[name="polygons"]').prop('checked', enabled);
+        });
+
+        if (enabled) {
+          $('#menu a.debugOnly')
+              .removeClass('disabled');
+        } else {
+          $('#menu a.debugOnly')
+              .addClass('disabled');
+        }
       });
 
       BDT.page.eval('areTooltipsEnabled', [], function(enabled) {
@@ -35,7 +54,25 @@
 
     toggleInjection: function(evt) {
       var on = (this.$(evt.currentTarget).is(':checked'));
-      
+
+      if (!on) {
+        $('[name="tooltips"]')
+            .prop('checked', false)
+            .prop('disabled', true);
+        $('[name="polygons"]')
+            .prop('checked', false)
+            .prop('disabled', true);
+        $('#menu a.debugOnly')
+            .addClass('disabled');
+      } else {
+        $('[name="tooltips"]')
+            .prop('disabled', false);
+        $('[name="polygons"]')
+            .prop('disabled', false);
+        $('#menu a.debugOnly')
+            .removeClass('disabled');
+      }
+
       BDT.page.eval(
         on ? 'enableInjection' : 'disableInjection',
         [],
@@ -47,7 +84,6 @@
 
     toggleTooltips: function(evt) {
       var on = (this.$(evt.currentTarget).is(':checked'));
-
       BDT.page.eval(
           on ? 'enableTooltips' : 'disableTooltips',
           [],
@@ -57,6 +93,18 @@
       );
     },
 
+    togglePolygons: function(evt) {
+      var on = (this.$(evt.currentTarget).is(':checked'));
+
+      BDT.page.eval(
+          on ? 'enablePolygons' : 'disablePolygons',
+          [],
+          function() {
+            chrome.devtools.inspectedWindow.reload();
+          }
+      );
+    },
+
     updateTimeout: function (evt) {
       var seconds = parseFloat(this.$(evt.currentTarget).val());
       var ms = Math.round(seconds * 1000);
diff --git a/src/js/views/navbar.js b/src/js/views/navbar.js
index 4d5ad5a..e0461c5 100644
--- a/src/js/views/navbar.js
+++ b/src/js/views/navbar.js
@@ -23,7 +23,20 @@
 
     selectItem: function(evt) {
       evt.preventDefault();
-      var anchor = $(evt.currentTarget);
+      var anchor = $(evt.currentTarget),
+          self = this;
+      if (anchor.hasClass('debugOnly')) {
+        BDT.page.eval('isInjectionEnabled', [], function(enabled) {
+          if (enabled) {
+            self.processItem(anchor);
+          }
+        });
+      } else {
+        this.processItem(anchor);
+      }
+    },
+
+    processItem: function(anchor) {
       anchor.addClass('selected').siblings().removeClass('selected');
       this.trigger('select', anchor.attr('href'));
     },
diff --git a/src/js/views/structure.js b/src/js/views/structure.js
index fd462e1..3e237c3 100644
--- a/src/js/views/structure.js
+++ b/src/js/views/structure.js
@@ -252,12 +252,18 @@
         renderComponent: function(evt) {
             var self = this;
             var cid = $(evt.currentTarget).data('cid');
-            BDT.page.eval('renderComponent', [cid], function(renderTimesObj, isException) {
-                if (isException) {
-                    var error = 'The element couldn\'t be re-rendered';
-                    BDT.page.eval('console', [error]);
+            BDT.page.eval('isInjectionEnabled', [], function(enabled) {
+                if (enabled) {
+                    BDT.page.eval('renderComponent', [cid], function(renderTimesObj, isException) {
+                        if (isException) {
+                            var error = 'The element couldn\'t be re-rendered';
+                            BDT.page.eval('console', [error]);
+                        } else {
+                            self.updateStructure();
+                        }
+                    });
                 } else {
-                    self.updateStructure();
+                    BDT.page.eval('console', ['Sidecar Debug Mode is disabled']);
                 }
             });
         },
diff --git a/src/manifest.json b/src/manifest.json
index 2ec29e1..4431fec 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Sidecar Debugger Tool",
-    "version": "0.1",
+    "version": "0.1.1",
     "description": "Sidecar Debugger Tool extension helps you debugging Sugar7, for a better productivity and faster development.",
 
     "icons": {
diff --git a/src/scss/panel.scss b/src/scss/panel.scss
index 2e56c33..cdfdcf4 100644
--- a/src/scss/panel.scss
+++ b/src/scss/panel.scss
@@ -31,6 +31,12 @@ html, body {
     &:hover {
       background-color: #0e0e0e;
     }
+    &.disabled {
+      color: #8c8c8c;
+      &:hover {
+        background-color: inherit;
+      }
+    }
   }
 }
 
@@ -174,3 +180,7 @@ select, input[type="number"], textarea {
 .red {
   color: #ff0000;
 }
+
+.blue {
+  color: #0000ff;
+}
diff --git a/src/templates/general.handlebars b/src/templates/general.handlebars
index 75b731e..f32eef3 100644
--- a/src/templates/general.handlebars
+++ b/src/templates/general.handlebars
@@ -2,9 +2,11 @@
 
 <form>
     <input type="checkbox" name="inject" id="inject_checkbox" /><label for="inject_checkbox">Start Sidecar Debug Mode<span class="red">*</span></label><br>
-    <input type="checkbox" name="tooltips" id="tooltips_checkbox" /><label for="tooltips_checkbox">Display tooltips on hover with view/field information<span class="red">*</span></label><br>
+    <input type="checkbox" name="tooltips" id="tooltips_checkbox" disabled /><label for="tooltips_checkbox">Display tooltips on hover with view/field information<span class="red">*</span><span class="blue">*</span></label><br>
+    <input type="checkbox" name="polygons" id="polygons_checkbox" disabled /><label for="polygons_checkbox">Display view/field component borders on hover<span class="red">*</span><span class="blue">*</span></label><br>
 </form>
 <p><span class="red">*</span> Requires page reload</p>
+<p><span class="blue">*</span> Available in debug-mode only</p>
 
 <h2>Features</h2>
 <ul>
diff --git a/src/templates/navbar.handlebars b/src/templates/navbar.handlebars
index d54e2db..8b2685d 100644
--- a/src/templates/navbar.handlebars
+++ b/src/templates/navbar.handlebars
@@ -1 +1 @@
-<a class="selected" href="#general">Settings</a><a href="#appstream">Application Stream</a><a href="#structure">Structure</a><a href="#performance">Render times</a><a href="#generate">Generate records</a>
+<a class="selected" href="#general">Settings</a><a href="#appstream" class="debugOnly">Application Stream</a><a href="#structure" class="debugOnly">Structure</a><a href="#performance">Render times</a><a href="#generate">Generate records</a>
diff --git a/src/templates/templates.js b/src/templates/templates.js
index 3052978..4ee1aec 100644
--- a/src/templates/templates.js
+++ b/src/templates/templates.js
@@ -143,7 +143,7 @@ this["Handlebars"]["templates"]["appstream"] = Handlebars.template({"1":function
 },"useData":true});
 
 this["Handlebars"]["templates"]["general"] = Handlebars.template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-    return "<h2 class=\"text-center\">Sidecar Debugger Tool</h2>\n\n<form>\n    <input type=\"checkbox\" name=\"inject\" id=\"inject_checkbox\" /><label for=\"inject_checkbox\">Start Sidecar Debug Mode<span class=\"red\">*</span></label><br>\n    <input type=\"checkbox\" name=\"tooltips\" id=\"tooltips_checkbox\" /><label for=\"tooltips_checkbox\">Display tooltips on hover with view/field information<span class=\"red\">*</span></label><br>\n</form>\n<p><span class=\"red\">*</span> Requires page reload</p>\n\n<h2>Features</h2>\n<ul>\n    <li>$view console variable after inspecting a DOM Element (it points to the closest parent Sidecar Component).</li>\n    <li>In <strong>SugarDebug Panel</strong>, you will find different several tabs:\n        <ul>\n            <li><strong><i>Application Stream: </i></strong>A timeline of what is happening in the app. It shows the methods that are called and the events that are triggered. For each of them, you have access to the passed arguments and the component object.</li>\n            <li><strong><i>Structure: </i></strong>A hierarchical tree representing the Sugar components of the current page.</li>\n            <li><strong><i>Render times: </i></strong>Allows you to measure the render duration of the different fields.</li>\n            <!--<li><strong><i>Metrics: </i></strong>Allows you to track any method of any sugar component to capture its duration and detect performance lacks.</li>-->\n            <li><strong><i>Generate records: </i></strong>An easy way to generate records in your SugarCRM instance.</li>\n        </ul>\n    </li>\n</ul>\n\n";
+    return "<h2 class=\"text-center\">Sidecar Debugger Tool</h2>\n\n<form>\n    <input type=\"checkbox\" name=\"inject\" id=\"inject_checkbox\" /><label for=\"inject_checkbox\">Start Sidecar Debug Mode<span class=\"red\">*</span></label><br>\n    <input type=\"checkbox\" name=\"tooltips\" id=\"tooltips_checkbox\" disabled /><label for=\"tooltips_checkbox\">Display tooltips on hover with view/field information<span class=\"red\">*</span><span class=\"blue\">*</span></label><br>\n    <input type=\"checkbox\" name=\"polygons\" id=\"polygons_checkbox\" disabled /><label for=\"polygons_checkbox\">Display view/field component borders on hover<span class=\"red\">*</span><span class=\"blue\">*</span></label><br>\n</form>\n<p><span class=\"red\">*</span> Requires page reload</p>\n<p><span class=\"blue\">*</span> Available in debug-mode only</p>\n\n<h2>Features</h2>\n<ul>\n    <li>$view console variable after inspecting a DOM Element (it points to the closest parent Sidecar Component).</li>\n    <li>In <strong>SugarDebug Panel</strong>, you will find different several tabs:\n        <ul>\n            <li><strong><i>Application Stream: </i></strong>A timeline of what is happening in the app. It shows the methods that are called and the events that are triggered. For each of them, you have access to the passed arguments and the component object.</li>\n            <li><strong><i>Structure: </i></strong>A hierarchical tree representing the Sugar components of the current page.</li>\n            <li><strong><i>Render times: </i></strong>Allows you to measure the render duration of the different fields.</li>\n            <!--<li><strong><i>Metrics: </i></strong>Allows you to track any method of any sugar component to capture its duration and detect performance lacks.</li>-->\n            <li><strong><i>Generate records: </i></strong>An easy way to generate records in your SugarCRM instance.</li>\n        </ul>\n    </li>\n</ul>\n\n";
 },"useData":true});
 
 this["Handlebars"]["templates"]["generate"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
@@ -241,7 +241,7 @@ this["Handlebars"]["templates"]["metrics"] = Handlebars.template({"1":function(d
 },"useData":true});
 
 this["Handlebars"]["templates"]["navbar"] = Handlebars.template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
-    return "<a class=\"selected\" href=\"#general\">Settings</a><a href=\"#appstream\">Application Stream</a><a href=\"#structure\">Structure</a><a href=\"#performance\">Render times</a><a href=\"#generate\">Generate records</a>\n";
+    return "<a class=\"selected\" href=\"#general\">Settings</a><a href=\"#appstream\" class=\"debugOnly\">Application Stream</a><a href=\"#structure\" class=\"debugOnly\">Structure</a><a href=\"#performance\">Render times</a><a href=\"#generate\">Generate records</a>\n";
 },"useData":true});
 
 this["Handlebars"]["templates"]["performance"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {