diff --git a/demos/blocklyfactory/app_controller.js b/demos/blocklyfactory/app_controller.js
index 2a6301cbf..31f1a8f39 100644
--- a/demos/blocklyfactory/app_controller.js
+++ b/demos/blocklyfactory/app_controller.js
@@ -398,16 +398,16 @@ AppController.prototype.assignExporterClickHandlers = function() {
         document.getElementById('dropdownDiv_setBlocks').classList.remove("show");
       });
 
-  document.getElementById('dropdown_clearSelected').addEventListener('click',
+  document.getElementById('dropdown_addAllFromLib').addEventListener('click',
       function() {
-        self.exporter.clearSelectedBlocks();
+        self.exporter.selectAllBlocks();
         self.exporter.updatePreview();
         document.getElementById('dropdownDiv_setBlocks').classList.remove("show");
       });
 
-  document.getElementById('dropdown_addAllFromLib').addEventListener('click',
+  document.getElementById('clearSelectedButton').addEventListener('click',
       function() {
-        self.exporter.selectAllBlocks();
+        self.exporter.clearSelectedBlocks();
         self.exporter.updatePreview();
         document.getElementById('dropdownDiv_setBlocks').classList.remove("show");
       });
diff --git a/demos/blocklyfactory/index.html b/demos/blocklyfactory/index.html
index b002b4061..2a0139e2b 100644
--- a/demos/blocklyfactory/index.html
+++ b/demos/blocklyfactory/index.html
@@ -50,8 +50,8 @@
 </h1>
  <div id="tabContainer">
     <div id="blockFactory_tab" class="tab tabon"> Block Factory</div>
-    <div id="workspaceFactory_tab" class="tab taboff"> Workspace Factory</div>
     <div id="blocklibraryExporter_tab" class="tab taboff"> Block Exporter</div>
+    <div id="workspaceFactory_tab" class="tab taboff"> Workspace Factory</div>
   </div>
 
   <!-- Exporter tab -->
@@ -63,13 +63,14 @@
       <br>
       <h3> Block Selector </h3>
       <div class='dropdown'>
-        <button id="button_setBlocks">Select From Library</button>
+        <button id="button_setBlocks">Select</button>
         <div id="dropdownDiv_setBlocks" class="dropdown-content">
-          <a id='dropdown_addAllFromLib' title="Select all block library blocks.">All Stored</a>
-          <a id='dropdown_addAllUsed' title="Select all block library blocks used in workspace factory.">All Used</a>
-          <a id='dropdown_clearSelected' title="Clear selected blocks.">Clear</a>
+          <a id='dropdown_addAllFromLib' title="Select all block library blocks.">All Stored in Block Library</a>
+          <a id='dropdown_addAllUsed' title="Select all block library blocks used in workspace factory.">All Used in Workspace Factory</a>
         </div>
+          <button id='clearSelectedButton' title="Clear selected blocks.">Clear Selected</a>
       </div>
+
       <div id="blockSelector"></div>
     </div>