diff --git a/frontend/src/components/dirent-list-view/dirents-menu.js b/frontend/src/components/dirent-list-view/dirents-menu.js
index e822b06186..23be4b9592 100644
--- a/frontend/src/components/dirent-list-view/dirents-menu.js
+++ b/frontend/src/components/dirent-list-view/dirents-menu.js
@@ -30,12 +30,12 @@ class DirentMenu extends React.Component {
         menuList = ['Share'];
       } else if (dirents[0].type === 'file') {
         if (dirents[0].is_locked) {
-          menuList = ['Share', 'Tags', 'Unlock', 'Details', 'Related Files', 'History', 'Open via Client'];
+          menuList = ['Share', 'Unlock', 'Tags', 'Related Files', 'Divider', 'History', 'Details', 'Divider', 'Open via Client'];
         } else {
-          menuList = ['Share', 'Tags', 'Lock', 'Details', 'Related Files', 'History', 'Open via Client'];
+          menuList = ['Share', 'Lock', 'Tags', 'Related Files', 'Divider', 'History', 'Details', 'Divider', 'Open via Client'];
         }
         if (!(currentRepoInfo.is_admin && currentRepoInfo.permission === 'rw' || isRepoOwner)) {
-          menuList.splice(2, 1);
+          menuList.splice(1, 1);
         }
       }
     } else {
diff --git a/frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js b/frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js
index 4f35008e1e..0f192459b6 100644
--- a/frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js
+++ b/frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js
@@ -27,7 +27,7 @@ const propTypes = {
   isRepoOwner: PropTypes.bool.isRequired,
   enableDirPrivateShare: PropTypes.bool.isRequired,
   currentRepoInfo: PropTypes.object.isRequired,
-  onFileTagChanged: PropTypes.func.isRequired,
+  onFilesTagChanged: PropTypes.func.isRequired,
   unSelectDirent: PropTypes.func.isRequired,
   updateDirent: PropTypes.func.isRequired,
   showDirentDetail: PropTypes.func.isRequired,
@@ -266,7 +266,7 @@ class MutipleDirOperationToolbar extends React.Component {
     for (let i = 0; i < length; i++) {
       const dirent = this.props.selectedDirentList[i];
       const direntPath = this.getDirentPath(dirent);
-      this.props.onFileTagChanged(dirent, direntPath);
+      this.props.onFilesTagChanged(dirent, direntPath);
     }
   }
 
diff --git a/frontend/src/pages/lib-content-view/lib-content-toolbar.js b/frontend/src/pages/lib-content-view/lib-content-toolbar.js
index cd6cdce627..91f4d657a3 100644
--- a/frontend/src/pages/lib-content-view/lib-content-toolbar.js
+++ b/frontend/src/pages/lib-content-view/lib-content-toolbar.js
@@ -98,7 +98,6 @@ class LibContentToolbar extends React.Component {
                 isRepoOwner={this.props.isRepoOwner}
                 currentRepoInfo={this.props.currentRepoInfo}
                 enableDirPrivateShare={this.props.enableDirPrivateShare}
-                onFileTagChanged={this.props.onFileTagChanged}
                 updateDirent={this.props.updateDirent}
                 onDirentSelected={this.props.onDirentSelected}
                 showDirentDetail={this.props.showDirentDetail}