diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index f8218560..e88c8d8d 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -6,7 +6,7 @@
          <div id="main-content" class="container">
             <TheAppWelcome v-if="!connections.length" @newConn="showNewConnModal" />
             <div v-else class="columns col-gapless">
-               <DatabaseWorkspace
+               <Workspace
                   v-for="connection in connections"
                   :key="connection.uid"
                   :connection="connection"
@@ -29,7 +29,7 @@ import TheSettingBar from '@/components/TheSettingBar';
 import TheFooter from '@/components/TheFooter';
 import TheNotificationsBoard from '@/components/TheNotificationsBoard';
 import TheAppWelcome from '@/components/TheAppWelcome';
-import DatabaseWorkspace from '@/components/DatabaseWorkspace';
+import Workspace from '@/components/Workspace';
 import ModalNewConnection from '@/components/ModalNewConnection';
 import ModalEditConnection from '@/components/ModalEditConnection';
 import ModalSettings from '@/components/ModalSettings';
@@ -42,7 +42,7 @@ export default {
       TheFooter,
       TheNotificationsBoard,
       TheAppWelcome,
-      DatabaseWorkspace,
+      Workspace,
       ModalNewConnection,
       ModalEditConnection,
       ModalSettings
diff --git a/src/renderer/components/TheTitleBar.vue b/src/renderer/components/TheTitleBar.vue
index 69202aee..b914bb5c 100644
--- a/src/renderer/components/TheTitleBar.vue
+++ b/src/renderer/components/TheTitleBar.vue
@@ -90,6 +90,8 @@ export default {
       height: $titlebar-height;
       -webkit-app-region: drag;
       user-select: none;
+      box-shadow: 0 0 1px 0px #000;
+      z-index: 9999;
 
       .titlebar-resizer{
          position: absolute;
diff --git a/src/renderer/components/DatabaseWorkspace.vue b/src/renderer/components/Workspace.vue
similarity index 87%
rename from src/renderer/components/DatabaseWorkspace.vue
rename to src/renderer/components/Workspace.vue
index 2571dec5..9a4878b3 100644
--- a/src/renderer/components/DatabaseWorkspace.vue
+++ b/src/renderer/components/Workspace.vue
@@ -1,6 +1,6 @@
 <template>
    <div v-show="isSelected" class="workspace column columns">
-      <DatabaseExploreBar :connection="connection" :is-selected="isSelected" />
+      <WorkspaceExploreBar :connection="connection" :is-selected="isSelected" />
       <div class="workspace-tabs column">
          <pre>{{ JSON.stringify(workspace.structure, null, 3) }}</pre>
       </div>
@@ -10,12 +10,12 @@
 <script>
 import { mapGetters, mapActions } from 'vuex';
 import Connection from '@/ipc-api/Connection';
-import DatabaseExploreBar from '@/components/DatabaseExploreBar';
+import WorkspaceExploreBar from '@/components/WorkspaceExploreBar';
 
 export default {
-   name: 'DatabaseWorkspace',
+   name: 'Workspace',
    components: {
-      DatabaseExploreBar
+      WorkspaceExploreBar
    },
    props: {
       connection: Object
diff --git a/src/renderer/components/DatabaseConnectPanel.vue b/src/renderer/components/WorkspaceConnectPanel.vue
similarity index 98%
rename from src/renderer/components/DatabaseConnectPanel.vue
rename to src/renderer/components/WorkspaceConnectPanel.vue
index b9c7722a..7b3591e7 100644
--- a/src/renderer/components/DatabaseConnectPanel.vue
+++ b/src/renderer/components/WorkspaceConnectPanel.vue
@@ -30,7 +30,7 @@ import { mapActions } from 'vuex';
 import ModalAskCredentials from '@/components/ModalAskCredentials';
 
 export default {
-   name: 'DatabaseConnectPanel',
+   name: 'WorkspaceConnectPanel',
    components: {
       ModalAskCredentials
    },
diff --git a/src/renderer/components/DatabaseExploreBar.vue b/src/renderer/components/WorkspaceExploreBar.vue
similarity index 80%
rename from src/renderer/components/DatabaseExploreBar.vue
rename to src/renderer/components/WorkspaceExploreBar.vue
index bae6425e..d5905716 100644
--- a/src/renderer/components/DatabaseExploreBar.vue
+++ b/src/renderer/components/WorkspaceExploreBar.vue
@@ -22,26 +22,13 @@
                >exit_to_app</i>
             </span>
          </div>
-         <DatabaseConnectPanel v-if="!workspace.connected" :connection="connection" />
+         <WorkspaceConnectPanel v-if="!workspace.connected" :connection="connection" />
          <div class="workspace-explorebar-body">
-            <div
+            <WorkspaceExploreBarDatabase
                v-for="db of workspace.structure"
                :key="db.dbName"
-            >
-               <div class="database-name">
-                  <i class="material-icons md-18 mr-1">view_agenda</i>{{ db.dbName }}
-               </div>
-               <div class="d-block ml-4">
-                  <div
-                     v-for="table of db.tables"
-                     :key="table.TABLE_NAME"
-                  >
-                     <div class="table-name">
-                        <i class="material-icons md-18 mr-1">view_headline</i>{{ table.TABLE_NAME }}
-                     </div>
-                  </div>
-               </div>
-            </div>
+               :database="db"
+            />
          </div>
       </div>
    </div>
@@ -50,12 +37,14 @@
 <script>
 import { mapGetters, mapActions } from 'vuex';
 import _ from 'lodash';
-import DatabaseConnectPanel from '@/components/DatabaseConnectPanel';
+import WorkspaceConnectPanel from '@/components/WorkspaceConnectPanel';
+import WorkspaceExploreBarDatabase from '@/components/WorkspaceExploreBarDatabase';
 
 export default {
-   name: 'DatabaseExploreBar',
+   name: 'WorkspaceExploreBar',
    components: {
-      DatabaseConnectPanel
+      WorkspaceConnectPanel,
+      WorkspaceExploreBarDatabase
    },
    props: {
       connection: Object,
@@ -139,8 +128,6 @@ export default {
 
    .workspace-explorebar{
       width: $explorebar-width;
-      height: calc(100vh - #{$excluding-size});
-      overflow: auto;
       display: flex;
       flex-direction: column;
       justify-content: flex-start;
@@ -151,14 +138,11 @@ export default {
       z-index: 8;
       flex: initial;
       position: relative;
-      padding-top: 1.4rem;
+      padding: 0;
 
       .workspace-explorebar-header{
-         top: 0;
-         left: 0;
-         right: 0;
+         width: 100%;
          padding: .3rem;
-         position: absolute;
          display: flex;
          justify-content: space-between;
          font-size: .6rem;
@@ -193,12 +177,9 @@ export default {
 
       .workspace-explorebar-body{
          width: 100%;
-
-         .database-name,
-         .table-name{
-            display: flex;
-            align-items: center;
-         }
+         height: calc((100vh - 30px) - #{$excluding-size});
+         overflow: auto;
+         padding: 0 .1rem;
       }
    }
 </style>
diff --git a/src/renderer/components/WorkspaceExploreBarDatabase.vue b/src/renderer/components/WorkspaceExploreBarDatabase.vue
new file mode 100644
index 00000000..9b822703
--- /dev/null
+++ b/src/renderer/components/WorkspaceExploreBarDatabase.vue
@@ -0,0 +1,57 @@
+<template>
+   <details class="accordion workspace-explorebar-database">
+      <summary class="accordion-header database-name pb-0">
+         <i class="icon material-icons md-18 mr-1">navigate_next</i>
+         <i class="material-icons md-18 mr-1">view_agenda</i>
+         <span>{{ database.dbName }}</span>
+      </summary>
+      <div class="accordion-body">
+         <div class="database-bables">
+            <ul class="menu menu-nav pt-0">
+               <li
+                  v-for="table of database.tables"
+                  :key="table.TABLE_NAME"
+                  class="menu-item"
+               >
+                  <a class="table-name">
+                     <i class="material-icons md-18 mr-1">grid_on</i>
+                     <span>{{ table.TABLE_NAME }}</span>
+                  </a>
+               </li>
+            </ul>
+         </div>
+      </div>
+   </details>
+</template>
+
+<script>
+export default {
+   name: 'WorkspaceExploreBarDatabase',
+   props: {
+      database: Object
+   }
+};
+</script>
+
+<style lang="scss">
+   .workspace-explorebar-database{
+      .database-name,
+      a.table-name{
+         display: flex;
+         align-items: center;
+         padding: .1rem;
+         cursor: pointer;
+
+         > span{
+            overflow: hidden;
+            white-space: nowrap;
+            display: block;
+            text-overflow: ellipsis;
+         }
+      }
+
+      .database-bables{
+         margin-left: 1.2rem;
+      }
+   }
+</style>
diff --git a/src/renderer/scss/main.scss b/src/renderer/scss/main.scss
index 81f1b8d3..27d27df1 100644
--- a/src/renderer/scss/main.scss
+++ b/src/renderer/scss/main.scss
@@ -139,4 +139,26 @@ body{
 
 .form-select:not([multiple]):not([size]):focus{
    border-color: $primary-color;
+}
+
+.menu{
+   font-size: .6rem;
+   .menu-item {
+      + .menu-item{
+         margin-top: 0;
+      }
+
+      > a{
+
+         &:hover{
+            color: $body-font-color;
+            background: rgba($color: #FFF, $alpha: .1);
+         }
+      }
+   }
+
+} 
+
+.accordion-body {
+   max-height: 500rem!important;
 }
\ No newline at end of file