diff --git a/ui-admin/src/js/common/messages.js b/ui-admin/src/js/common/messages.js
index 0c50beff0f0a4d6aa70a8a4caf20fb9408811ca3..5bb86c0fb4c82bb0680ae0d2cb06f05cea16be43 100644
--- a/ui-admin/src/js/common/messages.js
+++ b/ui-admin/src/js/common/messages.js
@@ -97,10 +97,12 @@ const keys = {
   EXPORT_IMPORT_INCOMPATIBLE_INFO: 'EXPORT_IMPORT_INCOMPATIBLE_INFO',
   EXPORTS: 'EXPORTS',
   FAIL_IF_EXISTS: 'FAIL_IF_EXISTS',
+  FILE_UPLOAD: 'FILE_UPLOAD',
   FILTER: 'FILTER',
   FILTERS: 'FILTERS',
   FIRST_NAME: 'FIRST_NAME',
   FIRST_PAGE: 'FIRST_PAGE',
+  FOLDER_UPLOAD: 'FOLDER_UPLOAD',
   FORM_PREVIEW: 'FORM_PREVIEW',
   FREEZES: 'FREEZES',
   FREEZING: 'FREEZING',
@@ -403,10 +405,12 @@ const messages_en = {
   [keys.EXPORT_IMPORT_INCOMPATIBLE_INFO]: 'The system will export selected columns.',
   [keys.EXPORTS]: 'Exports',
   [keys.FAIL_IF_EXISTS]: 'Fail if exists',
+  [keys.FILE_UPLOAD]: 'File upload',
   [keys.FILTER]: 'Filter',
   [keys.FILTERS]: 'Filters',
   [keys.FIRST_NAME]: 'First Name',
   [keys.FIRST_PAGE]: 'First Page',
+  [keys.FOLDER_UPLOAD]: 'Folder upload',
   [keys.FORM_PREVIEW]: 'Form Preview',
   [keys.FREEZES]: 'Freezes',
   [keys.FREEZING]: 'Freezing',
diff --git a/ui-admin/src/js/components/database/data-browser/LeftToolbar.jsx b/ui-admin/src/js/components/database/data-browser/LeftToolbar.jsx
index 4124fb40506cbac5477aaa5c9d2a66be4edb7a75..538221b255b6af16dbd99b11e04e97de9db3865a 100644
--- a/ui-admin/src/js/components/database/data-browser/LeftToolbar.jsx
+++ b/ui-admin/src/js/components/database/data-browser/LeftToolbar.jsx
@@ -20,6 +20,7 @@ import Button from '@material-ui/core/Button'
 import CreateNewFolderIcon from '@material-ui/icons/CreateNewFolderOutlined'
 import messages from '@src/js/common/messages.js'
 import { withStyles } from '@material-ui/core/styles'
+import logger from "@src/js/common/logger.js";
 
 const color = 'secondary'
 
@@ -35,6 +36,8 @@ const styles = theme => ({
 
 class LeftToolbar extends React.Component {
   render() {
+    logger.log(logger.DEBUG, 'LeftToolbar.render')
+
     const { buttonSize, controller, classes } = this.props
     return (
       <div className={classes.buttons}>
diff --git a/ui-admin/src/js/components/database/data-browser/RightToolbar.jsx b/ui-admin/src/js/components/database/data-browser/RightToolbar.jsx
index 900695c17f7ea0888c412b7757cde12fa89c2fc6..6b23b5128acc73bd26b53495bcd62c5de8fc0037 100644
--- a/ui-admin/src/js/components/database/data-browser/RightToolbar.jsx
+++ b/ui-admin/src/js/components/database/data-browser/RightToolbar.jsx
@@ -33,6 +33,7 @@ import autoBind from 'auto-bind'
 import UploadButton from '@src/js/components/database/data-browser/UploadButton.jsx'
 import FileIcon from '@material-ui/icons/InsertDriveFileOutlined'
 import FolderIcon from '@material-ui/icons/FolderOpen'
+import logger from "@src/js/common/logger.js";
 
 const color = 'secondary'
 const iconButtonSize = 'medium'
@@ -101,7 +102,7 @@ class RightToolbar extends React.Component {
           startIcon={<FileIcon />}
           onClick={this.handleUploadFiles}
         >
-          Upload file
+          {messages.get(messages.FILE_UPLOAD)}
         </UploadButton>
         <UploadButton
           classes={{ root: classes.button }}
@@ -111,13 +112,15 @@ class RightToolbar extends React.Component {
           startIcon={<FolderIcon />}
           onClick={this.handleUploadFolders}
         >
-          Upload folder
+          {messages.get(messages.FOLDER_UPLOAD)}
         </UploadButton>
       </div>
     )
   }
 
   render() {
+    logger.log(logger.DEBUG, 'RightToolbar.render')
+
     const { classes, onViewTypeChange, buttonSize } = this.props
     const { uploadButtonsPopup } = this.state
     return (
diff --git a/ui-admin/src/js/components/database/data-browser/Toolbar.jsx b/ui-admin/src/js/components/database/data-browser/Toolbar.jsx
index bf038fcaab65f9eb3d23745590fa6ecb7d2b6466..c3c1808cc60b2ab306efbf86d04d61c3763be45c 100644
--- a/ui-admin/src/js/components/database/data-browser/Toolbar.jsx
+++ b/ui-admin/src/js/components/database/data-browser/Toolbar.jsx
@@ -20,6 +20,7 @@ import { withStyles } from '@material-ui/core/styles'
 import autoBind from 'auto-bind'
 import LeftToolbar from '@src/js/components/database/data-browser/LeftToolbar.jsx'
 import RightToolbar from '@src/js/components/database/data-browser/RightToolbar.jsx'
+import logger from "@src/js/common/logger.js";
 
 const buttonSize = 'small'
 
@@ -46,6 +47,8 @@ class Toolbar extends React.Component {
   handleUploadFolders() {}
 
   render() {
+    logger.log(logger.DEBUG, 'Toolbar.render')
+
     const { viewType, onViewTypeChange, classes, showInfo, onShowInfoChange } =
       this.props
     return (