diff --git a/demos/blockfactory/index.html b/demos/blockfactory/index.html
index ec3d92430..27fdef157 100644
--- a/demos/blockfactory/index.html
+++ b/demos/blockfactory/index.html
@@ -85,37 +85,36 @@
           <p>Currently Selected:</p>
           <p id="selectedBlocksText"></p>
         </div>
-        <input type="checkbox" id="blockDefCheck">Block Definition(s)<br>
+        <label><input type="checkbox" id="blockDefCheck">Block Definition(s)</label><br>
         <div id="blockDefSettings" class="subsettings">
-          Format:
+          <label>Format:
           <select id="exportFormat">
             <option value="JSON">JSON</option>
             <option value="JavaScript">JavaScript</option>
-          </select>
+          </select></label>
           <br>
-          File Name:
-          <br>
-          <input type="text" id="blockDef_filename">
+          <label>File Name:<br>
+          <input type="text" id="blockDef_filename"></label>
         </div>
         <br>
-        <input type="checkbox" id="genStubCheck">Generator Stub(s)<br>
+
+        <label><input type="checkbox" id="genStubCheck">Generator Stub(s)</label><br>
         <div id="genStubSettings" class="subsettings">
-          Language:
+          <label>Language:
           <select id="exportLanguage">
             <option value="JavaScript">JavaScript</option>
             <option value="Python">Python</option>
             <option value="PHP">PHP</option>
             <option value="Lua">Lua</option>
             <option value="Dart">Dart</option>
-          </select>
+          </select></label>
           <br>
-          File Name:
-          <br>
-          <input type="text" id="generatorStub_filename"><br>
+          <label>File Name:<br>
+          <input type="text" id="generatorStub_filename"></label><br>
         </div>
         <br>
       </form>
-      <button id="exporterSubmitButton" title="Download block starter code as specified in export settings."> Export </button>
+      <button id="exporterSubmitButton" title="Download block starter code as specified in export settings.">Export</button>
     </div>
     <div id="exportPreview">
       <br>
@@ -210,14 +209,14 @@
           <button id="button_editCategory">Edit Category</button>
           <div id="dropdownDiv_editCategory" class="dropdown-content">
             <a id='dropdown_name'>Name</a>
-            <a id='dropdown_color'>Color</a>
+            <a id='dropdown_color'>Colour</a>
           </div>
         </div>
 
       </aside>
 
-      <button id="button_addShadow" style="display:none">Make Shadow</button>
-      <button id="button_removeShadow" style="display:none">Remove Shadow</button>
+      <button id="button_addShadow" style="display: none">Make Shadow</button>
+      <button id="button_removeShadow" style="display: none">Remove Shadow</button>
 
       <aside id="preload_div" style="display:none">
         <div id="preloadHelp">
@@ -226,37 +225,37 @@
           <button class="small" id="button_standardOptions">Reset to Default</button>
         </div>
         <div id="workspace_options">
-          <input type="checkbox" id="option_readOnly_checkbox" class="optionsInput">Read Only<br>
-          <input type="checkbox" id="option_collapse_checkbox" class="optionsInput">Collapsible Blocks<br>
-          <input type="checkbox" id="option_comments_checkbox" class="optionsInput">Comments for Blocks<br>
-          <input type="checkbox" id="option_css_checkbox" class="optionsInput">Use Blockly CSS<br>
-          <input type="checkbox" id="option_disable_checkbox" class="optionsInput">Disabled Blocks<br>
-          <input type="checkbox" id="option_grid_checkbox" class="optionsInput">Use Grid<br>
-          <div id="grid_options" name="grid" style="display:none">
-            Spacing <input type="number" id="gridOption_spacing_number" class="optionsInput" value="0"><br>
-            Length <input type="number" id="gridOption_length_number" class="optionsInput" value="1"><br>
-            Color <input type="text" id="gridOption_colour_text" class="optionsInput" value="#888"><br>
-            <input type="checkbox" id="gridOption_snap_checkbox" class="optionsInput" value="grid_snap_checkbox">Snap<br>
+          <label><input type="checkbox" id="option_readOnly_checkbox" class="optionsInput">Read Only</label><br>
+          <label><input type="checkbox" id="option_collapse_checkbox" class="optionsInput">Collapsible Blocks</label><br>
+          <label><input type="checkbox" id="option_comments_checkbox" class="optionsInput">Comments for Blocks</label><br>
+          <label><input type="checkbox" id="option_css_checkbox" class="optionsInput">Use Blockly CSS</label><br>
+          <label><input type="checkbox" id="option_disable_checkbox" class="optionsInput">Disabled Blocks</label><br>
+          <label><input type="checkbox" id="option_grid_checkbox" class="optionsInput">Use Grid</label><br>
+          <div id="grid_options" name="grid" style="display: none">
+            <label>Spacing <input type="number" id="gridOption_spacing_number" class="optionsInput" value="0"></label><br>
+            <label>Length <input type="number" id="gridOption_length_number" class="optionsInput" value="1"></label><br>
+            <label>Colour <input type="text" id="gridOption_colour_text" class="optionsInput" value="#888"></label><br>
+            <label><input type="checkbox" id="gridOption_snap_checkbox" class="optionsInput" value="grid_snap_checkbox">Snap</label><br>
           </div>
-          <input type="checkbox" id="option_infiniteBlocks_checkbox" class="optionsInput" value="checked">Infinite Blocks<br>
-          <div id="maxBlockNumber_option" style="display:none">
-            Max Blocks <input type="number" id="option_maxBlocks_number" class="optionsInput" value=100><br>
+          <label><input type="checkbox" id="option_infiniteBlocks_checkbox" class="optionsInput" value="checked">Infinite Blocks</label><br>
+          <div id="maxBlockNumber_option" style="display: none">
+            <label>Max Blocks <input type="number" id="option_maxBlocks_number" class="optionsInput" value=100></label><br>
           </div>
-          Path to Blockly Media <input type="text" id="option_media_text" class="optionsInput"><br>
-          <input type="checkbox" id="option_rtl_checkbox" class="optionsInput">Layout with RTL<br>
-          <input type="checkbox" id="option_scrollbars_checkbox" class="optionsInput">Scrollbars<br>
-          <input type="checkbox" id="option_sounds_checkbox" class="optionsInput">Sounds<br>
+          <label>Path to Blockly Media <input type="text" id="option_media_text" class="optionsInput"></label><br>
+          <label><input type="checkbox" id="option_rtl_checkbox" class="optionsInput">Layout with RTL</label><br>
+          <label><input type="checkbox" id="option_scrollbars_checkbox" class="optionsInput">Scrollbars</label><br>
+          <label><input type="checkbox" id="option_sounds_checkbox" class="optionsInput">Sounds<br>
           <div id="trashcan_option">
-            <input type="checkbox" id="option_trashcan_checkbox" class="optionsInput">Trashcan<br>
+            <label><input type="checkbox" id="option_trashcan_checkbox" class="optionsInput">Trashcan</label><br>
           </div>
-          <input type="checkbox" id="option_zoom_checkbox" class="optionsInput">Zoom<br>
-          <div id="zoom_options" name="zoom" style="display:none">
-            <input type="checkbox" id="zoomOption_controls_checkbox" class="optionsInput">Zoom Controls<br>
-            <input type="checkbox" id="zoomOption_wheel_checkbox" class="optionsInput">Zoom Wheel<br>
-            Start Scale <input type="number" id="zoomOption_startScale_number" class="optionsInput" name="startScale" value="1.0"><br>
-            Max Scale <input type="number" id="zoomOption_maxScale_number" class="optionsInput" value="3"><br>
-            Min Scale <input type="number" id="zoomOption_minScale_number" class="optionsInput" value="0.3"><br>
-            Scale Speed <input type="number" id="zoomOption_scaleSpeed_number" class="optionsInput" value="1.2"><br>
+          <label><input type="checkbox" id="option_zoom_checkbox" class="optionsInput">Zoom</label><br>
+          <div id="zoom_options" name="zoom" style="display: none">
+            <label><input type="checkbox" id="zoomOption_controls_checkbox" class="optionsInput">Zoom Controls</label><br>
+            <label><input type="checkbox" id="zoomOption_wheel_checkbox" class="optionsInput">Zoom Wheel</label><br>
+            <label>Start Scale <input type="number" id="zoomOption_startScale_number" class="optionsInput" name="startScale" value="1.0"></label><br>
+            <label>Max Scale <input type="number" id="zoomOption_maxScale_number" class="optionsInput" value="3"></label><br>
+            <label>Min Scale <input type="number" id="zoomOption_minScale_number" class="optionsInput" value="0.3"></label><br>
+            <label>Scale Speed <input type="number" id="zoomOption_scaleSpeed_number" class="optionsInput" value="1.2"></label><br>
           </div>
         </div>
       </aside>
diff --git a/demos/blockfactory/workspacefactory/wfactory_init.js b/demos/blockfactory/workspacefactory/wfactory_init.js
index 465265cf2..46e5e6f81 100644
--- a/demos/blockfactory/workspacefactory/wfactory_init.js
+++ b/demos/blockfactory/workspacefactory/wfactory_init.js
@@ -288,7 +288,7 @@ WorkspaceFactoryInit.assignWorkspaceFactoryClickHandlers_ =
   // Help button on workspace tab.
   document.getElementById('button_optionsHelp').addEventListener
       ('click', function() {
-        open('https://developers.google.com/blockly/guides/get-started/web');
+        open('https://developers.google.com/blockly/guides/get-started/web#configuration');
       });
 
   // Reset to Default button on workspace tab.