diff --git a/package.json b/package.json
index f0e1c2be5a0..bda51e4a90a 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "driver.js": "0.9.8",
     "dropzone": "5.7.3",
     "echarts": "5.0.2",
-    "element-ui": "2.15.0",
+    "element-ui": "2.15.5",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.6",
     "js-cookie": "2.2.1",
diff --git a/src/components/ADempiere/Field/FieldText.vue b/src/components/ADempiere/Field/FieldText.vue
index eef2104067f..58d9e101cab 100644
--- a/src/components/ADempiere/Field/FieldText.vue
+++ b/src/components/ADempiere/Field/FieldText.vue
@@ -112,7 +112,7 @@ export default {
 
 <style>
   .custom-field-text {
-    max-height: 34px;
+    max-height: 36px;
   }
   .el-textarea__inner {
     resize: none !important;
diff --git a/src/components/ADempiere/Field/index.vue b/src/components/ADempiere/Field/index.vue
index 7c68aeee49f..ffcfdab7178 100644
--- a/src/components/ADempiere/Field/index.vue
+++ b/src/components/ADempiere/Field/index.vue
@@ -246,6 +246,7 @@ export default {
       }
       return undefined
     },
+
     /**
      * Idicate if field is read only
      * TODO: Create common method to evaluate isReadOnly
@@ -262,6 +263,12 @@ export default {
         return true
       }
 
+      // validate with container manager
+      if (!this.isEmptyValue(this.containerManager) &&
+        this.containerManager.validateReadOnly) {
+        return this.containerManager.validateReadOnly(this.field)
+      }
+
       const isUpdateableAllFields = this.field.isReadOnly || this.field.isReadOnlyFromLogic
 
       if (this.isPanelWindow) {
@@ -298,6 +305,7 @@ export default {
       // other type of panels (process/report)
       return Boolean(isUpdateableAllFields)
     },
+
     isFieldOnly() {
       if (this.inTable || this.field.isFieldOnly) {
         return undefined
diff --git a/src/store/modules/ADempiere/dictionary/browser/actions.js b/src/store/modules/ADempiere/dictionary/browser/actions.js
index f8928c2c944..ece7f31cfaa 100644
--- a/src/store/modules/ADempiere/dictionary/browser/actions.js
+++ b/src/store/modules/ADempiere/dictionary/browser/actions.js
@@ -18,11 +18,15 @@ import { requestBrowserMetadata } from '@/api/ADempiere/dictionary/smart-browser
 
 export default {
   getBrowserDefinitionFromServer({ commit }, uuid) {
-    return requestBrowserMetadata({
-      uuid
-    })
-      .then(browser => {
-        commit('addBrowserToList', browser)
+    return new Promise(resolve => {
+      requestBrowserMetadata({
+        uuid
       })
+        .then(browser => {
+          commit('addBrowserToList', browser)
+
+          resolve(browser)
+        })
+    })
   }
 }
diff --git a/src/store/modules/ADempiere/dictionary/browser/getters.js b/src/store/modules/ADempiere/dictionary/browser/getters.js
index 7e884301aa8..be14e3200d4 100644
--- a/src/store/modules/ADempiere/dictionary/browser/getters.js
+++ b/src/store/modules/ADempiere/dictionary/browser/getters.js
@@ -22,7 +22,8 @@ export default {
   getStoredBrowsers: (state) => {
     return state.storedBrowsers
   },
+
   getStoredBrowser: (state) => (browserUuid) => {
-    return state.storedBrowsers.find(browser => browser.uuid === browserUuid)
+    return state.storedBrowsers[browserUuid]
   }
 }
diff --git a/src/store/modules/ADempiere/dictionary/browser/mutations.js b/src/store/modules/ADempiere/dictionary/browser/mutations.js
index 8b2d0372391..c6637cc25cd 100644
--- a/src/store/modules/ADempiere/dictionary/browser/mutations.js
+++ b/src/store/modules/ADempiere/dictionary/browser/mutations.js
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+import Vue from 'vue'
 import { isEmptyValue } from '@/utils/ADempiere/valueUtils.js'
 
 /**
@@ -22,10 +23,21 @@ import { isEmptyValue } from '@/utils/ADempiere/valueUtils.js'
  */
 export default {
   addBrowserToList(state, browser) {
-    if (!isEmptyValue(browser)) {
-      if (!state.storedBrowsers.find(browserToFind => browserToFind.uuid === browser.uuid)) {
-        state.storedBrowsers.push(browser)
-      }
+    Vue.set(state.storedBrowsers, browser.uuid, browser)
+  },
+
+  changeBrowserAttribute(state, {
+    uuid,
+    attributeName,
+    attributeValue,
+    attributeNameControl
+  }) {
+    let value = attributeValue
+    if (!isEmptyValue(attributeNameControl)) {
+      value = state.storedBrowsers[uuid][attributeNameControl]
     }
+
+    state.storedBrowsers[uuid][attributeName] = value
   }
+
 }
diff --git a/src/store/modules/ADempiere/dictionary/browser/state.js b/src/store/modules/ADempiere/dictionary/browser/state.js
index 08c8ead71fd..a2418fc022d 100644
--- a/src/store/modules/ADempiere/dictionary/browser/state.js
+++ b/src/store/modules/ADempiere/dictionary/browser/state.js
@@ -15,5 +15,5 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 export default {
-  storedBrowsers: []
+  storedBrowsers: {}
 }
diff --git a/src/views/ADempiere/Browser/index.vue b/src/views/ADempiere/Browser/index.vue
index 1227a15ecc8..2a9dfd0d8fa 100644
--- a/src/views/ADempiere/Browser/index.vue
+++ b/src/views/ADempiere/Browser/index.vue
@@ -18,22 +18,16 @@
 
 <template>
   <el-container
-    v-if="isLoaded"
+    v-if="isLoadedMetadata"
     key="browser-loaded"
     class="view-base"
     style="height: 86vh;"
   >
-    <modal-dialog
-      :parent-uuid="browserUuid"
-      :container-uuid="browserUuid"
-      :panel-type="panelType"
-    />
-
     <el-header v-if="isShowContextMenu">
-      <context-menu
-        :menu-parent-uuid="$route.meta.parentUuid"
-        :container-uuid="browserUuid"
-        :panel-type="panelType"
+      <action-menu
+        :parent-uuid="browserUuid"
+        :actions-manager="actionsManager"
+        :relations-manager="relationsManager"
       />
 
       <div class="center" style="width: 100%">
@@ -52,8 +46,8 @@
         <el-collapse-item :title="$t('views.searchCriteria')" name="opened-criteria">
           <panel-definition
             :container-uuid="browserUuid"
-            :metadata="browserMetadata"
-            :panel-type="panelType"
+            :panel-metadata="browserMetadata"
+            :container-manager="containerManager"
           />
         </el-collapse-item>
       </el-collapse>
@@ -61,36 +55,39 @@
       <!-- result of records in the table -->
       <default-table
         :container-uuid="browserUuid"
+        :container-manager="containerManagerTable"
+        :panel-metadata="browserMetadata"
+        :header="tableHeader"
+        :data-table="[]"
       />
     </el-main>
   </el-container>
 
-  <div
+  <loading-view
     v-else
-    key="browser-loading"
-    v-loading="!isLoaded"
-    :element-loading-text="$t('notifications.loading')"
-    element-loading-background="rgba(255, 255, 255, 0.8)"
-    class="view-loading"
+    key="window-loading"
   />
 </template>
 
 <script>
 import { computed, defineComponent, ref } from '@vue/composition-api'
 
-import ContextMenu from '@/components/ADempiere/ContextMenu'
-import ModalDialog from '@/components/ADempiere/Dialog'
+import ActionMenu from '@/components/ADempiere/ActionMenu/index.vue'
+import DefaultTable from '@/components/ADempiere/DefaultTable/index.vue'
+import LoadingView from '@/components/ADempiere/LoadingView/index.vue'
 import TitleAndHelp from '@/components/ADempiere/TitleAndHelp'
-import PanelDefinition from '@/components/ADempiere/PanelDefinition'
-import DefaultTable from '@/components/ADempiere/DefaultTable'
+import PanelDefinition from '@/components/ADempiere/PanelDefinition/index.vue'
+
+import { sharedLink } from '@/utils/ADempiere/constants/actionsMenuList'
+import { generatePanelAndFields } from '@/components/ADempiere/PanelDefinition/panelUtils'
 
 export default defineComponent({
-  name: 'Browser',
+  name: 'BrowserView',
 
   components: {
-    ContextMenu,
+    ActionMenu,
     DefaultTable,
-    ModalDialog,
+    LoadingView,
     PanelDefinition,
     TitleAndHelp
   },
@@ -104,8 +101,7 @@ export default defineComponent({
   },
 
   setup(props, { root }) {
-    const panelType = 'browser'
-    const isLoaded = ref(false)
+    const isLoadedMetadata = ref(false)
     const browserMetadata = ref({})
 
     let browserUuid = root.$route.meta.uuid
@@ -114,10 +110,11 @@ export default defineComponent({
       browserUuid = props.uuid
     }
 
-    const browserDefinition = computed(() => {
-      return root.$store.getters.getBrowser(browserUuid)
+    const storedBrowser = computed(() => {
+      return root.$store.getters.getStoredBrowser(browserUuid)
     })
 
+    // TODO: Handle per individual smart browser
     // by default enable context menu and title
     root.$store.dispatch('settings/changeSetting', {
       key: 'showContextMenu',
@@ -128,23 +125,11 @@ export default defineComponent({
       return root.$store.state.settings.showContextMenu
     })
 
-    const isLoadedRecords = computed(() => {
-      return root.$store.getters.getDataRecordAndSelection(browserUuid).isLoaded
-    })
-
-    const isReadyToSearch = computed(() => {
-      // TODO: Add timer to await
-      if (browserMetadata.value.awaitForValuesToQuery) {
-        return false
-      }
-      return !root.$store.getters.isNotReadyForSubmit(browserUuid)
-    })
-
     const openedCriteria = computed({
       get() {
         // by default criteria if closed
         const openCriteria = []
-        const browser = browserDefinition.value
+        const browser = browserMetadata.value
         if (!root.isEmptyValue(browser)) {
           if (browser.isShowedCriteria) {
             // open criteria
@@ -159,67 +144,80 @@ export default defineComponent({
           showCriteria = true
         }
 
-        root.$store.dispatch('changeBrowserAttribute', {
-          containerUuid: browserUuid,
+        root.$store.commit('changeBrowserAttribute', {
+          uuid: browserUuid,
           attributeName: 'isShowedCriteria',
           attributeValue: showCriteria
         })
       }
     })
 
+    const tableHeader = computed(() => {
+      const panel = generatePanelAndFields({
+        containerUuid: browserUuid,
+        panelMetadata: browserMetadata.value
+      })
+      return panel.fieldsList
+    })
+
     const getBrowserDefinition = () => {
-      const browser = browserDefinition.value
+      const browser = storedBrowser.value
       if (browser) {
         browserMetadata.value = browser
-        isLoaded.value = true
-        defaultSearch()
+        isLoadedMetadata.value = true
         return
       }
-      root.$store.dispatch('getPanelAndFields', {
-        containerUuid: browserUuid,
-        panelType,
-        routeToDelete: root.$route
-      })
+
+      root.$store.dispatch('getBrowserDefinitionFromServer', browserUuid)
         .then(browserResponse => {
           browserMetadata.value = browserResponse
-          defaultSearch()
-        })
-        .finally(() => {
-          isLoaded.value = true
+        }).finally(() => {
+          isLoadedMetadata.value = true
         })
     }
 
-    const defaultSearch = () => {
-      if (isLoadedRecords.value) {
-        // not research
-        return
-      }
+    const containerManager = {
+      actionPerformed({ field, value }) {
+        console.log(value)
+      },
 
-      if (isReadyToSearch.value) {
-        // first search by default
-        root.$store.dispatch('getBrowserSearch', {
-          containerUuid: browserUuid
-        })
-        return
+      validateReadOnly(field) {
+        return field.isReadOnlyFromLogic
       }
+    }
 
-      // set default values into data
-      root.$store.dispatch('setRecordSelection', {
-        containerUuid: browserUuid,
-        panelType
-      })
+    const containerManagerTable = {
+      ...containerManager,
+
+      validateReadOnly(field) {
+        return field.isReadOnly
+      }
     }
 
+    const actionsManager = ref({
+      actionsList: [
+        sharedLink
+      ]
+    })
+
+    const relationsManager = ref({
+      menuParentUuid: root.$route.meta.parentUuid
+    })
+
     getBrowserDefinition()
 
     return {
-      isLoaded,
+      isLoadedMetadata,
       browserUuid,
       browserMetadata,
-      panelType,
+      containerManager,
+      containerManagerTable,
+      actionsManager,
+      relationsManager,
       // computed
       openedCriteria,
-      isShowContextMenu
+      isShowContextMenu,
+      tableHeader
     }
   }
 })