diff --git a/Block/Tab/Event.php b/Block/Tab/Content/Event.php
old mode 100755
new mode 100644
similarity index 79%
rename from Block/Tab/Event.php
rename to Block/Tab/Content/Event.php
index 6776671..e3fb063
--- a/Block/Tab/Event.php
+++ b/Block/Tab/Content/Event.php
@@ -1,8 +1,10 @@
 <?php
 
-namespace ADM\QuickDevBar\Block\Tab;
+namespace ADM\QuickDevBar\Block\Tab\Content;
 
-class Event extends DefaultTab
+use \ADM\QuickDevBar\Block\Tab;
+
+class Event extends \ADM\QuickDevBar\Block\Tab\DefaultContent
 {
     protected $_manager;
 
diff --git a/Block/Tab/Content/General.php b/Block/Tab/Content/General.php
new file mode 100644
index 0000000..1e8e0ea
--- /dev/null
+++ b/Block/Tab/Content/General.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace ADM\QuickDevBar\Block\Tab\Content;
+
+class General extends \ADM\QuickDevBar\Block\Tab\DefaultContent
+{
+    public function getStore()
+    {
+        return $this->_storeManager->getStore();
+    }
+
+    public function getStore()
+    {
+        return $this->_storeManager->getWebsite();
+    }
+}
\ No newline at end of file
diff --git a/Block/Tab/Layout.php b/Block/Tab/Content/Layout.php
old mode 100755
new mode 100644
similarity index 71%
rename from Block/Tab/Layout.php
rename to Block/Tab/Content/Layout.php
index 17c0694..f47552d
--- a/Block/Tab/Layout.php
+++ b/Block/Tab/Content/Layout.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace ADM\QuickDevBar\Block\Tab;
+namespace ADM\QuickDevBar\Block\Tab\Content;
 
-class Layout extends DefaultTab
+class Layout extends \ADM\QuickDevBar\Block\Tab\DefaultContent
 {
     protected $_structure;
 
@@ -18,7 +18,7 @@ public function __construct(\Magento\Framework\View\Element\Template\Context $co
 
         $this->_structure = $structure;
 
-        $this->setTemplate('ADM_QuickDevBar::tab/layout.phtml');
+        //$this->setTemplate('ADM_QuickDevBar::tab/layout.phtml');
 
         parent::__construct($context, $data);
     }
@@ -29,23 +29,11 @@ public function getHandles()
         return $this->getLayout()->getUpdate()->getHandles();
     }
 
-    public function getContent()
+    public function getHtmlBlocksHierarchy()
     {
         $html = '';
         $layout = $this->getLayout();
 
-//         $xml = $layout->getUpdate()->asSimplexml();
-//         $html .= '<ul>';
-//         foreach ($xml->body as $xmlNode) {
-//             if($xmlNode->hasChildren()) {
-//                     foreach ($xmlNode->children() as $k => $child) {
-//                         $html .= '<li>' . $child->getElementName() . ' ('.$child->getName().')</li>';
-//                     }
-//             }
-//         }
-//         $html .= '</ul>';
-
-        $html .= '<strong>Blocks hierarchy</strong><br/>';
         $blocks = $layout->getAllBlocks();
         $containers = array('CONTAINER'=>array());
         foreach ($blocks as $alias=>$block) {
@@ -59,9 +47,6 @@ public function getContent()
             }
 
             $containers[$type][$parentName] = $parentName;
-//             $ancestortName = $this->getAncestor($alias);
-//             $containers['CONTAINER'][$ancestortName] = $ancestortName;
-
         }
 
         $html .= '<ul>';
@@ -75,19 +60,18 @@ public function getContent()
         }
         $html .= '</ul>';
 
-        //Other blocks
-        $html .= '<strong>Other block</strong><br/>';
-        $html .= '<ul>';
-        $containers = $layout->getUpdate()->getContainers();
-        foreach ($containers as $containerAlias=>$containerLable) {
-            $html .= '<li>' . $containerAlias . '</li>';
-        }
-        $html .= '</ul>';
-
         return $html;
     }
 
 
+    public function getContainers()
+    {
+        $containers = $this->getLayout()->getUpdate()->getContainers();
+
+        return $containers;
+    }
+
+
     public function getAncestor($alias)
     {
         $parentName = $this->getLayout()->getParentName($alias);
diff --git a/Block/Tab/Log.php b/Block/Tab/Content/Log.php
similarity index 92%
rename from Block/Tab/Log.php
rename to Block/Tab/Content/Log.php
index 709fdf0..eedd091 100644
--- a/Block/Tab/Log.php
+++ b/Block/Tab/Content/Log.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace ADM\QuickDevBar\Block\Tab;
+namespace ADM\QuickDevBar\Block\Tab\Content;
 
-class Log extends DefaultTab
+class Log extends \ADM\QuickDevBar\Block\Tab\DefaultContent
 {
 
     protected $_jsonHelper;
diff --git a/Block/Tab/Observer.php b/Block/Tab/Content/Observer.php
old mode 100755
new mode 100644
similarity index 81%
rename from Block/Tab/Observer.php
rename to Block/Tab/Content/Observer.php
index 3574969..ccc9b27
--- a/Block/Tab/Observer.php
+++ b/Block/Tab/Content/Observer.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace ADM\QuickDevBar\Block\Tab;
+namespace ADM\QuickDevBar\Block\Tab\Content;
 
-class Observer extends DefaultTab
+class Observer extends \ADM\QuickDevBar\Block\Tab\DefaultContent
 {
     protected $_invoker;
 
diff --git a/Block/Tab/PhpInfo.php b/Block/Tab/Content/PhpInfo.php
old mode 100755
new mode 100644
similarity index 92%
rename from Block/Tab/PhpInfo.php
rename to Block/Tab/Content/PhpInfo.php
index bc91a22..21d7dd4
--- a/Block/Tab/PhpInfo.php
+++ b/Block/Tab/Content/PhpInfo.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace ADM\QuickDevBar\Block\Tab;
+namespace ADM\QuickDevBar\Block\Tab\Content;
 
-class PhpInfo extends DefaultTab
+class PhpInfo extends \ADM\QuickDevBar\Block\Tab\DefaultContent
 {
 
     public function getTitle()
diff --git a/Block/Tab/Request.php b/Block/Tab/Content/Request.php
old mode 100755
new mode 100644
similarity index 94%
rename from Block/Tab/Request.php
rename to Block/Tab/Content/Request.php
index 5cf52a8..ef6c8a9
--- a/Block/Tab/Request.php
+++ b/Block/Tab/Content/Request.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace ADM\QuickDevBar\Block\Tab;
+namespace ADM\QuickDevBar\Block\Tab\Content;
 
-class Request extends DefaultTab
+class Request extends \ADM\QuickDevBar\Block\Tab\DefaultContent
 {
 
     public function getTitle()
diff --git a/Block/Tab/Sql.php b/Block/Tab/Content/Sql.php
old mode 100755
new mode 100644
similarity index 88%
rename from Block/Tab/Sql.php
rename to Block/Tab/Content/Sql.php
index e1c9569..3cd5d8b
--- a/Block/Tab/Sql.php
+++ b/Block/Tab/Content/Sql.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace ADM\QuickDevBar\Block\Tab;
+namespace ADM\QuickDevBar\Block\Tab\Content;
 
-class Sql extends DefaultTab
+class Sql extends \ADM\QuickDevBar\Block\Tab\DefaultContent
 {
 
     protected $_sql_profiler;
@@ -62,8 +62,8 @@ public function getQueryProfiles()
     public function formatSql($sql)
     {
         $htmlSql = $sql;
-        $htmlSql = preg_replace('/\b(SET|AS|ASC|COUNT|DESC|IN|LIKE|DISTINCT|INTO|VALUES|LIMIT|DESCRIBE)\b/', '<span class="sqlword">\\1</span>', $sql);
-        $htmlSql = preg_replace('/\b(UNION ALL)\b/', '<br/><span class="sqljoin">\\1</span>', $htmlSql);
+        $htmlSql = preg_replace('/\b(SET|AS|ASC|COUNT|DESC|IN|LIKE|DISTINCT|INTO|VALUES|LIMIT)\b/', '<span class="sqlword">\\1</span>', $sql);
+        $htmlSql = preg_replace('/\b(UNION ALL|DESCRIBE|SHOW|connect|begin|commit)\b/', '<br/><span class="sqlother">\\1</span>', $htmlSql);
         $htmlSql = preg_replace('/\b(UPDATE|SELECT|FROM|WHERE|LEFT JOIN|INNER JOIN|RIGHT JOIN|ORDER BY|GROUP BY|DELETE|INSERT)\b/', '<br/><span class="sqlmain">\\1</span>', $htmlSql);
         $htmlSql = preg_replace('/^<br\/>/', '', $htmlSql);
         return $htmlSql;
diff --git a/Block/Tab/DefaultTab.php b/Block/Tab/DefaultContent.php
similarity index 50%
rename from Block/Tab/DefaultTab.php
rename to Block/Tab/DefaultContent.php
index 0595783..c0b9a15 100644
--- a/Block/Tab/DefaultTab.php
+++ b/Block/Tab/DefaultContent.php
@@ -2,9 +2,28 @@
 
 namespace ADM\QuickDevBar\Block\Tab;
 
-class DefaultTab extends \Magento\Framework\View\Element\Template
+class DefaultContent extends \Magento\Framework\View\Element\Template
 {
 
+//     protected $_jsonHelper;
+
+//     /**
+//      * @param \Magento\Framework\View\Element\Template\Context $context
+//      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
+//      * @param array $data
+//      */
+//     public function __construct(
+//             \Magento\Framework\View\Element\Template\Context $context,
+//             \Magento\Framework\Json\Helper\Data $jsonHelper,
+//             array $data = []
+//     ) {
+//         $this->_jsonHelper = $jsonHelper;
+
+//         parent::__construct($context, $data);
+//     }
+
+
+
     public function getTitle()
     {
         return ($this->getData('title')) ? $this->getData('title') : $this->getNameInLayout();
@@ -17,12 +36,22 @@ public function getId()
 
     public function getClass()
     {
-        return str_replace('.', '-', $this->getId());
+        $class = str_replace('.', '-', $this->getId());
+        if ($this->isAjax(false)) {
+            $class .= ' use-ajax';
+        }
+
+        return $class;
     }
 
-    public function isAjax()
+    public function isAjax($asString=true)
     {
-        return (($this->hasData('ajax_url') || $this->hasData('is_ajax'))? "true" : "false");
+        $return = (($this->hasData('ajax_url') || $this->hasData('is_ajax'))? true : false);
+        if ($asString) {
+            $return = ($return) ? "true" : "false";
+        }
+
+        return $return;
     }
 
     public function getTabUrl()
@@ -64,4 +93,31 @@ public function getHtmlLoader($imgSrc, $class, $showText = true)
         return $html;
     }
 
+
+    protected $_mainTabs;
+
+    public function getTabBlocks()
+    {
+        if (is_null($this->_mainTabs)) {
+            $this->_mainTabs = $this->getLayout()->getChildBlocks($this->getNameInLayout());
+        }
+
+        return $this->_mainTabs;
+    }
+
+    public function getStore()
+    {
+        return $this->_storeManager->getStore();
+    }
+
+    public function getWebsite()
+    {
+        return $this->_storeManager->getWebsite();
+    }
+
+    public function getGroup()
+    {
+        return $this->_storeManager->getGroup();
+    }
+
 }
\ No newline at end of file
diff --git a/Block/Tab/Main.php b/Block/Tab/Main.php
new file mode 100644
index 0000000..f2b65e6
--- /dev/null
+++ b/Block/Tab/Main.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace ADM\QuickDevBar\Block\Tab;
+
+class Main extends DefaultContent
+{
+    protected $_mainTabs;
+
+    protected $_jsonHelper;
+
+    protected $_tab_active = false;
+
+    protected $_tab_collapsible = true;
+
+    protected $_tab_openState = "ui-tabs-active";
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
+     * @param array $data
+     */
+    public function __construct(
+            \Magento\Framework\View\Element\Template\Context $context,
+            \Magento\Framework\Json\Helper\Data $jsonHelper,
+            array $data = []
+    ) {
+        $this->_jsonHelper = $jsonHelper;
+
+        parent::__construct($context, $data);
+    }
+
+    public function getTabBlocks()
+    {
+        if (is_null($this->_mainTabs)) {
+            $this->_mainTabs = $this->getLayout()->getChildBlocks($this->getNameInLayout());
+        }
+
+        return $this->_mainTabs;
+    }
+
+    public function getSubTabSuffix()
+    {
+        return '';
+    }
+
+    public function getUiTabClass()
+    {
+        return 'qdb-ui-tabs';
+    }
+
+    protected function _getTabConfig()
+    {
+        $config = array( "active"=>$this->_tab_active,
+                "openedState"=>$this->_tab_openState,
+                "collapsibleElement"=>"[data-role=collapsible".$this->getSubTabSuffix()."]",
+                "content"=>"[data-role=content".$this->getSubTabSuffix()."]",
+                "collapsible" => $this->_tab_collapsible,
+                "ajaxContent" => true
+        );
+
+        return $config;
+    }
+
+
+    public function getJsonTabConfig()
+    {
+        return $this->_jsonHelper->jsonEncode($this->_getTabConfig());
+    }
+}
\ No newline at end of file
diff --git a/Block/Tab/Sub.php b/Block/Tab/Sub.php
new file mode 100644
index 0000000..ece657e
--- /dev/null
+++ b/Block/Tab/Sub.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace ADM\QuickDevBar\Block\Tab;
+
+use Magento\Framework\Api\SimpleDataObjectConverter;
+
+class Sub extends Main
+{
+    protected $_mainTabs;
+
+    protected $_tab_active = 0;
+
+    protected $_tab_collapsible = false;
+
+    protected $_tab_openState = "ui-tabs-active";
+
+    public function getSubTabSuffix()
+    {
+        return SimpleDataObjectConverter::snakeCaseToCamelCase(str_replace('.', '_', $this->getNameInLayout()));
+    }
+
+    public function getUiTabClass()
+    {
+        return 'qdb-ui-subtabs';
+    }
+
+    public function getIndexActiveTab()
+    {
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/view/frontend/layout/quickdevbar.xml b/view/frontend/layout/quickdevbar.xml
old mode 100755
new mode 100644
index 3f2fc57..14a4bc2
--- a/view/frontend/layout/quickdevbar.xml
+++ b/view/frontend/layout/quickdevbar.xml
@@ -1,34 +1,58 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="before.body.end">
-            <block class="ADM\QuickDevBar\Block\Toolbar" name="quick.dev.nav" as="quick.dev.nav" template="toolbar.phtml">
-              <block class="ADM\QuickDevBar\Block\Tab\Request" name="qdb.tab.request" as="qdb.tab.request" template="tab/request.phtml"/>
-              <block class="ADM\QuickDevBar\Block\Tab\Layout" name="qdb.tab.layout" as="qdb.tab.layout" template="tab/layout.phtml"/>
-              <block class="ADM\QuickDevBar\Block\Tab\DefaultTab" name="qdb.tab.profiler" as="qdb.tab.profiler" template="tab/profiler.phtml">
-                <!-- Set a title with the basic class  DefaultTab -->
-                <action method="setTitle">
-                  <argument name="title" xsi:type="string">Profiler</argument>
-                </action>
-              </block>
-              <block class="ADM\QuickDevBar\Block\Tab\Observer" name="qdb.tab.observer" as="qdb.tab.observer" template="tab/observer.phtml"/>
-              <block class="ADM\QuickDevBar\Block\Tab\Event" name="qdb.tab.event" as="qdb.tab.event" template="tab/event.phtml"/>
-              <block class="ADM\QuickDevBar\Block\Tab\Sql" name="qdb.tab.sql" as="qdb.tab.sql" template="tab/sql.phtml"/>
-              <block class="ADM\QuickDevBar\Block\Tab\Log" name="qdb.tab.log" as="qdb.tab.log" template="tab/log.phtml"/>
-              <block class="ADM\QuickDevBar\Block\Tab\PhpInfo" name="qdb.tab.phpinfo" as="qdb.tab.phpinfo">
-                <!-- Use the standard router quickdevbar/index/tab to load the block -->
-                <action method="setIsAjax">
-                  <argument name="is_ajax" xsi:type="string">1</argument>
-                </action>
-                <!-- Or you can define your own route -->
-                <!--             
-                <action method="setAjaxUrl">
-                  <argument name="ajax_url" xsi:type="string">quickdevbar/index/phpInfo</argument>
-                </action>
-                -->
+            <block class="ADM\QuickDevBar\Block\Toolbar" name="quick.dev.toolbar" as="quick.dev.toolbar" template="toolbar.phtml">
+              <block class="ADM\QuickDevBar\Block\Tab\Main" name="quick.dev.maintabs" as="quick.dev.maintabs" template="tabs.phtml">
+                  <block class="ADM\QuickDevBar\Block\Tab\Sub" name="qdb.tab.info" as="qdb.tab.info" template="tabs.phtml">
+                    <!-- Set a title with the basic class  Content -->
+                    <action method="setTitle">
+                      <argument name="title" xsi:type="string">Info</argument>
+                    </action>
+                    <!-- Full subtab  cannot be in ajax mode by now ... cannot have data-mage-init with ajax :-( -->
+                    <!--                     
+                    <action method="setIsAjax">
+                      <argument name="is_ajax" xsi:type="string">1</argument>
+                    </action>
+                    -->
+                    <block class="ADM\QuickDevBar\Block\Tab\DefaultContent" name="qdb.tab.store" as="qdb.tab.store" template="tab/info/store.phtml">
+                        <action method="setTitle">
+                          <argument name="title" xsi:type="string">Store</argument>
+                        </action>                    
+                    </block>
+                    <block class="ADM\QuickDevBar\Block\Tab\Content\Request" name="qdb.tab.request" as="qdb.tab.request" template="tab/info/request.phtml"/>
+                    <block class="ADM\QuickDevBar\Block\Tab\Content\Layout" name="qdb.tab.layout" as="qdb.tab.layout" template="tab/info/layout.phtml"/>
+                    <block class="ADM\QuickDevBar\Block\Tab\DefaultContent" name="qdb.tab.profiler" as="qdb.tab.profiler" template="tab/info/profiler.phtml">
+                        <!-- Set a title with the basic class  Content -->
+                        <action method="setTitle">
+                          <argument name="title" xsi:type="string">Profiler</argument>
+                        </action>
+                    </block>                      
+                    <block class="ADM\QuickDevBar\Block\Tab\Content\PhpInfo" name="qdb.tab.phpinfo" as="qdb.tab.phpinfo">
+                        <!-- Use the standard router quickdevbar/index/tab to load the block -->
+                        <action method="setIsAjax">
+                          <argument name="is_ajax" xsi:type="string">1</argument>
+                        </action>
+                        <!-- Or you can define your own route -->
+                        <!--             
+                        <action method="setAjaxUrl">
+                          <argument name="ajax_url" xsi:type="string">quickdevbar/index/phpInfo</argument>
+                        </action>
+                        -->
+                    </block>
+                  </block>
+                  <block class="ADM\QuickDevBar\Block\Tab\Sub" name="qdb.tab.dispatch" as="qdb.tab.dispatch" template="tabs.phtml">
+                    <!-- Set a title with the basic class  Content -->
+                    <action method="setTitle">
+                      <argument name="title" xsi:type="string">Dispatching</argument>
+                    </action>
+
+                    <block class="ADM\QuickDevBar\Block\Tab\Content\Observer" name="qdb.tab.observer" as="qdb.tab.observer" template="tab/observer.phtml"/>
+                    <block class="ADM\QuickDevBar\Block\Tab\Content\Event" name="qdb.tab.event" as="qdb.tab.event" template="tab/event.phtml"/>
+                  </block>
+                  <block class="ADM\QuickDevBar\Block\Tab\Content\Sql" name="qdb.tab.sql" as="qdb.tab.sql" template="tab/sql.phtml"/>
+                  <block class="ADM\QuickDevBar\Block\Tab\Content\Log" name="qdb.tab.log" as="qdb.tab.log" template="tab/log.phtml"/>
               </block>
             </block>
         </referenceContainer>
     </body>
-</page>
-
-
+</page>
\ No newline at end of file
diff --git a/view/frontend/templates/tab/info/general.phtml b/view/frontend/templates/tab/info/general.phtml
new file mode 100644
index 0000000..b863a81
--- /dev/null
+++ b/view/frontend/templates/tab/info/general.phtml
@@ -0,0 +1,27 @@
+<?php
+$_website = $block->getWebsite();
+$_store = $this->getStore();
+?>
+
+<table border="0" cellpadding="0" cellspacing="0">
+  <tr>
+    <th><?php echo __('Website Id'); ?></th>
+    <td><?php echo $_website->getId(); ?></td>
+  </tr>
+  <tr>
+    <th><?php echo __('Website Name'); ?></th>
+    <td><?php echo $_website->getName(); ?></td>
+  </tr>
+  <tr>
+    <th><?php echo __('Store Id'); ?></th>
+    <td><?php echo $_website->getId(); ?></td>
+  </tr>
+  <tr>
+    <th><?php echo __('Store Name'); ?></th>
+    <td><?php echo $_store->getName(); ?></td>
+  </tr>
+  <tr>
+    <th><?php echo __('Store Code'); ?></th>
+    <td><?php echo $_store->getCode(); ?></td>
+  </tr>
+</table>
\ No newline at end of file
diff --git a/view/frontend/templates/tab/info/layout.phtml b/view/frontend/templates/tab/info/layout.phtml
new file mode 100644
index 0000000..0192ee9
--- /dev/null
+++ b/view/frontend/templates/tab/info/layout.phtml
@@ -0,0 +1,30 @@
+<?php
+?>
+<table class="qdn_table_2col">
+<tr>
+    <th><?php echo __('Handles'); ?></th>
+    <td>
+    <?php foreach ($block->getHandles() as $handle): ?>
+    <?php echo $handle; ?></br>
+    <?php endforeach;?>
+    </td>
+</tr>
+<tr>
+    <th><?php echo __('Blocks hierarchy'); ?></th>
+    <td>
+    WARNING: This is an indicative tree list could not be the reality.
+    <br/>
+    <?php echo $block->getHtmlBlocksHierarchy(); ?></br>
+    </td>
+</tr>
+<tr>
+    <th><?php echo __('Containers'); ?></th>
+    <td>
+    <ul>
+        <?php foreach($block->getContainers() as $containerAlias=>$containerLable): ?>
+        <li><?php echo $containerAlias; ?></li>
+        <?php endforeach; ?>
+    </ul>
+    </td>
+</tr>
+</table>
diff --git a/view/frontend/templates/tab/profiler.phtml b/view/frontend/templates/tab/info/profiler.phtml
similarity index 100%
rename from view/frontend/templates/tab/profiler.phtml
rename to view/frontend/templates/tab/info/profiler.phtml
diff --git a/view/frontend/templates/tab/request.phtml b/view/frontend/templates/tab/info/request.phtml
old mode 100755
new mode 100644
similarity index 100%
rename from view/frontend/templates/tab/request.phtml
rename to view/frontend/templates/tab/info/request.phtml
diff --git a/view/frontend/templates/tab/info/store.phtml b/view/frontend/templates/tab/info/store.phtml
new file mode 100644
index 0000000..8009b30
--- /dev/null
+++ b/view/frontend/templates/tab/info/store.phtml
@@ -0,0 +1,27 @@
+<?php
+$_website = $block->getWebsite();
+$_store = $this->getStore();
+?>
+
+<table border="0" cellpadding="0" cellspacing="0">
+  <tr>
+    <th><?php echo __('Website Id'); ?></th>
+    <td><?php echo $_website->getId(); ?></td>
+  </tr>
+  <tr>
+    <th><?php echo __('Website Name'); ?></th>
+    <td><?php echo $_website->getName(); ?></td>
+  </tr>
+  <tr>
+    <th><?php echo __('Store Id'); ?></th>
+    <td><?php echo $_store->getId(); ?></td>
+  </tr>
+  <tr>
+    <th><?php echo __('Store Name'); ?></th>
+    <td><?php echo $_store->getName(); ?></td>
+  </tr>
+  <tr>
+    <th><?php echo __('Store Code'); ?></th>
+    <td><?php echo $_store->getCode(); ?></td>
+  </tr>
+</table>
\ No newline at end of file
diff --git a/view/frontend/templates/tab/layout.phtml b/view/frontend/templates/tab/layout.phtml
deleted file mode 100755
index 7ace37a..0000000
--- a/view/frontend/templates/tab/layout.phtml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-?>
-<table class="qdn_table_2col">
-<tr>
-    <th>Handles</th>
-    <td>
-    <?php foreach ($block->getHandles() as $handle): ?>
-    <?php echo $handle; ?></br>
-    <?php endforeach;?>
-    </td>
-  </tr>
-</table>
-
-<?php echo $block->getContent() ?>
diff --git a/view/frontend/templates/tabs.phtml b/view/frontend/templates/tabs.phtml
new file mode 100644
index 0000000..949f959
--- /dev/null
+++ b/view/frontend/templates/tabs.phtml
@@ -0,0 +1,21 @@
+<?php
+?>
+
+<div class="qdb-container <?php echo $block->getUiTabClass() ?>"
+data-mage-init='{"tabs":<?php echo $block->getJsonTabConfig(); ?>}'
+role="tablist" style="display: block;">
+    <ul class="ui-tabs-nav">
+        <?php foreach($block->getTabBlocks() as $tabBlock): ?>
+            <li data-role="collapsible<?php echo $block->getSubTabSuffix();?>" data-collapsible="true" class="<?php echo $tabBlock->getClass() ?>">
+                <a href="<?php echo $tabBlock->getTabUrl() ?>" tabindex="-1" data-toggle="switch" role="tab" data-ajax="<?php echo $tabBlock->isAjax() ?>">
+                <?php echo $tabBlock->getTitle() ?>
+                </a>
+            </li>
+        <?php endforeach; ?>
+    </ul>
+    <?php foreach($block->getTabBlocks() as $tabBlock): ?>
+        <div class="qdb-panel"  data-role="content<?php echo $block->getSubTabSuffix();?>" role="tabpanel" id="<?php echo $tabBlock->getId() ?>" >
+            <?php echo ($tabBlock->isAjax(false)) ? $tabBlock->getHtmlBigLoader() : $tabBlock->toHtml(); ?>
+        </div>
+    <?php endforeach; ?>
+</div>
\ No newline at end of file
diff --git a/view/frontend/templates/toolbar.phtml b/view/frontend/templates/toolbar.phtml
index 946fc50..dca344d 100644
--- a/view/frontend/templates/toolbar.phtml
+++ b/view/frontend/templates/toolbar.phtml
@@ -1,22 +1,7 @@
 <?php if($block->isUserAllowed()):?>
 <div>
 <div id="qdb-bar" style="display: none;" data-mage-init='{"quickDevBar":{"toggleEffect":"slide"}}'>
-    <div class="qdb-container ui-tabs" data-mage-init='{"tabs":{"active": false, "openedState":"ui-tabs-active", "collapsible": true, "ajaxContent": true}}' role="tablist" style="display: block;">
-        <ul class="ui-tabs-nav">
-            <?php foreach($block->getTabBlocks() as $tabBlock): ?>
-                <li data-role="collapsible" data-collapsible="true" class="<?php echo $tabBlock->getClass() ?>">
-                    <a href="<?php echo $tabBlock->getTabUrl() ?>" tabindex="-1" data-toggle="switch" role="tab" data-ajax="<?php echo $tabBlock->isAjax() ?>">
-                    <?php echo $tabBlock->getTitle() ?>
-                    </a>
-                </li>
-            <?php endforeach; ?>
-        </ul>
-        <?php foreach($block->getTabBlocks() as $tabBlock): ?>
-            <div class="qdb-panel"  data-role="content" role="tabpanel" id="<?php echo $tabBlock->getId() ?>" aria-hidden="true" style="display: none;">
-                <?php echo ($tabBlock->isAjax()=="true") ? $tabBlock->getHtmlBigLoader() : $tabBlock->toHtml(); ?>
-            </div>
-        <?php endforeach; ?>
-    </div>
+<?php echo $block->getChildHtml(); ?>
 </div>
 <div id="qdb-bar-anchor">
 <img src="<?php echo $block->getViewFileUrl('ADM_QuickDevBar::images/qdb-icon.png') ?>" alt="<?php echo __('QuickDevBar'); ?>" title="<?php echo __('Click to toggle the Quick Development Toolbar'); ?>"/>&nbsp;
diff --git a/view/frontend/web/css/quickdevbar.css b/view/frontend/web/css/quickdevbar.css
index 369847f..5d4f5f8 100644
--- a/view/frontend/web/css/quickdevbar.css
+++ b/view/frontend/web/css/quickdevbar.css
@@ -17,6 +17,10 @@
   font-size: 12px;
 }
 
+#qdb-bar  input {
+  width: auto;
+}
+
 #qdb-bar-anchor {
     position: absolute;
     top: 1px;
@@ -45,33 +49,53 @@ div.qdb-panel {
   * Tabs
   * ---------------
   */
-#qdb-bar div.ui-tabs {
+div.qdb-ui-tabs, div.qdb-ui-subtabs {
     padding: 0 0 20px 0;
 }
-#qdb-bar div.ui-tabs > ul {
+div.qdb-ui-tabs > ul, div.qdb-ui-subtabs > ul {
     padding-left: 5px;
 }
-#qdb-bar div.ui-tabs > ul > li {
+
+div.qdb-ui-tabs > ul > li, div.qdb-ui-subtabs > ul > li {
     position: relative;
     z-index: 98;
     display:inline-block;
-    border: 1px solid #ccc;
+    background-color: #f7f7f7;
+}
+
+div.qdb-ui-tabs > ul > li {
     margin-bottom: 3px;
     padding: 5px 10px;
     -webkit-border-radius: 10px;
     -moz-border-radius: 10px;
-    border-radius: 10px;
-    background-color: #f7f7f7;
+    border-radius: 10px;    
+    border: 1px solid #ccc;
     box-shadow: none;
 }
 
-#qdb-bar div.ui-tabs li.ui-tabs-active {
+
+div.qdb-ui-subtabs > ul > li {
+    margin: 0 3px;
+    padding: 7px 10px;
+    -webkit-border-top-left-radius: 4px;
+    -webkit-border-top-right-radius: 4px;
+    -moz-border-radius-topleft: 4px;
+    -moz-border-radius-topright: 4px;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+}
+
+
+div.qdb-ui-tabs li.ui-tabs-active, div.qdb-ui-subtabs li.ui-tabs-active {
     background-color: #fff;
-    /* border-bottom: 1px solid #fff; */
     z-index: 100;
 }
 
-#qdb-bar div.ui-tabs > ul a {
+div.qdb-ui-subtabs li.ui-tabs-active {
+    border-bottom: 1px solid #fff;
+}
+
+div.qdb-ui-tabs > ul a, div.qdb-ui-subtabs > ul a  {
     text-decoration: none;
     color: #004276;
     font-weight: bold;
@@ -79,23 +103,31 @@ div.qdb-panel {
     box-shadow: none;
 }
 
-#qdb-bar div.ui-tabs .ui-state-hover > a {
+div.qdb-ui-tabs .ui-state-hover > a, div.qdb-ui-subtabs .ui-state-hover > a {
     box-shadow: none;
 }
 
-#qdb-bar div.ui-tabs .ui-tabs-active > a {
+div.qdb-ui-tabs .ui-tabs-active > a, div.qdb-ui-subtabs .ui-tabs-active > a {
     color: #cc0000;
     box-shadow: none;
 }
 
-#qdb-bar div.ui-tabs > div {
+div.qdb-ui-tabs > div, div.qdb-ui-subtabs > div {
     position: relative;
     border: 1px solid #CCC;
-    padding: 20px;
     z-index: 99;
     font-size: 1.1em;
 }
 
+div.qdb-ui-tabs > div {
+    padding: 10px;
+    box-shadow: -1px 10px 15px 0 rgba(0, 0, 0, 0.7);
+}
+
+div.qdb-ui-subtabs > div {
+    padding: 10px;
+}
+
 /**
   * Loader
   * ---------------
@@ -120,6 +152,7 @@ div.qdb-panel {
   */
 
 table.qdn_table {
+  border-collapse: collapse;
   border: 1px solid #ccc;
   width: 100%;  
 }
@@ -170,7 +203,7 @@ table.qdn_table_2col tr th{
  * SQL
   * ---------------
  */
-span.sqlmain, span.sqlword, span.sqljoin {
+span.sqlmain, span.sqlword, span.sqlother {
   font-weight:bold;
 }
 
@@ -182,7 +215,7 @@ span.sqlword {
   color:#cc00c0;
 }
 
-span.sqljoin {
+span.sqlother {
   color:#FF5200;
 }
 
diff --git a/view/frontend/web/js/quickdevbar.js b/view/frontend/web/js/quickdevbar.js
index 8238d77..ac10c7b 100644
--- a/view/frontend/web/js/quickdevbar.js
+++ b/view/frontend/web/js/quickdevbar.js
@@ -34,6 +34,16 @@ define(["jquery",
                     table.find('tr').removeClass(this.options.stripedClassname).filter(':visible:even').addClass(this.options.stripedClassname);
                 }, this)
             });
+            
+            
+            var loadedTab = {};
+            $('.ui-tabs-nav li.use-ajax').on( "beforeOpen", function( event) {
+                if (!loadedTab[event.target]) {
+                    loadedTab[event.target] = true;
+                    console.log(event.target, 'loaded');
+                }
+            });
+            
         }
     });
 });
\ No newline at end of file