diff --git a/CHANGES.md b/CHANGES.md
index 10f910bb..4e0c6d9f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,7 @@
 
 ## Version 1.24
 
-- Fix issue [issue 543](https://github.com/tprouvot/Salesforce-Inspector-reloaded/issues/543), [issue 538](https://github.com/tprouvot/Salesforce-Inspector-reloaded/issues/538) and [issue 545](https://github.com/tprouvot/Salesforce-Inspector-reloaded/issues/545)
+- Fix issues [543](https://github.com/tprouvot/Salesforce-Inspector-reloaded/issues/543), [538](https://github.com/tprouvot/Salesforce-Inspector-reloaded/issues/538), [545](https://github.com/tprouvot/Salesforce-Inspector-reloaded/issues/545) & [546](https://github.com/tprouvot/Salesforce-Inspector-reloaded/issues/545)
 - Add new REST Explore page to call Salesforce APIs from the extension
 - Add Global Search in Shortcut tab when no result was found
 - Enable users to configure custom headers on Data Import (AssignmentRuleHeader, DuplicateRuleHeader, OwnerChangeOptions ...) [feature 478](https://github.com/tprouvot/Salesforce-Inspector-reloaded/issues/478)
diff --git a/addon/data-export.html b/addon/data-export.html
index a9fe7ee9..edf3cf33 100644
--- a/addon/data-export.html
+++ b/addon/data-export.html
@@ -5,7 +5,6 @@
   <meta charset="utf-8">
   <title>Data Export</title>
   <link rel="stylesheet" href="button.css">
-  <link rel="stylesheet" href="styles/slds/slds.css">
   <link rel="stylesheet" href="slds-spinner.css">
   <link rel="stylesheet" href="data-load.css">
   <link rel="stylesheet" href="data-export.css">
diff --git a/addon/data-export.js b/addon/data-export.js
index 2cbce59a..851ee9ed 100644
--- a/addon/data-export.js
+++ b/addon/data-export.js
@@ -1394,6 +1394,10 @@ class App extends React.Component {
               ),
               h("button", {onClick: this.onClearHistory, title: "Clear Query History"}, "Clear")
             ),
+            h("div", {className: "pop-menu saveOptions", hidden: !model.expandSavedOptions},
+              h("a", {href: "#", onClick: this.onRemoveFromHistory, title: "Remove query from saved history"}, "Remove Saved Query"),
+              h("a", {href: "#", onClick: this.onClearSavedHistory, title: "Clear saved history"}, "Clear Saved Queries")
+            ),
             h("div", {className: "button-group"},
               h("select", {value: JSON.stringify(model.selectedSavedEntry), onChange: this.onSelectSavedEntry, className: "query-history"},
                 h("option", {value: JSON.stringify(null), disabled: true}, "Saved Queries"),
@@ -1401,32 +1405,7 @@ class App extends React.Component {
               ),
               h("input", {placeholder: "Query Label", type: "save", value: model.queryName, onInput: this.onSetQueryName}),
               h("button", {onClick: this.onAddToHistory, title: "Add query to saved history"}, "Save Query"),
-              h("div", {ref: "buttonQueryMenu", className: "slds-dropdown-trigger slds-dropdown-trigger_click slds-button_last"},
-                h("button", {className: "slds-button slds-button_icon slds-button_icon-border-filled", onMouseEnter: () => this.toggleQueryMoreMenu(), title: "Show more options"},
-                  h("svg", {className: "slds-button__icon"},
-                    h("use", {xlinkHref: "symbols.svg#down"})
-                  ),
-                  h("span", {className: "slds-assistive-text"}, "Show more options")
-                ),
-                h("div", {className: "slds-dropdown slds-dropdown_left", onMouseLeave: () => this.toggleQueryMoreMenu()},
-                  h("ul", {className: "slds-dropdown__list", role: "menu"},
-                    h("li", {className: "slds-dropdown__item", role: "presentation"},
-                      h("a", {onClick: () => console.log("menu item click"), target: "_blank", tabIndex: "0"},
-                        h("span", {className: "slds-truncate"},
-                          h("span", {className: "slds-truncate", onClick: this.onRemoveFromHistory, title: "Remove query from saved history"}, "Remove Saved Query")
-                        )
-                      )
-                    ),
-                    h("li", {className: "slds-dropdown__item", role: "presentation"},
-                      h("a", {onClick: () => console.log("menu item click"), target: "_blank", tabIndex: "0"},
-                        h("span", {className: "slds-truncate"},
-                          h("span", {className: "slds-truncate", onClick: this.onClearSavedHistory, title: "Clear saved history"}, "Clear Saved Queries")
-                        )
-                      )
-                    )
-                  )
-                )
-              ),
+              h("button", {className: model.expandSavedOptions ? "toggle contract" : "toggle expand", title: "Show More Options", onClick: this.onToggleSavedOptions}, h("div", {className: "button-toggle-icon"}))
             ),
           ),
           h("div", {className: "query-options"},