diff --git a/client/modules/IDE/components/AssetList.jsx b/client/modules/IDE/components/AssetList.jsx
index 025d6e4f..accc0c98 100644
--- a/client/modules/IDE/components/AssetList.jsx
+++ b/client/modules/IDE/components/AssetList.jsx
@@ -44,12 +44,14 @@ class AssetList extends React.Component {
             </thead>
             <tbody>
               {this.props.assets.map(asset =>
-                (<tr className="asset-table__row" key={asset.key}>
-                  <td>{asset.name}</td>
-                  <td>{prettyBytes(asset.size)}</td>
-                  <td><Link to={asset.url} target="_blank">View</Link></td>
-                  <td><Link to={`/${this.props.username}/sketches/${asset.sketchId}`}>{asset.sketchName}</Link></td>
-                </tr>))}
+                (
+                  <tr className="asset-table__row" key={asset.key}>
+                    <td>{asset.name}</td>
+                    <td>{prettyBytes(asset.size)}</td>
+                    <td><Link to={asset.url} target="_blank">View</Link></td>
+                    <td><Link to={`/${this.props.username}/sketches/${asset.sketchId}`}>{asset.sketchName}</Link></td>
+                  </tr>
+                ))}
             </tbody>
           </table>}
       </div>
diff --git a/client/modules/IDE/components/CopyableInput.jsx b/client/modules/IDE/components/CopyableInput.jsx
index 6a3774ce..a510781c 100644
--- a/client/modules/IDE/components/CopyableInput.jsx
+++ b/client/modules/IDE/components/CopyableInput.jsx
@@ -35,21 +35,23 @@ class CopyableInput extends React.Component {
     } = this.props;
     return (
       <div className="copyable-input">
-        <label className="copyable-input__label" htmlFor="copyable-input__value">{label}</label>
         <div
           className="copyable-input__value-container tooltipped-no-delay"
           aria-label="Copied to Clipboard!"
           ref={(element) => { this.tooltip = element; }}
           onMouseLeave={this.onMouseLeaveHandler}
         >
-          <input
-            type="text"
-            className="copyable-input__value"
-            id="copyable-input__value"
-            value={value}
-            ref={(element) => { this.input = element; }}
-            readOnly
-          />
+          <label className="copyable-input__label" htmlFor="copyable-input__value">
+            {label}
+            <input
+              type="text"
+              className="copyable-input__value"
+              id="copyable-input__value"
+              value={value}
+              ref={(element) => { this.input = element; }}
+              readOnly
+            />
+          </label>
         </div>
       </div>
     );
diff --git a/client/styles/components/_copyable-input.scss b/client/styles/components/_copyable-input.scss
index 35b36db7..49103b21 100644
--- a/client/styles/components/_copyable-input.scss
+++ b/client/styles/components/_copyable-input.scss
@@ -13,12 +13,12 @@
 .copyable-input__value {
   width: 100%;
   font-size: #{16 / $base-font-size}rem;
+  margin-top: #{5 / $base-font-size}rem;
 }
 
 .copyable-input__label {
   width: 100%;
   font-size: #{12 / $base-font-size}rem;
-  padding-bottom: #{5 / $base-font-size}rem;
   @include themify() {
     color: getThemifyVariable('inactive-text-color');
   }
@@ -34,20 +34,24 @@
   width: 100%;
 }
 
-.tooltipped::after {
-  @include themify() {
-    background-color: getThemifyVariable('button-background-hover-color');
-    color: getThemifyVariable('button-hover-color');
+.copyable-input {
+  .tooltipped::after {
+    @include themify() {
+      background-color: getThemifyVariable('button-background-hover-color');
+      color: getThemifyVariable('button-hover-color');
+    }
+    font-family: Montserrat, sans-serif;
+    font-size: #{12 / $base-font-size}rem;
+    bottom: #{41 / $base-font-size}rem;
   }
-  font-family: Montserrat, sans-serif;
-  font-size: #{12 / $base-font-size}rem;
-}
 
-.tooltipped-n::before,
-.tooltipped::before,
- {
-  @include themify() {
-    color: getThemifyVariable('button-background-hover-color');
-    border-top-color: getThemifyVariable('button-background-hover-color');
+  .tooltipped-n::before,
+  .tooltipped::before,
+  {
+    @include themify() {
+      color: getThemifyVariable('button-background-hover-color');
+      border-top-color: getThemifyVariable('button-background-hover-color');
+    }
+    top: #{14 / $base-font-size}rem;
   }
 }
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index e7f9dfee..636b77ba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13420,87 +13420,6 @@
         }
       }
     },
-    "csurf": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/csurf/-/csurf-1.9.0.tgz",
-      "integrity": "sha1-SdLGkl/87Ht95VlZfBU/pTM2QTM=",
-      "requires": {
-        "cookie": "0.3.1",
-        "cookie-signature": "1.0.6",
-        "csrf": "~3.0.3",
-        "http-errors": "~1.5.0"
-      },
-      "dependencies": {
-        "cookie": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-          "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
-        },
-        "cookie-signature": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-          "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
-        },
-        "csrf": {
-          "version": "3.0.6",
-          "resolved": "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz",
-          "integrity": "sha1-thEg3c7q/JHnbtUxO7XAsmZ7cQo=",
-          "requires": {
-            "rndm": "1.2.0",
-            "tsscmp": "1.0.5",
-            "uid-safe": "2.1.4"
-          }
-        },
-        "http-errors": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz",
-          "integrity": "sha1-eIwNLB3iyBuebowBhDtrl+uSB1A=",
-          "requires": {
-            "inherits": "2.0.3",
-            "setprototypeof": "1.0.2",
-            "statuses": ">= 1.3.1 < 2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-        },
-        "random-bytes": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
-          "integrity": "sha1-T2ih3Arli9P7lYSMMDJNt11kNgs="
-        },
-        "rndm": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz",
-          "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w="
-        },
-        "setprototypeof": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz",
-          "integrity": "sha1-gaVSFB7BBLiOic44MQOtXGZWTQg="
-        },
-        "statuses": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-          "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
-        },
-        "tsscmp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz",
-          "integrity": "sha1-fcSjOvcVgatDN9qR2FylQn69mpc="
-        },
-        "uid-safe": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz",
-          "integrity": "sha1-Otbzg2jG1MjHXsF2I/t5qh0HHYE=",
-          "requires": {
-            "random-bytes": "~1.0.0"
-          }
-        }
-      }
-    },
     "currently-unhandled": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
@@ -15209,11 +15128,6 @@
         }
       }
     },
-    "file-type": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
-      "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek="
-    },
     "fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -15296,86 +15210,6 @@
         "rimraf": "^2.2.8"
       }
     },
-    "fs-promise": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-promise/-/fs-promise-1.0.0.tgz",
-      "integrity": "sha1-QkakzUVJfS7Vfm5LIhZ9OGSyNnk=",
-      "requires": {
-        "any-promise": "^1.0.0",
-        "fs-extra": "^1.0.0",
-        "mz": "^2.3.1",
-        "thenify-all": "^1.6.0"
-      },
-      "dependencies": {
-        "any-promise": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-          "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8="
-        },
-        "fs-extra": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz",
-          "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^2.1.0",
-            "klaw": "^1.0.0"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
-        },
-        "jsonfile": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        },
-        "klaw": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
-          "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
-          "requires": {
-            "graceful-fs": "^4.1.9"
-          }
-        },
-        "mz": {
-          "version": "2.7.0",
-          "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-          "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-          "requires": {
-            "any-promise": "^1.0.0",
-            "object-assign": "^4.0.1",
-            "thenify-all": "^1.0.0"
-          }
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-        },
-        "thenify": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz",
-          "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=",
-          "requires": {
-            "any-promise": "^1.0.0"
-          }
-        },
-        "thenify-all": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-          "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
-          "requires": {
-            "thenify": ">= 3.1.0 < 4"
-          }
-        }
-      }
-    },
     "fs.realpath": {
       "version": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
@@ -16966,11 +16800,6 @@
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz",
       "integrity": "sha1-MQ23D3QtJZoWo2kgK1GvhCMzENk="
     },
-    "is_js": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/is_js/-/is_js-0.9.0.tgz",
-      "integrity": "sha1-CrlFQFArp6+iTIVqqYVWFmnpxS0="
-    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -25054,7 +24883,8 @@
     "path-parse": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME="
+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
+      "dev": true
     },
     "path-type": {
       "version": "1.1.0",
@@ -26726,428 +26556,6 @@
         "randombytes": "^2.0.1"
       }
     },
-    "pug": {
-      "version": "2.0.0-rc.4",
-      "resolved": "https://registry.npmjs.org/pug/-/pug-2.0.0-rc.4.tgz",
-      "integrity": "sha512-SL7xovj6E2Loq9N0UgV6ynjMLW4urTFY/L/Fprhvz13Xc5vjzkjZjI1QHKq31200+6PSD8PyU6MqrtCTJj6/XA==",
-      "requires": {
-        "pug-code-gen": "^2.0.0",
-        "pug-filters": "^2.1.5",
-        "pug-lexer": "^3.1.0",
-        "pug-linker": "^3.0.3",
-        "pug-load": "^2.0.9",
-        "pug-parser": "^4.0.0",
-        "pug-runtime": "^2.0.3",
-        "pug-strip-comments": "^1.0.2"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo="
-        },
-        "acorn-globals": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz",
-          "integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=",
-          "requires": {
-            "acorn": "^4.0.4"
-          },
-          "dependencies": {
-            "acorn": {
-              "version": "4.0.13",
-              "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-              "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c="
-            }
-          }
-        },
-        "align-text": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-          "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
-          "requires": {
-            "kind-of": "^3.0.2",
-            "longest": "^1.0.1",
-            "repeat-string": "^1.5.2"
-          }
-        },
-        "amdefine": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-          "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
-        },
-        "asap": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-          "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
-        },
-        "camelcase": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
-        },
-        "center-align": {
-          "version": "0.1.3",
-          "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-          "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
-          "requires": {
-            "align-text": "^0.1.3",
-            "lazy-cache": "^1.0.3"
-          }
-        },
-        "character-parser": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz",
-          "integrity": "sha1-x84o821LzZdE5f/CxfzeHHMmH8A=",
-          "requires": {
-            "is-regex": "^1.0.3"
-          }
-        },
-        "clean-css": {
-          "version": "3.4.28",
-          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz",
-          "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=",
-          "requires": {
-            "commander": "2.8.x",
-            "source-map": "0.4.x"
-          }
-        },
-        "cliui": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-          "requires": {
-            "center-align": "^0.1.1",
-            "right-align": "^0.1.1",
-            "wordwrap": "0.0.2"
-          }
-        },
-        "commander": {
-          "version": "2.8.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
-          "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
-          "requires": {
-            "graceful-readlink": ">= 1.0.0"
-          }
-        },
-        "constantinople": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.1.0.tgz",
-          "integrity": "sha1-dWnKqKo/jVk11i4fqW+fcCzYHHk=",
-          "requires": {
-            "acorn": "^3.1.0",
-            "is-expression": "^2.0.1"
-          }
-        },
-        "decamelize": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
-        },
-        "doctypes": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz",
-          "integrity": "sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk="
-        },
-        "function-bind": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-          "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-        },
-        "graceful-readlink": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-          "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
-        },
-        "has": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
-          "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
-          "requires": {
-            "function-bind": "^1.0.2"
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-        },
-        "is-expression": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-2.1.0.tgz",
-          "integrity": "sha1-kb6dR968/vB3l36XIr5tz7RGXvA=",
-          "requires": {
-            "acorn": "~3.3.0",
-            "object-assign": "^4.0.1"
-          }
-        },
-        "is-promise": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-          "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
-        },
-        "is-regex": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-          "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-          "requires": {
-            "has": "^1.0.1"
-          }
-        },
-        "js-stringify": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz",
-          "integrity": "sha1-Fzb939lyTyijaCrcYjCufk6Weds="
-        },
-        "jstransformer": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz",
-          "integrity": "sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=",
-          "requires": {
-            "is-promise": "^2.0.0",
-            "promise": "^7.0.1"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        },
-        "lazy-cache": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-          "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4="
-        },
-        "longest": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-          "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc="
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-        },
-        "promise": {
-          "version": "7.3.1",
-          "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-          "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-          "requires": {
-            "asap": "~2.0.3"
-          }
-        },
-        "pug-attrs": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.2.tgz",
-          "integrity": "sha1-i+KyIlVo/6ddG4Zpgr/59BEa/8s=",
-          "requires": {
-            "constantinople": "^3.0.1",
-            "js-stringify": "^1.0.1",
-            "pug-runtime": "^2.0.3"
-          }
-        },
-        "pug-code-gen": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.0.tgz",
-          "integrity": "sha512-E4oiJT+Jn5tyEIloj8dIJQognbiNNp0i0cAJmYtQTFS0soJ917nlIuFtqVss3IXMEyQKUew3F4gIkBpn18KbVg==",
-          "requires": {
-            "constantinople": "^3.0.1",
-            "doctypes": "^1.1.0",
-            "js-stringify": "^1.0.1",
-            "pug-attrs": "^2.0.2",
-            "pug-error": "^1.3.2",
-            "pug-runtime": "^2.0.3",
-            "void-elements": "^2.0.1",
-            "with": "^5.0.0"
-          }
-        },
-        "pug-error": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-1.3.2.tgz",
-          "integrity": "sha1-U659nSm7A89WRJOgJhCfVMR/XyY="
-        },
-        "pug-filters": {
-          "version": "2.1.5",
-          "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-2.1.5.tgz",
-          "integrity": "sha512-xkw71KtrC4sxleKiq+cUlQzsiLn8pM5+vCgkChW2E6oNOzaqTSIBKIQ5cl4oheuDzvJYCTSYzRaVinMUrV4YLQ==",
-          "requires": {
-            "clean-css": "^3.3.0",
-            "constantinople": "^3.0.1",
-            "jstransformer": "1.0.0",
-            "pug-error": "^1.3.2",
-            "pug-walk": "^1.1.5",
-            "resolve": "^1.1.6",
-            "uglify-js": "^2.6.1"
-          }
-        },
-        "pug-lexer": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-3.1.0.tgz",
-          "integrity": "sha1-/QhzdtSmdbT1n4/vQiiDQ06VgaI=",
-          "requires": {
-            "character-parser": "^2.1.1",
-            "is-expression": "^3.0.0",
-            "pug-error": "^1.3.2"
-          },
-          "dependencies": {
-            "acorn": {
-              "version": "4.0.13",
-              "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-              "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c="
-            },
-            "is-expression": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz",
-              "integrity": "sha1-Oayqa+f9HzRx3ELHQW5hwkMXrJ8=",
-              "requires": {
-                "acorn": "~4.0.2",
-                "object-assign": "^4.0.1"
-              }
-            }
-          }
-        },
-        "pug-linker": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.3.tgz",
-          "integrity": "sha512-DCKczglCXOzJ1lr4xUj/lVHYvS+lGmR2+KTCjZjtIpdwaN7lNOoX2SW6KFX5X4ElvW+6ThwB+acSUg08UJFN5A==",
-          "requires": {
-            "pug-error": "^1.3.2",
-            "pug-walk": "^1.1.5"
-          }
-        },
-        "pug-load": {
-          "version": "2.0.9",
-          "resolved": "https://registry.npmjs.org/pug-load/-/pug-load-2.0.9.tgz",
-          "integrity": "sha512-BDdZOCru4mg+1MiZwRQZh25+NTRo/R6/qArrdWIf308rHtWA5N9kpoUskRe4H6FslaQujC+DigH9LqlBA4gf6Q==",
-          "requires": {
-            "object-assign": "^4.1.0",
-            "pug-walk": "^1.1.5"
-          }
-        },
-        "pug-parser": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-4.0.0.tgz",
-          "integrity": "sha512-ocEUFPdLG9awwFj0sqi1uiZLNvfoodCMULZzkRqILryIWc/UUlDlxqrKhKjAIIGPX/1SNsvxy63+ayEGocGhQg==",
-          "requires": {
-            "pug-error": "^1.3.2",
-            "token-stream": "0.0.1"
-          }
-        },
-        "pug-runtime": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.3.tgz",
-          "integrity": "sha1-mBYmB7D86eJU1CfzOYelrucWi9o="
-        },
-        "pug-strip-comments": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.2.tgz",
-          "integrity": "sha1-0xOvoBvMN0mA4TmeI+vy65vchRM=",
-          "requires": {
-            "pug-error": "^1.3.2"
-          }
-        },
-        "pug-walk": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.5.tgz",
-          "integrity": "sha512-rJlH1lXerCIAtImXBze3dtKq/ykZMA4rpO9FnPcIgsWcxZLOvd8zltaoeOVFyBSSqCkhhJWbEbTMga8UxWUUSA=="
-        },
-        "repeat-string": {
-          "version": "1.6.1",
-          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-          "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
-        },
-        "resolve": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
-          "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
-          "requires": {
-            "path-parse": "^1.0.5"
-          }
-        },
-        "right-align": {
-          "version": "0.1.3",
-          "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-          "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
-          "requires": {
-            "align-text": "^0.1.1"
-          }
-        },
-        "source-map": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        },
-        "token-stream": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/token-stream/-/token-stream-0.0.1.tgz",
-          "integrity": "sha1-zu78cXp2xDFvEm0LnbqlXX598Bo="
-        },
-        "uglify-js": {
-          "version": "2.8.29",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
-          "requires": {
-            "source-map": "~0.5.1",
-            "uglify-to-browserify": "~1.0.0",
-            "yargs": "~3.10.0"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-            }
-          }
-        },
-        "uglify-to-browserify": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-          "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-          "optional": true
-        },
-        "void-elements": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-          "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w="
-        },
-        "window-size": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-          "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0="
-        },
-        "with": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/with/-/with-5.1.1.tgz",
-          "integrity": "sha1-+k2qktrzLE6pTtRTyB8EaGtXXf4=",
-          "requires": {
-            "acorn": "^3.1.0",
-            "acorn-globals": "^3.0.0"
-          }
-        },
-        "wordwrap": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
-        },
-        "yargs": {
-          "version": "3.10.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-          "requires": {
-            "camelcase": "^1.0.2",
-            "cliui": "^2.1.0",
-            "decamelize": "^1.0.0",
-            "window-size": "0.1.0"
-          }
-        }
-      }
-    },
     "punycode": {
       "version": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
       "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
@@ -30186,9 +29594,9 @@
       }
     },
     "url-join": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.0.tgz",
-      "integrity": "sha1-TTNA6AfTdzvamZH4MFrNzCpmXSo="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/url-join/-/url-join-2.0.5.tgz",
+      "integrity": "sha1-WvIvGMBSoACkjXuCxenC4v7tpyg="
     },
     "urllite": {
       "version": "0.5.0",
@@ -30367,16 +29775,16 @@
       }
     },
     "webpack-dev-middleware": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.1.3.tgz",
-      "integrity": "sha512-I6Mmy/QjWU/kXwCSFGaiOoL5YEQIVmbb0o45xMoCyQAg/mClqZVTcsX327sPfekDyJWpCxb+04whNyLOIxpJdQ==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-2.0.6.tgz",
+      "integrity": "sha512-tj5LLD9r4tDuRIDa5Mu9lnY2qBBehAITv6A9irqXhw/HQquZgTx3BCd57zYbU2gMDnncA49ufK2qVQSbaKJwOw==",
       "requires": {
         "loud-rejection": "^1.6.0",
         "memory-fs": "~0.4.1",
         "mime": "^2.1.0",
         "path-is-absolute": "^1.0.0",
         "range-parser": "^1.0.3",
-        "url-join": "^4.0.0",
+        "url-join": "^2.0.2",
         "webpack-log": "^1.0.1"
       }
     },
diff --git a/package.json b/package.json
index 1c7bb025..93265cf8 100644
--- a/package.json
+++ b/package.json
@@ -130,7 +130,7 @@
     "srcdoc-polyfill": "^0.2.0",
     "url": "^0.11.0",
     "webpack": "^3.1.0",
-    "webpack-dev-middleware": "^3.1.3",
+    "webpack-dev-middleware": "^2.0.6",
     "webpack-hot-middleware": "^2.10.0",
     "xhr": "^2.2.1"
   }
diff --git a/webpack.config.dev.js b/webpack.config.dev.js
index 1ca4f44b..db6b900b 100644
--- a/webpack.config.dev.js
+++ b/webpack.config.dev.js
@@ -61,6 +61,13 @@ module.exports = {
         }, {
           loader: 'eslint-loader'
         }]
+        // use: {
+        //   loader: 'babel-loader',
+        //   options: {
+        //     cacheDirectory: true,
+        //     plugins: ['react-hot-loader/babel'],
+        //   }
+        // }
       },
       {
         test: /\.scss$/,