diff --git a/package.json b/package.json
index dbc3e6b3..04972786 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
     "cross-env": "^6.0.3",
     "dotenv": "^8.1.0",
     "file-saver": "^2.0.2",
+    "interweave": "^11.2.0",
     "little-loader": "^0.2.0",
     "lodash": "^4.17.15",
     "next": "^9.0.7",
@@ -57,6 +58,7 @@
     "react-inlinesvg": "^1.1.7",
     "react-to-print": "2.4.0",
     "reactstrap": "^8.0.1",
+    "urijs": "^1.19.1",
     "web-streams-polyfill": "^2.0.4",
     "webpack": "^4.41.0",
     "worker-loader": "^2.0.0"
diff --git a/reader/components/header/Header.jsx b/reader/components/header/Header.jsx
index 551ef037..411fc7cc 100644
--- a/reader/components/header/Header.jsx
+++ b/reader/components/header/Header.jsx
@@ -13,10 +13,12 @@ const Header = () => {
       pdfMetadata,
       isThumbnailViewVisible,
       isOutlineViewVisible,
+      isEnhancementViewVisible,
       printContainerRef,
     },
     toggleIsThumbnailViewVisible,
     toggleIsOutlineViewVisible,
+    toggleIsEnhancementViewVisible,
   } = useContext(GlobalContext)
 
   return (
@@ -36,6 +38,13 @@ const Header = () => {
         >
           <Icon iconType="thumbnails" />
         </Button>
+        <Button
+          color="none"
+          active={isEnhancementViewVisible}
+          onClick={toggleIsEnhancementViewVisible}
+        >
+          <Icon iconType="paper_info" isActive={isEnhancementViewVisible} />
+        </Button>
       </div>
       <div className="item d-flex justify-content-center">
         <Button
diff --git a/reader/components/icons/Icon.jsx b/reader/components/icons/Icon.jsx
index 87a7f51f..1a16ce8d 100644
--- a/reader/components/icons/Icon.jsx
+++ b/reader/components/icons/Icon.jsx
@@ -13,6 +13,10 @@ import RightArrowIcon from './assets/right-arrow.svg'
 import RotateIcon from './assets/rotate.svg'
 import ZoomInIcon from './assets/zoom-in.svg'
 import ZoomOutIcon from './assets/zoom-out.svg'
+import CopyIcon from './assets/copy.svg'
+import WikiIcon from './assets/wiki.svg'
+import CreateNewAnnotationIcon from './assets/create-new-annotation.svg'
+import SearchIcon from './assets/search.svg'
 
 const mapNameToModule = name => {
   const iconMap = {
@@ -28,6 +32,10 @@ const mapNameToModule = name => {
     'zoom-in': ZoomInIcon,
     'zoom-out': ZoomOutIcon,
     rotate: RotateIcon,
+    copy: CopyIcon,
+    wiki: WikiIcon,
+    'create-new-annotation': CreateNewAnnotationIcon,
+    search: SearchIcon,
   }
 
   if (!(name in iconMap)) throw new Error(`Icon ${name} not found`)
diff --git a/reader/components/icons/assets/copy.svg b/reader/components/icons/assets/copy.svg
new file mode 100644
index 00000000..cddba05b
--- /dev/null
+++ b/reader/components/icons/assets/copy.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 22 24" xmlns="http://www.w3.org/2000/svg"><path d="M15.5 21v1.875c0 .621-.504 1.125-1.125 1.125H1.625A1.125 1.125 0 01.5 22.875V5.625c0-.621.504-1.125 1.125-1.125H5v13.875A2.628 2.628 0 007.625 21H15.5zm0-16.125V0H7.625C7.004 0 6.5.504 6.5 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V6h-4.875A1.128 1.128 0 0115.5 4.875zm5.67-1.454L18.08.329A1.125 1.125 0 0017.284 0H17v4.5h4.5v-.284c0-.298-.119-.585-.33-.795z"/></svg>
diff --git a/reader/components/icons/assets/create-new-annotation.svg b/reader/components/icons/assets/create-new-annotation.svg
new file mode 100644
index 00000000..74462225
--- /dev/null
+++ b/reader/components/icons/assets/create-new-annotation.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M1 0a1 1 0 00-1 1v14a1 1 0 001 1h10v-4a1 1 0 011-1h4V1a1 1 0 00-1-1H1z"/><path d="M16 12l-4 4v-3a1 1 0 011-1h3zM7 4h2v8H7z"/><path d="M12 7v2H4V7z"/></svg>
diff --git a/reader/components/icons/assets/search.svg b/reader/components/icons/assets/search.svg
new file mode 100644
index 00000000..15ec8377
--- /dev/null
+++ b/reader/components/icons/assets/search.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M23.67 20.75l-4.673-4.673a1.124 1.124 0 00-.797-.329h-.764a9.702 9.702 0 002.062-5.999A9.748 9.748 0 009.75 0 9.748 9.748 0 000 9.75a9.748 9.748 0 009.75 9.748 9.702 9.702 0 005.998-2.062v.764c0 .3.118.586.329.797l4.672 4.673c.441.44 1.154.44 1.59 0l1.326-1.327c.44-.44.44-1.153.005-1.593zM9.749 15.748c-3.314 0-6-2.68-6-5.999 0-3.314 2.682-6 6-6 3.314 0 6 2.682 6 6 0 3.314-2.681 6-6 6z"/></svg>
diff --git a/reader/components/icons/assets/wiki.svg b/reader/components/icons/assets/wiki.svg
new file mode 100644
index 00000000..6aaeff82
--- /dev/null
+++ b/reader/components/icons/assets/wiki.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 16" xmlns="http://www.w3.org/2000/svg"><path d="M24 .064l-.011.457c-1.054.03-1.688.593-2.092 1.511-.938 2.167-3.874 8.999-5.823 13.446h-.51l-3.071-7.24c-1.219 2.384-2.56 4.874-3.72 7.24-.01.01-.562 0-.562-.012-1.758-4.113-3.603-8.196-5.365-12.32C2.418 2.145.994.52.01.532.011.416 0 .157 0 0h6.07v.521c-.72.041-1.98.499-1.623 1.282.82 1.864 3.884 9.01 4.71 10.821.561-1.113 2.166-4.094 2.822-5.354-.52-1.061-2.197-5.02-2.73-5.999C8.887.604 7.897.544 7.159.532v-.52l5.343.01v.492c-.728.022-1.429.292-1.103.978.709 1.5 1.148 2.554 1.804 3.926.21-.405 1.3-2.602 1.803-3.78C15.34.866 14.86.566 13.558.536c.011-.135 0-.386.011-.51 1.665-.011 4.166-.011 4.616-.022v.51c-.844.03-1.718.48-2.179 1.188l-2.22 4.605c.24.603 2.374 5.354 2.595 5.875l4.59-10.596C20.648.72 19.606.532 19.2.525V.004l4.791.041.008.019z"/></svg>
diff --git a/reader/components/pdf-highlighter/PDFHighlighter.jsx b/reader/components/pdf-highlighter/PDFHighlighter.jsx
index 2492d4dc..6b7381f3 100644
--- a/reader/components/pdf-highlighter/PDFHighlighter.jsx
+++ b/reader/components/pdf-highlighter/PDFHighlighter.jsx
@@ -1,6 +1,5 @@
 import React, { cloneElement } from 'react'
 import ReactDom from 'react-dom'
-import throttle from '../../utils/throttle'
 import { getPageFromRange } from './utils/utils'
 import { groupRectsByPage } from './utils/rects'
 import withAppContext from '../../store/withAppContext'
@@ -17,34 +16,20 @@ class PDFHighlighter extends React.Component {
     position: {
       left: null,
       top: null,
+      height: null,
     },
     annotationId: null,
     selectedText: '',
   }
 
-  componentDidMount() {
-    document.addEventListener('selectionchange', this.onSelectionChange)
-    document.addEventListener('mouseup', this.onAfterSelection.bind(this))
+  onUpdateContextMenu = partialUpdate => {
+    this.setState(state => ({
+      ...state,
+      ...partialUpdate,
+    }))
   }
 
-  componentWillUnmount() {
-    document.removeEventListener('mouseup', this.onAfterSelection)
-  }
-
-  onSelectionChange = () => {
-    const selection = window.getSelection()
-
-    // no text was selected
-    // https://developer.mozilla.org/en-US/docs/Web/API/Selection/isCollapsed
-    if (selection.isCollapsed) {
-      this.setState({
-        isVisible: false,
-      })
-    }
-  }
-
-  @throttle(250)
-  onAfterSelection() {
+  handleOnMouseUp() {
     const {
       state: {
         pdfDocument: { pdfViewer },
@@ -97,28 +82,6 @@ class PDFHighlighter extends React.Component {
     })
   }
 
-  onUpdateContextMenu = ({
-    isVisible,
-    left,
-    top,
-    annotationId,
-    contextRoot,
-    width,
-    height,
-  }) => {
-    const pdfRect = contextRoot.getBoundingClientRect()
-    this.setState({
-      isVisible,
-      position: {
-        left: `${((left + width / 2) * 100) / pdfRect.width}%`,
-        top: `${(top * 100) / pdfRect.height}%`,
-        height: `${height}px`,
-      },
-      annotationId,
-      contextRoot,
-    })
-  }
-
   render() {
     const {
       contextRoot,
@@ -131,12 +94,14 @@ class PDFHighlighter extends React.Component {
 
     const children = cloneElement(this.props.children, {
       ...this.props,
+      handleOnMouseUp: this.handleOnMouseUp.bind(this),
     })
 
     const contextMenu =
       contextRoot &&
       ReactDom.createPortal(
         <ContextMenu
+          key={selectedText}
           isVisible={isVisible}
           left={left}
           top={top}
@@ -144,6 +109,7 @@ class PDFHighlighter extends React.Component {
           height={height}
           selectedText={selectedText}
           annotationId={annotationId}
+          updateContextMenu={this.onUpdateContextMenu}
         />,
         contextRoot
       )
@@ -151,7 +117,10 @@ class PDFHighlighter extends React.Component {
     return (
       <>
         {contextRoot && contextMenu}
-        <Highlights updateContextMenu={this.onUpdateContextMenu} />
+        <Highlights
+          updateContextMenu={this.onUpdateContextMenu}
+          currentAnnotationId={annotationId}
+        />
         {children}
       </>
     )
diff --git a/reader/components/pdf-highlighter/PDFHighlighter.scss b/reader/components/pdf-highlighter/PDFHighlighter.scss
index 53ba3f40..e71fe6ee 100644
--- a/reader/components/pdf-highlighter/PDFHighlighter.scss
+++ b/reader/components/pdf-highlighter/PDFHighlighter.scss
@@ -1,3 +1,5 @@
+@import "../bootstrap/core";
+
 $HIGHLIGHT_COLORS: (
   red: #e57373,
   yellow: #fff176,
@@ -21,23 +23,44 @@ $HIGHLIGHT_COLORS: (
   right: 0;
   bottom: 0;
 
+  .context-menu-icon {
+    width: 2rem;
+    height: 2rem;
+    padding: 0.1rem;
+    color: $gray-700;
+
+    &:hover,
+    &:focus {
+      color: $primary;
+    }
+
+    // remove Bootstrap's shadow
+     &.active,
+     &.active:focus {
+       box-shadow: none !important;
+     }
+  }
+
   .highlight-popup-animated {
     animation: tooltip 300ms ease-out forwards;
   }
 
   .highlight-popup {
-    width: 150px;
+    min-width: 150px;
+    max-width: 400px;
     background: #fafafa;
     padding: 10px;
     box-shadow: 0 0 13px -1px rgba(0,0,0,0.75);
     border-radius: 10px;
     z-index: 150;
 
+    .wiki-suggestions > a {
+      display: block;
+      height: auto;
 
-
-    > div > button {
-      max-height: 27px;
-      max-width: 27px;
+      .searchmatch {
+        font-weight: 600;
+      }
     }
 
     .dot {
@@ -57,8 +80,9 @@ $HIGHLIGHT_COLORS: (
 }
 
 .highlights-layer {
-  > section {
+  > button {
     position: absolute;
+    border-radius: 0;
   }
 
   .highlight {
diff --git a/reader/components/pdf-highlighter/components/ContextMenu.jsx b/reader/components/pdf-highlighter/components/ContextMenu.jsx
index 8c926287..45067e06 100644
--- a/reader/components/pdf-highlighter/components/ContextMenu.jsx
+++ b/reader/components/pdf-highlighter/components/ContextMenu.jsx
@@ -1,12 +1,35 @@
 import React from 'react'
-import { isEmpty, noop, debounce } from 'lodash'
-import withAppContext from '../../../store/withAppContext'
+import { Tooltip, Input, Button } from 'reactstrap'
+import { isEmpty, noop } from 'lodash'
+import withAppContext from 'store/withAppContext'
+import { Markup } from 'interweave'
+import Icon from '../../icons/Icon'
+import getWikipediaSuggestions from '../utils/wiki-suggestions'
 
 const HIGHLIGHTS_COLORS = ['red', 'yellow', 'green', 'blue']
 
 class ContextMenu extends React.PureComponent {
   state = {
-    isInnerVisible: true,
+    isAddNewAnnotationVisible: false,
+    isCopyToClipboardVisible: false,
+    isSearchVisible: false,
+    isWikipediaSearchVisible: false,
+    isShowCopied: false,
+    wikipediaSuggestions: null,
+    showWikipediaSuggestions: false,
+    showNewAnnotationInput: false,
+  }
+
+  copyClipBoardInputRef = null
+
+  async componentDidUpdate(prevProps, prevState) {
+    if (
+      prevState.showWikipediaSuggestions === false &&
+      this.state.showWikipediaSuggestions
+    ) {
+      if (this.state.wikipediaSuggestions === null)
+        await this.loadWikipediaSuggestions()
+    }
   }
 
   setAnnotationAndToggleSidebar(color) {
@@ -15,7 +38,7 @@ class ContextMenu extends React.PureComponent {
       setAnnotation,
       toggleIsEnhancementViewVisible,
     } = this.props.context
-    const { rects, selectedText, annotationId } = this.props
+    const { rects, selectedText, annotationId, updateContextMenu } = this.props
     let toggleSidebar = noop
     if (!isEnhancementViewVisible && isEmpty(annotations))
       toggleSidebar = toggleIsEnhancementViewVisible
@@ -24,6 +47,9 @@ class ContextMenu extends React.PureComponent {
       setAnnotation(annotationId, {
         color,
       })
+      updateContextMenu({
+        isVisible: true,
+      })
     } else {
       const annotationIndex = Object.keys(annotations).length + 1
       setAnnotation(annotationIndex, {
@@ -32,19 +58,56 @@ class ContextMenu extends React.PureComponent {
         selectedText,
       })
       window.getSelection().removeAllRanges()
+      updateContextMenu({
+        annotationId: annotationIndex,
+      })
     }
 
     toggleSidebar()
   }
 
-  determineVisibility = () => {
-    const { annotationId, isVisible } = this.props
-    const { isInnerVisible } = this.state
+  loadWikipediaSuggestions = async () => {
+    const wikipediaSuggestions = await getWikipediaSuggestions(
+      this.props.selectedText
+    )
+
+    this.setState({
+      wikipediaSuggestions,
+    })
+  }
+
+  copyToClipBoard = () => {
+    // Source: https://www.w3schools.com/howto/howto_js_copy_clipboard.asp
+    if (this.copyClipBoardInputRef === null) return
+
+    // Select the text field
+    this.copyClipBoardInputRef.select()
 
-    if (annotationId === null) return isVisible
-    if (isInnerVisible) return true
+    // For mobile devices
+    this.copyClipBoardInputRef.setSelectionRange(0, 99999)
 
-    return isVisible
+    // Copy the text inside the text field
+    document.execCommand('copy')
+
+    this.setState({
+      isShowCopied: true,
+      isCopyToClipboardVisible: false,
+    })
+    setTimeout(() => this.setState({ isShowCopied: false }), 1000)
+  }
+
+  toggle = ({
+    isAddNewAnnotationVisible = false,
+    isCopyToClipboardVisible = false,
+    isSearchVisible = false,
+    isWikipediaSearchVisible = false,
+  }) => {
+    this.setState({
+      isAddNewAnnotationVisible,
+      isCopyToClipboardVisible,
+      isSearchVisible,
+      isWikipediaSearchVisible,
+    })
   }
 
   render() {
@@ -54,45 +117,218 @@ class ContextMenu extends React.PureComponent {
         pdfDocument: { pdfViewer },
       },
     } = this.props.context
-    const { left, top, height } = this.props
+    const { left, top, selectedText, isVisible, annotationId } = this.props
+    const {
+      isAddNewAnnotationVisible,
+      isCopyToClipboardVisible,
+      isSearchVisible,
+      isWikipediaSearchVisible,
+      showWikipediaSuggestions,
+      wikipediaSuggestions,
+      showNewAnnotationInput,
+    } = this.state
 
     // TODO: Currently annotations are available only if page is not rotated
-    const isMenuVisible =
-      pdfViewer.pagesRotation === 0 && this.determineVisibility()
+    const isMenuVisible = pdfViewer.pagesRotation === 0 && isVisible
 
     return (
       <div
-        className={`${isMenuVisible ? 'highlight-popup-animated' : ''}`}
+        role="dialog"
         style={{
-          paddingBottom: height,
-          visibility: isMenuVisible ? 'visible' : 'hidden',
-          position: 'relative',
-          left,
-          top: `calc(${top} + ${height})`,
-          zIndex: 500,
-          display: 'inline-block',
-        }}
-        onMouseEnter={() => {
-          if (!this.state.isInnerVisible)
-            this.setState({ isInnerVisible: true })
+          display: 'inline',
         }}
-        onMouseLeave={debounce(() => {
-          if (this.state.isInnerVisible)
-            this.setState({ isInnerVisible: false })
-        }, 100)}
       >
-        <div className="highlight-popup">
-          <div className="d-flex justify-content-between">
-            {HIGHLIGHTS_COLORS.map(color => (
-              <button
-                key={color}
-                className="btn p-0"
+        <div
+          role="presentation"
+          className={`${isMenuVisible ? 'highlight-popup-animated' : ''}`}
+          style={{
+            visibility: isMenuVisible ? 'visible' : 'hidden',
+            position: 'relative',
+            left,
+            top,
+            zIndex: 500,
+            display: 'inline-block',
+          }}
+          onMouseDown={e => {
+            // if annotation is new we want to keep selection
+            if (annotationId === null) e.preventDefault()
+          }}
+          onMouseUp={e => {
+            // don't want to hide context menu
+            // when mouse up was performed inside it
+            e.stopPropagation()
+          }}
+        >
+          <div className="highlight-popup">
+            <input
+              ref={ref => {
+                this.copyClipBoardInputRef = ref
+              }}
+              type="text"
+              className="d-none"
+              value={`${selectedText}`}
+              onChange={noop}
+            />
+            <>
+              {showNewAnnotationInput && (
+                <div className="d-flex flex-column mb-1 create-new-annotation-input">
+                  <Input
+                    innerRef={ref => {
+                      this.annotationRef = ref
+                    }}
+                    type="textarea"
+                    name="text"
+                    id="exampleText"
+                  />
+                </div>
+              )}
+              {showWikipediaSuggestions && wikipediaSuggestions !== null && (
+                <>
+                  <div className="d-flex flex-column mb-1 wiki-suggestions">
+                    {wikipediaSuggestions.slice(0, 3).map(w => (
+                      <a
+                        href={w[0]}
+                        className="mb-1"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                        <h6 className="m-0">
+                          <Markup content={w[1]} />
+                        </h6>
+                        <div>
+                          <Markup content={`... ${w[2]}`} />
+                        </div>
+                      </a>
+                    ))}
+                  </div>
+                  <hr className="m-1" />
+                </>
+              )}
+            </>
+            <div className="d-flex justify-content-between menu-actions mb-1">
+              <Button
+                id="add-new-annotation"
+                className="context-menu-icon"
                 type="button"
-                onClick={() => this.setAnnotationAndToggleSidebar(color)}
+                onClick={() => {
+                  this.setAnnotationAndToggleSidebar('red')
+                  this.setState(s => ({
+                    showNewAnnotationInput: !s.showNewAnnotationInput,
+                  }))
+                }}
+                color="none"
+              >
+                <Tooltip
+                  placement="top"
+                  isOpen={this.state.isAddNewAnnotationVisible}
+                  target="add-new-annotation"
+                  fade={false}
+                  toggle={() =>
+                    this.toggle({
+                      isAddNewAnnotationVisible: !isAddNewAnnotationVisible,
+                    })
+                  }
+                >
+                  Create new annotation!
+                </Tooltip>
+                <Icon iconType="create-new-annotation" isActive={false} />
+              </Button>
+              <Button
+                id="copy-text-to-clipboard"
+                className="context-menu-icon"
+                type="button"
+                onClick={this.copyToClipBoard}
+                color="none"
+              >
+                <Tooltip
+                  placement="top"
+                  isOpen={this.state.isCopyToClipboardVisible}
+                  target="copy-text-to-clipboard"
+                  fade={false}
+                  toggle={() =>
+                    this.toggle({
+                      isCopyToClipboardVisible: !isCopyToClipboardVisible,
+                    })
+                  }
+                >
+                  Copy text to clipboard
+                </Tooltip>
+                <Tooltip
+                  placement="top"
+                  isOpen={this.state.isShowCopied}
+                  target="copy-text-to-clipboard"
+                  fade={false}
+                >
+                  Copied!
+                </Tooltip>
+                <Icon iconType="copy" isActive={false} />
+              </Button>
+              <Button
+                id="wikification"
+                className="context-menu-icon"
+                type="button"
+                color="none"
+                onClick={() =>
+                  this.setState(s => ({
+                    showWikipediaSuggestions: !s.showWikipediaSuggestions,
+                  }))
+                }
+              >
+                <Tooltip
+                  placement="top"
+                  isOpen={this.state.isWikipediaSearchVisible}
+                  target="wikification"
+                  fade={false}
+                  toggle={() =>
+                    this.toggle({
+                      isWikipediaSearchVisible: !isWikipediaSearchVisible,
+                    })
+                  }
+                >
+                  Search Wikipedia
+                </Tooltip>
+                <Icon iconType="wiki" isActive={showWikipediaSuggestions} />
+              </Button>
+              <a
+                id="search-web"
+                className="btn context-menu-icon"
+                href={`http://www.google.com/search?q=${encodeURIComponent(
+                  selectedText
+                )}`}
+                rel="noopener noreferrer"
+                target="_blank"
               >
-                <span className={`dot dot-${color}`} />
-              </button>
-            ))}
+                <Tooltip
+                  placement="top"
+                  isOpen={this.state.isSearchVisible}
+                  target="search-web"
+                  fade={false}
+                  toggle={() =>
+                    this.toggle({
+                      isSearchVisible: !isSearchVisible,
+                    })
+                  }
+                >
+                  Search on Google
+                </Tooltip>
+                <Button className="context-menu-icon" color="none">
+                  <Icon iconType="search" isActive={false} />
+                </Button>
+              </a>
+            </div>
+            <hr className="m-1" />
+            <div className="d-flex justify-content-between menu-colors">
+              {HIGHLIGHTS_COLORS.map(color => (
+                <button
+                  key={color}
+                  className="btn p-0"
+                  type="button"
+                  onClick={() => this.setAnnotationAndToggleSidebar(color)}
+                >
+                  <span className={`dot dot-${color}`} />
+                </button>
+              ))}
+            </div>
           </div>
         </div>
       </div>
diff --git a/reader/components/pdf-highlighter/components/Highlight.jsx b/reader/components/pdf-highlighter/components/Highlight.jsx
index 4f92811c..b11833af 100644
--- a/reader/components/pdf-highlighter/components/Highlight.jsx
+++ b/reader/components/pdf-highlighter/components/Highlight.jsx
@@ -8,49 +8,51 @@ const Highlight = ({
   pageNumber,
   annotationId,
   onUpdateContextMenu,
+  isContextMenuAttached,
 }) => {
   const contextMenuLayer = findOrCreateLayerForContextMenu(
     findPageLayer(pageNumber)
   )
 
   return (
-    <>
-      {/* eslint-disable-next-line jsx-a11y/mouse-events-have-key-events */}
-      <section
-        className={`highlight highlight-${color}`}
-        style={{
-          top,
-          left,
-          width,
-          height,
-          transform: `matrix(${viewPort.transform.join(',')}`,
-          transformOrigin: `-${left}px -${top}px`,
-          zIndex: 100,
-        }}
-        onMouseOver={() => {
+    <button
+      type="button"
+      className={`btn highlight highlight-${color}`}
+      style={{
+        top,
+        left,
+        width,
+        height,
+        transform: `matrix(${viewPort.transform.join(',')}`,
+        transformOrigin: `-${left}px -${top}px`,
+        zIndex: 100,
+      }}
+      onClick={() => {
+        if (isContextMenuAttached) {
           onUpdateContextMenu({
             isVisible: true,
-            left: left * viewPort.scale,
-            top: top * viewPort.scale,
-            annotationId,
-            width: width * viewPort.scale,
-            contextRoot: contextMenuLayer,
-            height: height * viewPort.scale,
           })
-        }}
-        onMouseLeave={() => {
-          onUpdateContextMenu({
-            isVisible: false,
-            left: left * viewPort.scale,
-            top: top * viewPort.scale,
-            annotationId,
-            width: width * viewPort.scale,
-            contextRoot: contextMenuLayer,
-            height: height * viewPort.scale,
-          })
-        }}
-      />
-    </>
+          return
+        }
+
+        const pdfRect = contextMenuLayer.getBoundingClientRect()
+        const leftScaled = left * viewPort.scale
+        const topScaled = top * viewPort.scale
+        const widthScaled = width * viewPort.scale
+        const heightScaled = height * viewPort.scale
+
+        onUpdateContextMenu({
+          isVisible: !isContextMenuAttached,
+          annotationId,
+          contextRoot: contextMenuLayer,
+          position: {
+            left: `${((leftScaled + widthScaled / 2) * 100) / pdfRect.width}%`,
+            top: `${(topScaled * 100) / pdfRect.height}%`,
+            height: `${heightScaled}px`,
+          },
+        })
+      }}
+    />
   )
 }
 
diff --git a/reader/components/pdf-highlighter/components/Highlights.jsx b/reader/components/pdf-highlighter/components/Highlights.jsx
index c5515ae5..8e749311 100644
--- a/reader/components/pdf-highlighter/components/Highlights.jsx
+++ b/reader/components/pdf-highlighter/components/Highlights.jsx
@@ -34,7 +34,6 @@ class Highlights extends React.PureComponent {
       this.preparePortals()
   }
 
-  /* eslint-disable react/no-array-index-key,no-restricted-syntax */
   preparePortals() {
     const {
       context: {
@@ -44,17 +43,14 @@ class Highlights extends React.PureComponent {
         },
       },
       updateContextMenu,
+      currentAnnotationId,
     } = this.props
 
     if (!pdfViewer.pageViewsReady) return
 
-    const annotationsByPage = {}
-    for (const [annotationId, annotationContent] of Object.entries(
-      annotations
-    )) {
-      for (const [pageNumber, rects] of Object.entries(
-        annotationContent.rects
-      )) {
+    const annotationsByPage = new Map()
+    Object.entries(annotations).forEach(([annotationId, annotationContent]) => {
+      Object.entries(annotationContent.rects).forEach(([pageNumber, rects]) => {
         const pageViewport = pdfViewer
           .getPageView(Number(pageNumber) - 1)
           .viewport.clone({
@@ -74,6 +70,7 @@ class Highlights extends React.PureComponent {
                 pageNumber={pageNumber}
                 annotationId={annotationId}
                 onUpdateContextMenu={updateContextMenu}
+                isContextMenuAttached={currentAnnotationId === annotationId}
               />
             )),
           ]
@@ -81,6 +78,7 @@ class Highlights extends React.PureComponent {
           annotationsByPage[pageNumber] = [
             ...rects.map((rect, index) => (
               <Highlight
+                // eslint-disable-next-line react/no-array-index-key
                 key={`${annotationId}-${index}`}
                 rect={rect}
                 color={annotationContent.color}
@@ -88,13 +86,13 @@ class Highlights extends React.PureComponent {
                 pageNumber={pageNumber}
                 annotationId={annotationId}
                 onUpdateContextMenu={updateContextMenu}
+                isContextMenuAttached={currentAnnotationId === annotationId}
               />
             )),
           ]
         }
-      }
-    }
-    /* eslint-enable react/no-array-index-key,no-restricted-syntax */
+      })
+    })
 
     const portals = Object.entries(annotationsByPage).map(
       ([pageNumber, pageHighlights]) =>
diff --git a/reader/components/pdf-highlighter/utils/rects.js b/reader/components/pdf-highlighter/utils/rects.js
index d192827d..3180f53e 100644
--- a/reader/components/pdf-highlighter/utils/rects.js
+++ b/reader/components/pdf-highlighter/utils/rects.js
@@ -2,19 +2,13 @@ import { sortBy } from 'lodash'
 
 // TODO: allow to highlight when PDF is rotated
 const normalizeToScale1 = ({ top, left, width, height }, scale) => {
-  if (scale >= 1) {
-    return {
-      top: top / scale,
-      left: left / scale,
-      width: width / scale,
-      height: height / scale,
-    }
-  }
+  const normalizedScale = 1 / scale
+
   return {
-    top: top * scale,
-    left: left * scale,
-    width: width * scale,
-    height: height * scale,
+    top: top * normalizedScale,
+    left: left * normalizedScale,
+    width: width * normalizedScale,
+    height: height * normalizedScale,
   }
 }
 
@@ -31,8 +25,8 @@ export const groupRectsByPage = (rects, pagesRange, pdfViewer) => {
   const rectsByPages = {}
   let pageNumber = pagesRange.selectionStartPage.number
   let pageView = pdfViewer.getPageView(Number(pageNumber) - 1)
-  // eslint-disable-next-line no-restricted-syntax
-  for (const rect of sortedRects) {
+
+  sortedRects.forEach(rect => {
     if (rect.top - shiftPage > pageRect.bottom - shiftPage) {
       pageNumber++
       pageNode = pageNode.nextSibling
@@ -43,8 +37,7 @@ export const groupRectsByPage = (rects, pagesRange, pdfViewer) => {
     // don't want to highlight whole page
     // this happens mostly when selection is between pages
     if (rect.width === pageRect.width || rect.height === pageRect.height)
-      // eslint-disable-next-line no-continue
-      continue
+      return
 
     if (pageNumber in rectsByPages) {
       rectsByPages[pageNumber].push(
@@ -71,7 +64,7 @@ export const groupRectsByPage = (rects, pagesRange, pdfViewer) => {
         ),
       ]
     }
-  }
+  })
 
   return rectsByPages
 }
diff --git a/reader/components/pdf-highlighter/utils/wiki-suggestions.js b/reader/components/pdf-highlighter/utils/wiki-suggestions.js
new file mode 100644
index 00000000..107c1857
--- /dev/null
+++ b/reader/components/pdf-highlighter/utils/wiki-suggestions.js
@@ -0,0 +1,29 @@
+import URI from 'urijs'
+import { memoize } from 'lodash'
+
+// Bear in mind that memoize uses only first arg as cache key
+const getWikipediaSuggestions = memoize(async searchTerm => {
+  const srsearch = searchTerm.replace(/\s/g, ' ')
+
+  try {
+    let wikipediaSuggestions = await fetch(
+      new URI('https://en.wikipedia.org/w/api.php').query({
+        origin: '*',
+        action: 'query',
+        list: 'search',
+        format: 'json',
+        srsearch,
+      })
+    )
+
+    wikipediaSuggestions = await wikipediaSuggestions.json()
+
+    return wikipediaSuggestions.query.search.map(w => {
+      return [`https://en.wikipedia.org/?curid=${w.pageid}`, w.title, w.snippet]
+    })
+  } catch (e) {
+    return []
+  }
+})
+
+export default getWikipediaSuggestions
diff --git a/reader/components/pdf-viewer/PDFViewer.jsx b/reader/components/pdf-viewer/PDFViewer.jsx
index 3e13ab24..e48451d4 100644
--- a/reader/components/pdf-viewer/PDFViewer.jsx
+++ b/reader/components/pdf-viewer/PDFViewer.jsx
@@ -103,7 +103,7 @@ class PDFViewer extends React.PureComponent {
   // when particular PDF page is not rendered
   render() {
     const { toolbarEnabled, metadataContainerWidth } = this.state
-    const { pdfMetadata, pdfEventBus } = this.props
+    const { pdfMetadata, pdfEventBus, handleOnMouseUp } = this.props
     const { Metadata, pdfViewer } = this
 
     return (
@@ -114,12 +114,16 @@ class PDFViewer extends React.PureComponent {
         }}
       >
         {metadataContainerWidth && <Metadata pdfMetadata={pdfMetadata} />}
-        <div
-          ref={node => {
-            this.viewerNode = node
-          }}
-          className="pdfViewer"
-        />
+        <div role="dialog">
+          <div
+            role="presentation"
+            ref={node => {
+              this.viewerNode = node
+            }}
+            className="pdfViewer"
+            onMouseUp={handleOnMouseUp}
+          />
+        </div>
         <PDFRecommender containerWidth={metadataContainerWidth} />
         {toolbarEnabled && (
           <PDFToolbar pdfViewer={pdfViewer} pdfEventBus={pdfEventBus} />
diff --git a/reader/utils/debounce.js b/reader/utils/debounce.js
index e5bd4b11..e69de29b 100644
--- a/reader/utils/debounce.js
+++ b/reader/utils/debounce.js
@@ -1,11 +0,0 @@
-import { debounce as _debounce } from 'lodash'
-
-const debounce = debounceTime => {
-  return (_, __, descriptor) => {
-    if (debounceTime !== 0)
-      descriptor.value = _debounce(descriptor.value, debounceTime)
-    return descriptor
-  }
-}
-
-export default debounce
diff --git a/reader/utils/throttle.js b/reader/utils/throttle.js
index 9d27aa94..e69de29b 100644
--- a/reader/utils/throttle.js
+++ b/reader/utils/throttle.js
@@ -1,11 +0,0 @@
-import { throttle as _throttle } from 'lodash'
-
-const throttle = throttleTime => {
-  return (_, __, descriptor) => {
-    if (throttleTime !== 0)
-      descriptor.value = _throttle(descriptor.value, throttleTime)
-    return descriptor
-  }
-}
-
-export default throttle
diff --git a/yarn.lock b/yarn.lock
index f5b69192..044460eb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@ampproject/toolbox-core@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@ampproject/toolbox-core/-/toolbox-core-1.0.1.tgz#e32b7d9e84a3bd0a3e1bd40ebdcdc7dd37bf3e55"
-  integrity sha512-8aONoeOAVujavLUezSCtpUjg9khkVndpArbn25cLab6/UG+ZgrFPvU3A7z1TjBvB31bte4pXxH6U004BC0VdfA==
+"@ampproject/toolbox-core@^1.0.1", "@ampproject/toolbox-core@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/toolbox-core/-/toolbox-core-1.1.1.tgz#540c8f3ab0f5d1faa1ba35282cd5f5f3f0e16a76"
+  integrity sha512-jcuVJUnGDRUEJgMYO6QVdf1dBy/oLZX3NjN2hYG48biFcPCvXevuv4xYFZMJsnsHSvXKg8y0qB8rANNyhTUN/A==
   dependencies:
     node-fetch "2.6.0"
 
@@ -21,11 +21,11 @@
     parse5-htmlparser2-tree-adapter "5.1.0"
 
 "@ampproject/toolbox-runtime-version@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@ampproject/toolbox-runtime-version/-/toolbox-runtime-version-1.0.1.tgz#2c13a17c08d1376ef55f44ef6679c25ff03828e0"
-  integrity sha512-OFky5rUfP9Hw/NlvEH+/8LqeSZ5DiXY2/RUvWSnY0r0/Uk4ooPyRCWEcVgRF7Y+wY+K1oro5UBZfE9MRYz+hpA==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/toolbox-runtime-version/-/toolbox-runtime-version-1.1.1.tgz#628fe5091db4f90b68960620e22ad64f9f2563bd"
+  integrity sha512-ibmw5p+0Sz+wingbX/Dyboe8a0+XDkMfFGSM7KFE0h2z3Op9MADup8ZPLeHT54Z7cYKmB6ob60FVHtQQDhEXNw==
   dependencies:
-    "@ampproject/toolbox-core" "^1.0.1"
+    "@ampproject/toolbox-core" "^1.1.1"
 
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5":
   version "7.5.5"
@@ -55,17 +55,17 @@
     source-map "^0.5.0"
 
 "@babel/core@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.2.tgz#069a776e8d5e9eefff76236bc8845566bd31dd91"
-  integrity sha512-l8zto/fuoZIbncm+01p8zPSDZu/VuuJhAfA7d/AbzM09WR7iVhavvfNDYCNpo1VvLk6E6xgAoP9P+/EMJHuRkQ==
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.4.tgz#6ebd9fe00925f6c3e177bb726a188b5f578088ff"
+  integrity sha512-Rm0HGw101GY8FTzpWSyRbki/jzq+/PkNQJ+nSulrdY6gFGOsNseCqD6KHRYe2E+EdzuBdr2pxCp6s4Uk6eJ+XQ==
   dependencies:
     "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.6.2"
+    "@babel/generator" "^7.6.4"
     "@babel/helpers" "^7.6.2"
-    "@babel/parser" "^7.6.2"
+    "@babel/parser" "^7.6.4"
     "@babel/template" "^7.6.0"
-    "@babel/traverse" "^7.6.2"
-    "@babel/types" "^7.6.0"
+    "@babel/traverse" "^7.6.3"
+    "@babel/types" "^7.6.3"
     convert-source-map "^1.1.0"
     debug "^4.1.0"
     json5 "^2.1.0"
@@ -74,12 +74,12 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.4.4", "@babel/generator@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.2.tgz#dac8a3c2df118334c2a29ff3446da1636a8f8c03"
-  integrity sha512-j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ==
+"@babel/generator@^7.4.4", "@babel/generator@^7.6.3", "@babel/generator@^7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.4.tgz#a4f8437287bf9671b07f483b76e3bb731bc97671"
+  integrity sha512-jsBuXkFoZxk0yWLyGI9llT9oiQ2FeTASmRFE32U+aaDTfoE92t78eroO7PTpU/OrYq38hlcDM6vbfLDaOLy+7w==
   dependencies:
-    "@babel/types" "^7.6.0"
+    "@babel/types" "^7.6.3"
     jsesc "^2.5.1"
     lodash "^4.17.13"
     source-map "^0.5.0"
@@ -277,10 +277,10 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.4.5", "@babel/parser@^7.6.0", "@babel/parser@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.2.tgz#205e9c95e16ba3b8b96090677a67c9d6075b70a1"
-  integrity sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==
+"@babel/parser@^7.0.0", "@babel/parser@^7.4.5", "@babel/parser@^7.6.0", "@babel/parser@^7.6.3", "@babel/parser@^7.6.4":
+  version "7.6.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.4.tgz#cb9b36a7482110282d5cb6dd424ec9262b473d81"
+  integrity sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A==
 
 "@babel/plugin-proposal-async-generator-functions@^7.2.0":
   version "7.2.0"
@@ -444,10 +444,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-block-scoping@^7.4.4", "@babel/plugin-transform-block-scoping@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.2.tgz#96c33ab97a9ae500cc6f5b19e04a7e6553360a79"
-  integrity sha512-zZT8ivau9LOQQaOGC7bQLQOT4XPkPXgN2ERfUgk1X8ql+mVkLc4E8eKk+FO3o0154kxzqenWCorfmEXpEZcrSQ==
+"@babel/plugin-transform-block-scoping@^7.4.4", "@babel/plugin-transform-block-scoping@^7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz#6e854e51fbbaa84351b15d4ddafe342f3a5d542a"
+  integrity sha512-7hvrg75dubcO3ZI2rjYTzUrEuh1E9IyDEhhB6qfcooxhDA33xx2MasuLVgdxzcP6R/lipAC6n9ub9maNW6RKdw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     lodash "^4.17.13"
@@ -578,10 +578,10 @@
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.4.5", "@babel/plugin-transform-named-capturing-groups-regex@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.2.tgz#c1ca0bb84b94f385ca302c3932e870b0fb0e522b"
-  integrity sha512-xBdB+XOs+lgbZc2/4F5BVDVcDNS4tcSKQc96KmlqLEAwz6tpYPEvPdmDfvVG0Ssn8lAhronaRs6Z6KSexIpK5g==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.4.5", "@babel/plugin-transform-named-capturing-groups-regex@^7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.3.tgz#aaa6e409dd4fb2e50b6e2a91f7e3a3149dbce0cf"
+  integrity sha512-jTkk7/uE6H2s5w6VlMHeWuH+Pcy2lmdwFoeWCVnvIrDUnB5gQqTVI8WfmEAhF2CDEarGrknZcmSFg1+bkfCoSw==
   dependencies:
     regexpu-core "^4.6.0"
 
@@ -710,9 +710,9 @@
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-typescript@^7.3.2":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.6.0.tgz#48d78405f1aa856ebeea7288a48a19ed8da377a6"
-  integrity sha512-yzw7EopOOr6saONZ3KA3lpizKnWRTe+rfBqg4AmQbSow7ik7fqmzrfIqt053osLwLE2AaTqGinLM2tl6+M/uog==
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.6.3.tgz#dddb50cf3b8b2ef70b22e5326e9a91f05a1db13b"
+  integrity sha512-aiWINBrPMSC3xTXRNM/dfmyYuPNKY/aexYqBgh0HBI5Y+WO5oRAqW/oROYeYHrF4Zw12r9rK4fMk/ZlAmqx/FQ==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.6.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -782,9 +782,9 @@
     semver "^5.5.0"
 
 "@babel/preset-env@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.2.tgz#abbb3ed785c7fe4220d4c82a53621d71fc0c75d3"
-  integrity sha512-Ru7+mfzy9M1/YTEtlDS8CD45jd22ngb9tXnn64DvQK3ooyqSw9K4K9DUWmYknTTVk4TqygL9dqCrZgm1HMea/Q==
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.3.tgz#9e1bf05a2e2d687036d24c40e4639dc46cef2271"
+  integrity sha512-CWQkn7EVnwzlOdR5NOm2+pfgSNEZmvGjOhlCHBDq0J8/EStr+G+FvPEiz9B56dR6MoiUFjXhfE4hjLoAKKJtIQ==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -802,7 +802,7 @@
     "@babel/plugin-transform-arrow-functions" "^7.2.0"
     "@babel/plugin-transform-async-to-generator" "^7.5.0"
     "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.6.2"
+    "@babel/plugin-transform-block-scoping" "^7.6.3"
     "@babel/plugin-transform-classes" "^7.5.5"
     "@babel/plugin-transform-computed-properties" "^7.2.0"
     "@babel/plugin-transform-destructuring" "^7.6.0"
@@ -817,7 +817,7 @@
     "@babel/plugin-transform-modules-commonjs" "^7.6.0"
     "@babel/plugin-transform-modules-systemjs" "^7.5.0"
     "@babel/plugin-transform-modules-umd" "^7.2.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.2"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.3"
     "@babel/plugin-transform-new-target" "^7.4.4"
     "@babel/plugin-transform-object-super" "^7.5.5"
     "@babel/plugin-transform-parameters" "^7.4.4"
@@ -830,14 +830,14 @@
     "@babel/plugin-transform-template-literals" "^7.4.4"
     "@babel/plugin-transform-typeof-symbol" "^7.2.0"
     "@babel/plugin-transform-unicode-regex" "^7.6.2"
-    "@babel/types" "^7.6.0"
+    "@babel/types" "^7.6.3"
     browserslist "^4.6.0"
     core-js-compat "^3.1.1"
     invariant "^2.2.2"
     js-levenshtein "^1.1.3"
     semver "^5.5.0"
 
-"@babel/preset-react@7.0.0", "@babel/preset-react@^7.0.0":
+"@babel/preset-react@7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz#e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"
   integrity sha512-oayxyPS4Zj+hF6Et11BwuBkmpgT/zMxyuZgFrMeZID6Hdh3dGlk4sHCAhdBCpuCKW2ppBfl2uCCetlrUIJRY3w==
@@ -848,6 +848,17 @@
     "@babel/plugin-transform-react-jsx-self" "^7.0.0"
     "@babel/plugin-transform-react-jsx-source" "^7.0.0"
 
+"@babel/preset-react@^7.0.0":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.6.3.tgz#d5242c828322520205ae4eda5d4f4f618964e2f6"
+  integrity sha512-07yQhmkZmRAfwREYIQgW0HEwMY9GBJVuPY4Q12UC72AbfaawuupVWa8zQs2tlL+yun45Nv/1KreII/0PLfEsgA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-transform-react-display-name" "^7.0.0"
+    "@babel/plugin-transform-react-jsx" "^7.0.0"
+    "@babel/plugin-transform-react-jsx-self" "^7.0.0"
+    "@babel/plugin-transform-react-jsx-source" "^7.0.0"
+
 "@babel/preset-typescript@7.3.3":
   version "7.3.3"
   resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.3.3.tgz#88669911053fa16b2b276ea2ede2ca603b3f307a"
@@ -883,9 +894,9 @@
     regenerator-runtime "^0.13.2"
 
 "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.4.5":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz#c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"
-  integrity sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg==
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.3.tgz#935122c74c73d2240cafd32ddb5fc2a6cd35cf1f"
+  integrity sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA==
   dependencies:
     regenerator-runtime "^0.13.2"
 
@@ -898,25 +909,25 @@
     "@babel/parser" "^7.6.0"
     "@babel/types" "^7.6.0"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.4.5", "@babel/traverse@^7.5.5", "@babel/traverse@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.2.tgz#b0e2bfd401d339ce0e6c05690206d1e11502ce2c"
-  integrity sha512-8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.4.5", "@babel/traverse@^7.5.5", "@babel/traverse@^7.6.2", "@babel/traverse@^7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.3.tgz#66d7dba146b086703c0fb10dd588b7364cec47f9"
+  integrity sha512-unn7P4LGsijIxaAJo/wpoU11zN+2IaClkQAxcJWBNCMS6cmVh802IyLHNkAjQ0iYnRS3nnxk5O3fuXW28IMxTw==
   dependencies:
     "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.6.2"
+    "@babel/generator" "^7.6.3"
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-split-export-declaration" "^7.4.4"
-    "@babel/parser" "^7.6.2"
-    "@babel/types" "^7.6.0"
+    "@babel/parser" "^7.6.3"
+    "@babel/types" "^7.6.3"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0":
-  version "7.6.1"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.1.tgz#53abf3308add3ac2a2884d539151c57c4b3ac648"
-  integrity sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==
+"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0", "@babel/types@^7.6.3":
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.3.tgz#3f07d96f854f98e2fbd45c64b0cb942d11e8ba09"
+  integrity sha512-CqbcpTxMcpuQTMhjI37ZHVgjBkysg5icREQIEZ0eG1yCNwg3oy+5AaLiOKmjsCj6nqOsa6Hf0ObjRVwokb7srA==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.13"
@@ -975,15 +986,28 @@
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/node@*":
-  version "12.7.11"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.11.tgz#be879b52031cfb5d295b047f5462d8ef1a716446"
-  integrity sha512-Otxmr2rrZLKRYIybtdG/sgeO+tHY20GxeDjcGmUnmmlCWyEnv2a2x1ZXBo3BTec4OiTXMQCiazB8NMBf0iRlFw==
+  version "12.7.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.12.tgz#7c6c571cc2f3f3ac4a59a5f2bd48f5bdbc8653cc"
+  integrity sha512-KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
   integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
 
+"@types/prop-types@*":
+  version "15.7.3"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
+  integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
+
+"@types/react@*":
+  version "16.9.5"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.5.tgz#079dabd918b19b32118c25fd00a786bb6d0d5e51"
+  integrity sha512-jQ12VMiFOWYlp+j66dghOWcmDDwhca0bnlcTxS4Qz/fh5gi6wpaZDthPEu/Gc/YlAuO87vbiUXL8qKstFvuOaA==
+  dependencies:
+    "@types/prop-types" "*"
+    csstype "^2.2.0"
+
 "@webassemblyjs/ast@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
@@ -2474,6 +2498,11 @@ cssnano-simple@1.0.0:
     cssnano-preset-simple "^1.0.0"
     postcss "^7.0.18"
 
+csstype@^2.2.0:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.7.tgz#20b0024c20b6718f4eda3853a1f5a1cce7f5e4a5"
+  integrity sha512-9Mcn9sFbGBAdmimWb2gLVDtFJzeKtDGIr76TUqmjZrw9LFXBMSU70lcs+C0/7fyCd6iBDqmksUcCOUIkisPHsQ==
+
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -2795,9 +2824,9 @@ ee-first@1.1.1:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.3.247:
-  version "1.3.277"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.277.tgz#38b7b297f9b3f67ea900a965c1b11a555de526ec"
-  integrity sha512-Czmsrgng89DOgJlIknnw9bn5431QdtnUwGp5YYiPwU1DbZQUxCLF+rc1ZC09VNAdalOPcvH6AE8BaA0H5HjI/w==
+  version "1.3.280"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.280.tgz#5f8950c8329e3e11b59c705fd59b4b8d9b3de5b9"
+  integrity sha512-qYWNMjKLEfQAWZF2Sarvo+ahigu0EArnpCFSoUuZJS3W5wIeVfeEvsgmT2mgIrieQkeQ0+xFmykK3nx2ezekPQ==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -2840,12 +2869,12 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
     once "^1.4.0"
 
 enhanced-resolve@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
-  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66"
+  integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==
   dependencies:
     graceful-fs "^4.1.2"
-    memory-fs "^0.4.0"
+    memory-fs "^0.5.0"
     tapable "^1.0.0"
 
 entities@^1.1.1:
@@ -2902,7 +2931,7 @@ es-to-primitive@^1.2.0:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-escape-html@~1.0.3:
+escape-html@^1.0.3, escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
@@ -3153,11 +3182,11 @@ execa@^1.0.0:
     strip-eof "^1.0.0"
 
 execa@^2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-2.0.5.tgz#5be3e2ea7e61bd038da5a0e11dc6ab2097357f2f"
-  integrity sha512-SwmwZZyJjflcqLSgllk4EQlMLst2p9muyzwNugKGFlpAz6rZ7M+s2nBR97GAq4Vzjwx2y9rcMcmqzojwN+xwNA==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99"
+  integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==
   dependencies:
-    cross-spawn "^6.0.5"
+    cross-spawn "^7.0.0"
     get-stream "^5.0.0"
     is-stream "^2.0.0"
     merge-stream "^2.0.0"
@@ -3809,9 +3838,9 @@ hmac-drbg@^1.0.0:
     minimalistic-crypto-utils "^1.0.1"
 
 hosted-git-info@^2.1.4:
-  version "2.8.4"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.4.tgz#44119abaf4bc64692a16ace34700fed9c03e2546"
-  integrity sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
+  integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==
 
 html-entities@^1.2.0:
   version "1.2.1"
@@ -3951,9 +3980,9 @@ ignore-loader@0.1.2:
   integrity sha1-2B8kA3bQuk8Nd4lyw60lh0EXpGM=
 
 ignore-walk@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.2.tgz#99d83a246c196ea5c93ef9315ad7b0819c35069b"
-  integrity sha512-EXyErtpHbn75ZTsOADsfx6J/FPo6/5cjev46PXrcTpd8z3BoRkXgYu9/JVqrI7tusjmwCZutGeRJeU0Wo1e4Cw==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
+  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
   dependencies:
     minimatch "^3.0.4"
 
@@ -4081,6 +4110,15 @@ inquirer@^6.4.1:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
+interweave@^11.2.0:
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/interweave/-/interweave-11.2.0.tgz#d0571cdc1002ef08f3b1f64c458bd320780c50c3"
+  integrity sha512-33h9LOXbT52tMin3IyLBPcd5RbiwroP/Sxr0OamnJJU7A/jh0XtZKGvdcSNKYRC7sLZuDk+ZJ2XVrmkcMU5i6w==
+  dependencies:
+    "@types/react" "*"
+    escape-html "^1.0.3"
+    prop-types "^15.7.2"
+
 invariant@^2.2.2:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -4572,9 +4610,9 @@ lines-and-columns@^1.1.6:
   integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
 
 lint-staged@^9.4.0:
-  version "9.4.1"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-9.4.1.tgz#60c0f85745bd398e6460aa7f5adb3cad3a2b862c"
-  integrity sha512-zFRbo1bAJEVf1m33paTTjDVfy2v3lICCqHfmQSgNoI+lWpi7HPG5y/R2Y7Whdce+FKxlZYs/U1sDSx8+nmQdDA==
+  version "9.4.2"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-9.4.2.tgz#14cb577a9512f520691f8b5aefce6a8f7ead6c04"
+  integrity sha512-OFyGokJSWTn2M6vngnlLXjaHhi8n83VIZZ5/1Z26SULRUWgR3ITWpAEQC9Pnm3MC/EpCxlwts/mQWDHNji2+zA==
   dependencies:
     chalk "^2.4.2"
     commander "^2.20.0"
@@ -4876,7 +4914,7 @@ md5.js@^1.3.4:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
-memory-fs@^0.4.0, memory-fs@^0.4.1:
+memory-fs@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
   integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
@@ -4884,6 +4922,14 @@ memory-fs@^0.4.0, memory-fs@^0.4.1:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
+memory-fs@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
+  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
 meow@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
@@ -5179,9 +5225,9 @@ next-transpile-modules@^2.3.1:
   integrity sha512-euNOBAk/CXZA6binwL47+QpcxAmK1pzH2zjF7XnRN55f2iuN/ecpUw5p3x4bikFu0yDPtSLS92nv9fcgcCo0vg==
 
 next@^9.0.7:
-  version "9.0.8"
-  resolved "https://registry.yarnpkg.com/next/-/next-9.0.8.tgz#ea37d7f64d754ea4608d15d6be3809b4be3f698f"
-  integrity sha512-vG8AasXnZ7sYYAaqKwFYnsgAGDkX8NdKDSHHz0Pzi//HN/9qJf6JnycEB4Jif8dIarDE8JWDjnBKw3Aw/lsFHg==
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/next/-/next-9.1.1.tgz#bede2e834548020bc4d3be0c46e3ed7edaac6d14"
+  integrity sha512-++jiUA1GN/dOqe6+oLT78rdrRnPmf5yHUbug1tdZBYeQ6HE+ypDIeVelmCmyGx+JDNB3TcxNx5R2+D/Cbrwnng==
   dependencies:
     "@ampproject/toolbox-optimizer" "1.0.1"
     "@babel/core" "7.4.5"
@@ -5344,9 +5390,9 @@ node-pre-gyp@^0.12.0:
     tar "^4"
 
 node-releases@^1.1.29:
-  version "1.1.34"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.34.tgz#ced4655ee1ba9c3a2c5dcbac385e19434155fd40"
-  integrity sha512-fNn12JTEfniTuCqo0r9jXgl44+KxRH/huV7zM/KAGOKxDKrHr6EbT7SSs4B+DNxyBE2mks28AD+Jw6PkfY5uwA==
+  version "1.1.35"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.35.tgz#32a74a3cd497aa77f23d509f483475fd160e4c48"
+  integrity sha512-JGcM/wndCN/2elJlU0IGdVEJQQnJwsLbgPCFd2pY7V0mxf17bZ0Gb/lgOtL29ZQhvEX5shnVhxQyZz3ex94N8w==
   dependencies:
     semver "^6.3.0"
 
@@ -5431,9 +5477,9 @@ npm-bundled@^1.0.1:
   integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==
 
 npm-packlist@^1.1.6:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.4.tgz#866224233850ac534b63d1a6e76050092b5d2f44"
-  integrity sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==
+  version "1.4.6"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.6.tgz#53ba3ed11f8523079f1457376dd379ee4ea42ff4"
+  integrity sha512-u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
@@ -8040,6 +8086,11 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
+urijs@^1.19.1:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.1.tgz#5b0ff530c0cbde8386f6342235ba5ca6e995d25a"
+  integrity sha512-xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg==
+
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
@@ -8169,9 +8220,9 @@ wcwidth@^1.0.1:
     defaults "^1.0.3"
 
 web-streams-polyfill@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-2.0.4.tgz#67ba73e42ae7c1d6dd64498e6e0a7952fb3993eb"
-  integrity sha512-hsLbiIZou2pZoht4VxfITEbCUz09YhZaaYFNICaZo7SOJrtW3/35LsJoAXeB8HITOlKpuWU0tFvtItOS2PpbsA==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-2.0.5.tgz#63defc04cd3b56d6f8bf2c6cdf996b626f812821"
+  integrity sha512-jECu/7ilpv3Q3bRP9yVtC+/DkEKM4imnIJMT7DD5Dx0TB9ylWpPtanpnQSxf4x2q1iyMr6kYEYD9hGipbRhh5w==
 
 webpack-dev-middleware@3.7.0:
   version "3.7.0"