diff --git a/client/.babelrc b/client/.babelrc
index 9dbc27740..c3f3f4606 100644
--- a/client/.babelrc
+++ b/client/.babelrc
@@ -1,7 +1,20 @@
 {
   "presets": ["next/babel"],
   "plugins": [
-    "inline-react-svg",
+    [
+      "inline-react-svg",
+      {
+        "svgo": {
+          "plugins": [
+            {
+              "cleanupIDs": {
+                "minify": false
+              }
+            }
+          ]
+        }
+      }
+    ],
     [
       "styled-components",
       {
diff --git a/client/src/components/Alert.js b/client/src/components/Alert.js
new file mode 100644
index 000000000..f6094644a
--- /dev/null
+++ b/client/src/components/Alert.js
@@ -0,0 +1,140 @@
+import React from 'react'
+import { Box, Button, Text } from 'grommet'
+import styled from 'styled-components'
+
+import Info from '../images/info-white.svg'
+import Warning from '../images/warning-white.svg'
+import Check from '../images/check-white.svg'
+import Cross from '../images/cross-white.svg'
+
+const types = {
+  info: {
+    Icon: Info,
+    background: 'brand',
+    multipleBackground: 'turteal-shade-20',
+    color: 'white'
+  },
+  error: {
+    Icon: Warning,
+    background: 'error',
+    multipleBackground: 'error-shade-20',
+    color: 'white'
+  },
+  success: {
+    Icon: Check,
+    background: 'success',
+    multipleBackground: 'success-shade-20',
+    color: 'white'
+  }
+}
+
+const CloseAlertButton = styled(Button)`
+  text-align: right;
+  padding-right: 16px;
+`
+
+export const Alert = ({
+  type = 'info',
+  message = '',
+  height = '56px',
+  onRemove
+}) => {
+  const { background, color, Icon } = types[type]
+
+  return (
+    <Box direction="row">
+      <Box
+        direction="row"
+        width="full"
+        height={height}
+        background={background}
+        justify="center"
+        pad={{ left: height }}
+      >
+        <Box direction="row" align="center">
+          {Icon && (
+            <Box alignContents="center" margin={{ right: '8px' }}>
+              <Icon />
+            </Box>
+          )}
+          <Box>
+            <Text color={color}>{message}</Text>
+          </Box>
+        </Box>
+      </Box>
+      <Box background={background} width={{ min: height }} height={height}>
+        <CloseAlertButton fill plain icon={<Cross />} onClick={onRemove} />
+      </Box>
+    </Box>
+  )
+}
+
+const MultipleAlerts = ({ alert, alerts, clearAlerts }) => {
+  const { multipleBackground, color } = types[alert.type]
+  return (
+    <Box direction="row">
+      <Box
+        direction="row"
+        width="full"
+        height="40px"
+        background={multipleBackground}
+        justify="center"
+      >
+        <Box direction="row" align="center" pad={{ left: '80px' }}>
+          <Text color={color}>{alerts.length} Alerts</Text>
+        </Box>
+      </Box>
+      <Box
+        direction="row"
+        background={multipleBackground}
+        width={{ min: '80px' }}
+        pad={{ right: '16px' }}
+        height="40px"
+        justify="end"
+      >
+        <Button plain label="clear all" onClick={clearAlerts} />
+      </Box>
+    </Box>
+  )
+}
+
+export const Alerts = ({ lifo = true, alerts, removeAlert, clearAlerts }) => {
+  if (alerts.length === 0) return <></>
+
+  const alert = lifo ? alerts[alerts.length - 1] : alerts[0]
+
+  return (
+    <>
+      {alerts.length > 1 && (
+        <MultipleAlerts
+          alert={alert}
+          alerts={alerts}
+          clearAlerts={clearAlerts}
+        />
+      )}
+      {alerts.length > 0 && (
+        <Alert
+          type={alert.type}
+          message={alert.message}
+          onRemove={() => {
+            removeAlert(alert)
+          }}
+        />
+      )}
+    </>
+  )
+}
+
+export const AlertsWithQueue = ({ lifo = true, queue }) => {
+  const { alerts, clearAlerts, removeAlert } = queue
+  return (
+    <Alerts
+      lifo={lifo}
+      alerts={alerts}
+      clearAlerts={clearAlerts}
+      removeAlert={removeAlert}
+    />
+  )
+}
+
+export default Alert
diff --git a/client/src/components/Alert.stories.js b/client/src/components/Alert.stories.js
new file mode 100644
index 000000000..d3616cb59
--- /dev/null
+++ b/client/src/components/Alert.stories.js
@@ -0,0 +1,62 @@
+import * as React from 'react'
+import { Grommet, Box, Button } from 'grommet'
+import { storiesOf } from '@storybook/react'
+import { useAlertsQueue } from '../hooks/useAlertsQueue'
+import { Alert, AlertsWithQueue } from './Alert'
+import theme from '../theme'
+
+storiesOf('Alert', module).add('default', () => {
+  return (
+    <Grommet theme={theme}>
+      <Box pad="medium">
+        <Alert type="info" message="This is information." />
+      </Box>
+      <Box pad="medium">
+        <Alert type="success" message="This worked out well!" />
+      </Box>
+      <Box pad="medium">
+        <Alert type="error" message="This is an error!" />
+      </Box>
+    </Grommet>
+  )
+})
+
+storiesOf('Alert', module).add('Alerts', () => {
+  const alertsQueue = useAlertsQueue('demo1')
+
+  // This is to demonstate how you can use queues and context
+  // This would be in some child component or somewhere else
+  const { addAlert } = useAlertsQueue('demo1')
+  return (
+    <Grommet theme={theme}>
+      <AlertsWithQueue queue={alertsQueue} />
+      <Box pad="medium" direction="row">
+        <Button
+          label="Add Success Alert"
+          width="50px"
+          onClick={() => {
+            alertsQueue.addAlert('New Alert!', 'success')
+          }}
+        />
+      </Box>
+      <Box pad="medium" direction="row">
+        <Button
+          label="Add Error Alert"
+          width="50px"
+          onClick={() => {
+            addAlert('New Error Alert!', 'error')
+          }}
+        />
+      </Box>
+      <Box pad="medium" direction="row">
+        <Button
+          label="Add Info Alert"
+          width="50px"
+          onClick={() => {
+            addAlert('New Info Alert!', 'info')
+          }}
+        />
+      </Box>
+    </Grommet>
+  )
+})
diff --git a/client/src/hooks/useAlertsQueue.js b/client/src/hooks/useAlertsQueue.js
new file mode 100644
index 000000000..3083bad49
--- /dev/null
+++ b/client/src/hooks/useAlertsQueue.js
@@ -0,0 +1,42 @@
+import React from 'react'
+
+export const AlertsContext = React.createContext({ alerts: {} })
+
+export const useAlertsQueue = (queue = 'main') => {
+  const context = React.useContext(AlertsContext)
+
+  const [alerts, setAlerts] = React.useState(context.alerts)
+
+  if (!alerts[queue]) alerts[queue] = []
+
+  const addAlert = (message, type = 'info') => {
+    context.alerts[queue].push({
+      time: Date.now(),
+      message,
+      type
+    })
+    setAlerts({ ...context.alerts })
+  }
+
+  const removeAlert = (alertToRemove) => {
+    const newAlerts = context.alerts[queue].filter((a) => {
+      return a.time !== alertToRemove.time
+    })
+    context.alerts[queue] = newAlerts
+    setAlerts({ ...context.alerts })
+  }
+
+  const clearAlerts = () => {
+    context.alerts[queue] = []
+    setAlerts({ ...context.alerts })
+  }
+
+  return {
+    alerts: context.alerts[queue],
+    addAlert,
+    clearAlerts,
+    removeAlert
+  }
+}
+
+export default useAlertsQueue
diff --git a/client/src/images/check-green.svg b/client/src/images/check-green.svg
new file mode 100644
index 000000000..d87977d72
--- /dev/null
+++ b/client/src/images/check-green.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>icons/check-green</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M12,0 C5.37321429,0 0,5.37321429 0,12 C0,18.6267857 5.37321429,24 12,24 C18.6267857,24 24,18.6267857 24,12 C24,5.37321429 18.6267857,0 12,0 Z M18.1553571,7.9875 L10.7035714,17.55 C10.6446429,17.6089286 10.5482143,17.7375 10.4303571,17.7375 C10.3071429,17.7375 10.2267857,17.6517857 10.1571429,17.5821429 C10.0875,17.5125 5.93035714,13.5160714 5.93035714,13.5160714 L5.85,13.4357143 C5.81785714,13.3875 5.79107143,13.3285714 5.79107143,13.2642857 C5.79107143,13.2 5.81785714,13.1410714 5.85,13.0928571 C5.87142857,13.0714286 5.8875,13.0553571 5.90892857,13.0285714 C6.32142857,12.5946429 7.15714286,11.7160714 7.21071429,11.6625 C7.28035714,11.5928571 7.33928571,11.5017857 7.46785714,11.5017857 C7.60178571,11.5017857 7.6875,11.6142857 7.75178571,11.6785714 C7.81607143,11.7428571 10.1625,13.9982143 10.1625,13.9982143 L16.125,6.3375 C16.1785714,6.29464286 16.2428571,6.2625 16.3125,6.2625 C16.3821429,6.2625 16.4464286,6.28928571 16.5,6.33214286 L18.1392857,7.62321429 C18.1821429,7.67678571 18.2089286,7.74107143 18.2089286,7.81071429 C18.2142857,7.88035714 18.1875,7.93928571 18.1553571,7.9875 Z" id="icons/check-green--path-1"></path>
+    </defs>
+    <g id="icons/check-green--Guidelines" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icons/check-green--Artboard" transform="translate(-81.000000, -65.000000)">
+            <g id="icons/check-green--icons/check" transform="translate(85.000000, 67.000000)">
+                <g id="icons/check-green--color/gray/70-4A4A4A">
+                    <mask id="icons/check-green--mask-2" fill="white">
+                        <use xlink:href="#icons/check-green--path-1"></use>
+                    </mask>
+                    <use id="icons/check-green--Mask" fill="#FDFDFD" fill-rule="nonzero" xlink:href="#icons/check-green--path-1"></use>
+                    <g id="icons/check-green--color/success/green-41A36D" mask="url(#icons/check-green--mask-2)" fill="#41A36D">
+                        <rect id="icons/check-green--success-41A36D" x="0" y="0" width="24" height="24"></rect>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/client/src/images/check-white.svg b/client/src/images/check-white.svg
new file mode 100644
index 000000000..85ee5ca53
--- /dev/null
+++ b/client/src/images/check-white.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>icons/check-white</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M12,0 C5.37321429,0 0,5.37321429 0,12 C0,18.6267857 5.37321429,24 12,24 C18.6267857,24 24,18.6267857 24,12 C24,5.37321429 18.6267857,0 12,0 Z M18.1553571,7.9875 L10.7035714,17.55 C10.6446429,17.6089286 10.5482143,17.7375 10.4303571,17.7375 C10.3071429,17.7375 10.2267857,17.6517857 10.1571429,17.5821429 C10.0875,17.5125 5.93035714,13.5160714 5.93035714,13.5160714 L5.85,13.4357143 C5.81785714,13.3875 5.79107143,13.3285714 5.79107143,13.2642857 C5.79107143,13.2 5.81785714,13.1410714 5.85,13.0928571 C5.87142857,13.0714286 5.8875,13.0553571 5.90892857,13.0285714 C6.32142857,12.5946429 7.15714286,11.7160714 7.21071429,11.6625 C7.28035714,11.5928571 7.33928571,11.5017857 7.46785714,11.5017857 C7.60178571,11.5017857 7.6875,11.6142857 7.75178571,11.6785714 C7.81607143,11.7428571 10.1625,13.9982143 10.1625,13.9982143 L16.125,6.3375 C16.1785714,6.29464286 16.2428571,6.2625 16.3125,6.2625 C16.3821429,6.2625 16.4464286,6.28928571 16.5,6.33214286 L18.1392857,7.62321429 C18.1821429,7.67678571 18.2089286,7.74107143 18.2089286,7.81071429 C18.2142857,7.88035714 18.1875,7.93928571 18.1553571,7.9875 Z" id="icons/check-white--path-1"></path>
+    </defs>
+    <g id="icons/check-white--Guidelines" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icons/check-white--Artboard" transform="translate(-131.000000, -65.000000)">
+            <g id="icons/check-white--icons/check" transform="translate(135.000000, 67.000000)">
+                <g id="icons/check-white--color/gray/70-4A4A4A">
+                    <mask id="icons/check-white--mask-2" fill="white">
+                        <use xlink:href="#icons/check-white--path-1"></use>
+                    </mask>
+                    <use id="icons/check-white--Mask" fill="#FDFDFD" fill-rule="nonzero" xlink:href="#icons/check-white--path-1"></use>
+                    <g id="icons/check-white--color/white-FDFDFD" mask="url(#icons/check-white--mask-2)" fill="#FDFDFD">
+                        <rect id="icons/check-white--white-FDFDFD" x="0" y="0" width="24" height="24"></rect>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/client/src/images/cite.svg b/client/src/images/cite.svg
new file mode 100644
index 000000000..195be6018
--- /dev/null
+++ b/client/src/images/cite.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="23px" viewBox="0 0 24 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>icons/cite</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M9.49333333,5.74666667 C10.6666667,5.89333333 12.7333333,7.38666667 12.7333333,9.92 C12.7333333,11.7066667 11.6933333,12.5333333 10.48,12.5333333 C9.12,12.5333333 8.41333333,11.48 8.41333333,10.2266667 C8.41333333,8.57333333 9.65333333,8.16 10.4266667,8.09333333 C10.48,7.65333333 9.92,6.88 9.24,6.44 L9.49333333,5.74666667 Z M4.34666667,5.74666667 C5.52,5.89333333 7.58666667,7.38666667 7.58666667,9.92 C7.58666667,11.7066667 6.54666667,12.5333333 5.33333333,12.5333333 C3.97333333,12.5333333 3.26666667,11.48 3.26666667,10.2266667 C3.26666667,8.57333333 4.50666667,8.16 5.28,8.09333333 C5.33333333,7.65333333 4.77333333,6.88 4.09333333,6.44 L4.34666667,5.74666667 Z M0,0 L0,13.3333333 C0,14.6266667 0.706666667,15.3333333 2,15.3333333 L14,15.3333333 C15.2933333,15.3333333 16,14.6266667 16,13.3333333 L16,5.33333333 C16,4.04 15.2933333,3.33333333 14,3.33333333 L3.33333333,3.33333333 L0,0 Z" id="icons/cite--path-1"></path>
+    </defs>
+    <g id="icons/cite--Guidelines" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icons/cite--Artboard" transform="translate(-194.000000, -70.000000)">
+            <g id="icons/cite--icons/cite" transform="translate(198.000000, 72.000000)">
+                <mask id="icons/cite--mask-2" fill="white">
+                    <use xlink:href="#icons/cite--path-1"></use>
+                </mask>
+                <use id="icons/cite--Shape" fill="#017FA3" fill-rule="nonzero" transform="translate(8.000000, 7.666667) scale(-1, 1) rotate(-180.000000) translate(-8.000000, -7.666667) " xlink:href="#icons/cite--path-1"></use>
+                <g id="icons/cite--color/turteal/base-017FA3" mask="url(#icons/cite--mask-2)" fill="#017FA3" fill-rule="evenodd" stroke="#017FA3" stroke-width="1">
+                    <rect id="icons/cite--turteal-017FA3" x="0.5" y="0.5" width="16" height="15"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/client/src/images/cross-black-tint-30.svg b/client/src/images/cross-black-tint-30.svg
new file mode 100644
index 000000000..91e35198a
--- /dev/null
+++ b/client/src/images/cross-black-tint-30.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>icons/cross-black-tint-30</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <polygon id="icons/cross-black-tint-30--path-1" points="24 2.39983893 21.6001611 0 12 9.60016107 2.39983893 0 0 2.39983893 9.60016107 12 0 21.6001611 2.39983893 24 12 14.3998389 21.6001611 24 24 21.6001611 14.3998389 12"></polygon>
+    </defs>
+    <g id="icons/cross-black-tint-30--Guidelines" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icons/cross-black-tint-30--Artboard" transform="translate(-132.000000, -117.000000)">
+            <g id="icons/cross-black-tint-30--icons/cross" transform="translate(132.000000, 117.000000)">
+                <g id="icons/cross-black-tint-30--color/gray/70-4A4A4A">
+                    <mask id="icons/cross-black-tint-30--mask-2" fill="white">
+                        <use xlink:href="#icons/cross-black-tint-30--path-1"></use>
+                    </mask>
+                    <use id="icons/cross-black-tint-30--Mask" fill="#FDFDFD" fill-rule="nonzero" xlink:href="#icons/cross-black-tint-30--path-1"></use>
+                    <g id="icons/cross-black-tint-30--color/black-tint/30-4A4A4A" mask="url(#icons/cross-black-tint-30--mask-2)" fill="#4A4A4A">
+                        <rect id="icons/cross-black-tint-30--gray-70-4A4A4A" x="0" y="0" width="24" height="24"></rect>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/client/src/images/cross-white.svg b/client/src/images/cross-white.svg
new file mode 100644
index 000000000..221442741
--- /dev/null
+++ b/client/src/images/cross-white.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>icons/cross-white</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <polygon id="icons/cross-white--path-1" points="24 2.39983893 21.6001611 0 12 9.60016107 2.39983893 0 0 2.39983893 9.60016107 12 0 21.6001611 2.39983893 24 12 14.3998389 21.6001611 24 24 21.6001611 14.3998389 12"></polygon>
+    </defs>
+    <g id="icons/cross-white--Guidelines" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icons/cross-white--Artboard" transform="translate(-85.000000, -117.000000)">
+            <g id="icons/cross-white--icons/cross" transform="translate(85.000000, 117.000000)">
+                <g id="icons/cross-white--color/gray/70-4A4A4A">
+                    <mask id="icons/cross-white--mask-2" fill="white">
+                        <use xlink:href="#icons/cross-white--path-1"></use>
+                    </mask>
+                    <use id="icons/cross-white--Mask" fill="#FDFDFD" fill-rule="nonzero" xlink:href="#icons/cross-white--path-1"></use>
+                    <g id="icons/cross-white--color/white-FDFDFD" mask="url(#icons/cross-white--mask-2)" fill="#FDFDFD">
+                        <rect id="icons/cross-white--white-FDFDFD" x="0" y="0" width="24" height="24"></rect>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/client/src/images/deliver.svg b/client/src/images/deliver.svg
new file mode 100644
index 000000000..156c107f9
--- /dev/null
+++ b/client/src/images/deliver.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>icons/deliver</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <circle id="icons/deliver--path-1" cx="32" cy="32" r="32"></circle>
+        <path d="M17.6590246,25.2012487 C17.6582568,25.6877728 17.5177348,26.1735969 17.2520484,26.5950178 C16.910342,27.1368446 16.3659153,27.568066 15.7316468,27.8004775 C15.0113757,28.0643906 14.1836014,28.0664907 13.4617946,27.8067778 C12.7077368,27.5358644 12.0826828,26.984237 11.762477,26.2989031 C11.6004544,25.9530859 11.5182912,25.5778674 11.5190591,25.2012487 L9.21311659,25.2012487 L9.17856201,25.1998486 C9.13709651,25.1984486 9.11559588,25.1977485 9.06338007,25.187948 C8.95971632,25.1690471 8.86142772,25.1298452 8.77542521,25.0745424 C8.70708392,25.0318403 8.64565355,24.9793377 8.59574137,24.9170346 C8.57116922,24.8876332 8.5496686,24.8561316 8.53123948,24.82323 C8.52125705,24.8057291 8.51204249,24.7875282 8.50359582,24.7693273 C8.49514914,24.7497263 8.48670247,24.7301253 8.48055943,24.7105244 C8.46059456,24.6531215 8.44907636,24.5943186 8.44600485,24.5348157 C8.44293333,24.4732126 8.44677272,24.4578119 8.45368364,24.3976089 L10.2067528,13.7409808 C10.1760376,13.7332805 10.1460903,13.7248801 10.1153752,13.7171797 C9.2392245,13.481968 8.41068238,13.0997491 7.67966098,12.6006243 L0.766440674,12.6006243 C0.699635146,12.5978242 0.681973914,12.5992243 0.616704146,12.5873237 C0.346410516,12.5383213 0.112975109,12.3479118 0.0315798685,12.1035997 C-0.0559584093,11.8410867 0.0423301833,11.5365716 0.278837109,11.3594628 C0.395554813,11.2719585 0.540684063,11.2173558 0.69118847,11.2040551 C0.715760618,11.201955 0.741100646,11.201955 0.766440674,11.200555 L6.14390172,11.200555 C5.60408234,10.5453225 5.19019522,9.80468581 4.9306519,9.01924689 C4.47529928,7.64227867 4.49987143,6.13440395 5.00590411,4.76653618 C5.40443363,3.68778273 6.0993647,2.70143385 7.0039269,1.91949511 C8.08817294,0.983548734 9.47649931,0.341616927 10.9500603,0.105705238 C11.3862159,0.035701769 11.826211,0.00140006937 12.272349,0 C12.2800278,0 12.2884745,0 12.2969212,0 C13.3665775,0.00210010406 14.428555,0.207210267 15.4014585,0.60202983 C16.9886657,1.24606174 18.3209369,2.38781831 19.1226032,3.81378897 C19.8374991,5.08575199 20.1047213,6.55582483 19.8904828,7.96709476 C19.7944979,8.59852605 19.6002243,9.21665667 19.3199483,9.8004856 L30.7137462,9.8004856 L30.7337111,9.80118564 C30.7398541,9.80118564 30.7459972,9.80118564 30.7529081,9.80118564 C30.759819,9.80188567 30.7674978,9.80258571 30.7751766,9.80328574 L30.7889984,9.80398578 C30.7920699,9.80398578 30.7951415,9.80468581 30.798213,9.80538585 C30.8081954,9.80608588 30.81741,9.80678591 30.8273924,9.80818598 C30.8373748,9.80958605 30.8465894,9.81098612 30.8565718,9.81308623 C30.8588755,9.81308623 30.8611791,9.81378626 30.8634827,9.81378626 C30.9172343,9.82358675 30.9694501,9.83898751 31.0201302,9.85928852 C31.1875279,9.92719188 31.3295857,10.049698 31.4086773,10.2023055 C31.4286421,10.2415075 31.4447676,10.2821095 31.4562858,10.3234115 C31.4601252,10.3367122 31.4639646,10.3507129 31.4670361,10.3640135 C31.4701076,10.3780142 31.4724113,10.3927149 31.4747149,10.4067156 C31.480858,10.4494178 31.4831616,10.4928199 31.480858,10.5362221 C31.4793222,10.5586232 31.4754828,10.5817243 31.4731792,10.6041254 L31.1445267,12.6006243 L39.9283018,12.6006243 C39.952106,12.6020244 39.9759103,12.6027244 39.9989467,12.6034245 C40.0619128,12.6118249 40.0780383,12.6118249 40.1387008,12.6279257 C40.2531148,12.6573272 40.3598501,12.7112298 40.4466205,12.7847335 C40.4934612,12.8239354 40.5019078,12.836536 40.5426055,12.8806382 L42.8462444,15.680777 C42.8831026,15.7304794 42.8938529,15.74168 42.9230323,15.7955827 C42.9660336,15.8760866 42.9913736,15.964291 42.9982845,16.0538955 C43.0021239,16.1133984 42.9990524,16.1280991 42.9936772,16.1876021 L41.8418578,24.5880183 C41.8380184,24.6104194 41.8349469,24.6328205 41.8295717,24.6545216 C41.7696771,24.8960336 41.5623496,25.1011437 41.2989669,25.1725473 C41.2513584,25.1851479 41.2029819,25.1935483 41.1538377,25.1977485 C41.1292655,25.2005487 41.1046934,25.2005487 41.0801212,25.2012487 L36.8560154,25.2012487 C36.8552475,25.6835726 36.717797,26.1665965 36.4536464,26.5880174 C36.1134758,27.1312443 35.5675133,27.5666659 34.9286375,27.8004775 C34.2083664,28.0643906 33.3805922,28.0664907 32.6587853,27.8067778 C31.8025995,27.4987625 31.1138115,26.8260292 30.8435179,26.0090887 C30.7567475,25.7465757 30.7145141,25.4735622 30.715282,25.2012487 L17.6590246,25.2012487 L17.6590246,25.2012487 Z M14.5859704,23.8011793 C14.1889766,23.8018794 13.7958222,23.9488866 13.5124746,24.2029992 C13.1438924,24.5327156 12.9718874,25.0367405 13.0909087,25.5134642 C13.197644,25.9418854 13.5408862,26.3164039 13.9870242,26.4900125 C14.4339302,26.6636212 14.9691423,26.6300195 15.3876367,26.3969079 C15.8368463,26.1462955 16.1286405,25.6786723 16.1240333,25.187948 C16.119426,24.7462261 15.8737045,24.3143047 15.4682641,24.0545919 C15.2163995,23.8928839 14.9100156,23.8032794 14.601328,23.8011793 C14.5959528,23.8011793 14.5905776,23.8011793 14.5859704,23.8011793 L14.5859704,23.8011793 Z M33.7829611,23.8011793 C33.3314479,23.8018794 32.8860777,23.9929888 32.5973549,24.3150048 C32.3109358,24.6328205 32.1903787,25.0682421 32.2786849,25.4756623 C32.3723662,25.9061836 32.7048581,26.2898026 33.145621,26.4746118 C33.59867,26.6643212 34.1523112,26.6377199 34.5846274,26.3969079 C35.0253903,26.1511958 35.3171846,25.6961732 35.321024,25.2103491 C35.3225597,24.9940384 35.2688082,24.7777277 35.1636087,24.5838181 C34.9278696,24.1476965 34.4318194,23.8361811 33.8866248,23.8039795 C33.8520703,23.8018794 33.8175157,23.8011793 33.7829611,23.8011793 L33.7829611,23.8011793 Z M28.2096907,21.0010406 L10.5653526,21.0010406 L10.1046248,23.8011793 L11.928339,23.8011793 C12.3015285,23.2159503 12.9112249,22.7581276 13.6215135,22.543217 C13.9271296,22.4508124 14.250407,22.4032101 14.5729164,22.4011099 C14.5798273,22.4011099 14.5867382,22.4011099 14.5928813,22.4011099 C15.2179353,22.40251 15.8399178,22.5810189 16.3513256,22.9086351 C16.7160685,23.1424467 17.0216845,23.4490619 17.2451375,23.8011793 L27.748963,23.8011793 L28.2096907,21.0010406 Z M39.5443619,14.0006937 L30.9141628,14.0006937 L29.3016156,23.8011793 L31.1253297,23.8011793 C31.4985192,23.2159503 32.1082156,22.7581276 32.8185043,22.543217 C33.1241204,22.4508124 33.4473977,22.4032101 33.7699071,22.4011099 C33.7768181,22.4011099 33.783729,22.4011099 33.789872,22.4011099 C34.4241406,22.40251 35.0553376,22.5866191 35.5713527,22.9233358 C35.9261131,23.1550473 36.2232826,23.4574623 36.4421282,23.8011793 L40.4020835,23.8011793 L41.4310422,16.2947074 L39.5443619,14.0006937 L39.5443619,14.0006937 Z M37.6246629,21.0010406 L33.0173851,21.0010406 C32.992813,21.0003405 32.9690087,21.0003405 32.9444365,20.9982404 C32.6334453,20.9709391 32.3508656,20.7574285 32.2725419,20.4718144 C32.2548806,20.4074112 32.2472018,20.3409079 32.2502734,20.2744046 C32.2510412,20.2527035 32.2541127,20.2303024 32.2564164,20.2086013 L32.8707201,16.0083932 C32.8745595,15.9859921 32.8783989,15.964291 32.883774,15.9425899 C32.9559547,15.660476 33.2339272,15.4322647 33.5579724,15.4042633 C33.5825445,15.4021632 33.6071167,15.4021632 33.6316888,15.4007631 L36.4728434,15.4007631 C36.4981835,15.4021632 36.5227556,15.4028632 36.5480956,15.4042633 C36.6141333,15.4133637 36.6310266,15.4133637 36.6955285,15.4308646 C36.7915135,15.4574659 36.8821233,15.5015681 36.9596791,15.559671 C36.979644,15.5743717 36.9973052,15.5904725 37.0157343,15.6058733 L38.5514936,17.0059426 C38.5929591,17.0479447 38.6052452,17.0570452 38.6405676,17.1039475 C38.7334811,17.2264536 38.7810896,17.3755609 38.7757144,17.5239683 C38.7749466,17.5456694 38.7726429,17.5666704 38.7703393,17.5876714 L38.3863995,20.3878102 C38.3825601,20.4102113 38.3794886,20.4326124 38.3741134,20.4543135 C38.3142188,20.6951254 38.1068913,20.9009356 37.8435086,20.9723392 C37.7959,20.9849398 37.7475236,20.9933402 37.6983793,20.9975404 C37.6738072,21.0003405 37.649235,21.0003405 37.6246629,21.0010406 L37.6246629,21.0010406 Z M29.4935855,13.1970539 L29.822238,11.200555 L18.4261364,11.200555 C18.314026,11.3363617 18.1973083,11.4686683 18.0744475,11.5967746 C17.1253483,12.5901238 15.870633,13.3300605 14.4876818,13.7073792 C13.5938699,13.9516913 12.6516816,14.0440959 11.7202436,13.9817928 L10.7957165,19.6009712 L28.4400546,19.6009712 L28.6704185,18.1988017 L29.4935855,13.1970539 Z M36.1549413,16.8008325 L34.3035835,16.8008325 L33.8943036,19.6009712 L36.9466252,19.6009712 L37.2000254,17.7535797 L36.1549413,16.8008325 Z M7.67735734,18.2009018 L3.83795919,18.2009018 C3.77115366,18.1981017 3.75349243,18.1995018 3.68822266,18.1876012 C3.39335689,18.1343985 3.14456389,17.9117875 3.08466927,17.6373739 C3.0309177,17.3909617 3.13458145,17.1214483 3.35035563,16.9597403 C3.46707333,16.872236 3.61220258,16.8176333 3.76270699,16.8043326 C3.78727913,16.8022325 3.81261916,16.8022325 3.83795919,16.8008325 L7.67735734,16.8008325 C7.70269736,16.8022325 7.72726951,16.8029326 7.75260954,16.8043326 C7.77718169,16.8078328 7.80252172,16.8099329 7.82709386,16.8141331 C8.07358323,16.8589353 8.29012528,17.0213434 8.38687811,17.2327539 C8.50129218,17.4861664 8.43679029,17.7983819 8.22024823,17.9957917 C8.11351297,18.0930965 7.97529463,18.1609999 7.82709386,18.1876012 C7.76105622,18.1995018 7.74416286,18.1981017 7.67735734,18.2009018 Z M7.67735734,15.4007631 L2.30219993,15.4007631 C2.2353944,15.397963 2.21773317,15.399363 2.1524634,15.3874624 C1.85759763,15.3342598 1.60880463,15.1116488 1.54891002,14.8372352 C1.49976572,14.612524 1.58116096,14.3675119 1.75930903,14.2058039 C1.88370553,14.0923983 2.05110329,14.0195947 2.22694773,14.0041939 C2.25151988,14.0020938 2.2768599,14.0020938 2.30219993,14.0006937 L7.67735734,14.0006937 C7.70269736,14.0020938 7.72726951,14.0027938 7.75260954,14.0041939 C7.77718169,14.0076941 7.80252172,14.0097942 7.82709386,14.0139944 C8.12195964,14.067897 8.37075264,14.289808 8.43064725,14.5642216 C8.47979155,14.7889328 8.39762843,15.0339449 8.22024823,15.1956529 C8.11351297,15.2929577 7.97529463,15.3608611 7.82709386,15.3874624 C7.76105622,15.399363 7.74416286,15.397963 7.67735734,15.4007631 L7.67735734,15.4007631 Z M12.2746527,1.40006937 C11.0821356,1.40286951 9.90804766,1.72418543 8.92132234,2.31431467 C7.77871745,2.99824856 6.89642375,4.03569996 6.461036,5.21315831 C6.0578992,6.30451238 6.03639857,7.51207221 6.40114139,8.61532688 C6.81656427,9.87258917 7.73571619,10.9842443 8.94435872,11.6996797 C10.2543614,12.4767182 11.8853377,12.7686327 13.4287758,12.5033195 C14.2020305,12.371013 14.9461059,12.0993995 15.6095539,11.7094802 C16.8235716,10.9947448 17.7496344,9.88798994 18.1704325,8.6076265 C18.5866232,7.34126375 18.4952456,5.94749469 17.9001388,4.72803427 C17.4317323,3.76898675 16.6569417,2.92964516 15.6940207,2.34231606 C14.811727,1.80398939 13.7727858,1.47917329 12.7085047,1.41337003 C12.5641433,1.40426958 12.419014,1.40006937 12.2746527,1.40006937 L12.2746527,1.40006937 Z M15.6180006,4.32341422 C15.6425727,4.32691439 15.6671449,4.3290145 15.6924849,4.33391474 C15.9873507,4.38711738 16.2353758,4.60972841 16.2952704,4.884142 C16.3398074,5.08575199 16.2806807,5.30416281 16.1355515,5.46447076 C16.1201939,5.48197163 16.1025326,5.49877246 16.0856393,5.51557329 L11.7417442,9.47566951 C11.7225472,9.49107027 11.704886,9.50717107 11.685689,9.5218718 C11.4537894,9.6954804 11.1067078,9.7297821 10.8364141,9.59747554 C10.7918771,9.5764745 10.7504116,9.55057322 10.7112498,9.5218718 C10.6920528,9.50717107 10.6743915,9.49107027 10.6559624,9.47566951 L8.48363095,7.49527138 C8.43909393,7.45046916 8.4252721,7.43996864 8.38841387,7.38956614 C8.23483795,7.18025577 8.2179446,6.89534166 8.34925201,6.67063052 C8.49130974,6.42911856 8.79692584,6.27651099 9.10177405,6.30381235 C9.25227846,6.31711301 9.39740771,6.37171571 9.51412541,6.45922005 C9.5333224,6.47392077 9.55098363,6.49002157 9.56941274,6.50542234 L11.1988533,7.9901959 L14.9990896,4.52572424 L15.0551448,4.47952195 C15.0751097,4.46552126 15.0950746,4.45082053 15.1158073,4.43821991 C15.1995062,4.38711738 15.2939554,4.35141561 15.392244,4.33391474 C15.4582816,4.32201415 15.475175,4.32341422 15.5419805,4.32061408 C15.5673205,4.32131412 15.5926606,4.32271419 15.6180006,4.32341422 L15.6180006,4.32341422 Z" id="icons/deliver--path-3"></path>
+    </defs>
+    <g id="icons/deliver--Guidelines" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icons/deliver--Artboard" transform="translate(-65.000000, -454.000000)">
+            <g id="icons/deliver--icons/bg-filled/oval/deliver" transform="translate(65.000000, 454.000000)">
+                <mask id="icons/deliver--mask-2" fill="white">
+                    <use xlink:href="#icons/deliver--path-1"></use>
+                </mask>
+                <use id="icons/deliver--Oval" fill="#D8D8D8" fill-rule="evenodd" xlink:href="#icons/deliver--path-1"></use>
+                <g id="icons/deliver--color/turteal/base-017FA3" mask="url(#icons/deliver--mask-2)" fill="#017FA3" fill-rule="evenodd" stroke="#017FA3" stroke-width="1">
+                    <rect id="icons/deliver--turteal-017FA3" x="0.5" y="0.5" width="63" height="63"></rect>
+                </g>
+                <g id="icons/deliver--icons/deliver" mask="url(#icons/deliver--mask-2)">
+                    <g transform="translate(10.666667, 16.000000)">
+                        <mask id="icons/deliver--mask-4" fill="white">
+                            <use xlink:href="#icons/deliver--path-3"></use>
+                        </mask>
+                        <use id="icons/deliver--truck" stroke="none" fill="#1A1A1A" fill-rule="evenodd" xlink:href="#icons/deliver--path-3"></use>
+                        <g id="icons/deliver--color/black-tint/95-F2F2F2" stroke="none" fill="none" mask="url(#icons/deliver--mask-4)" fill-rule="evenodd">
+                            <rect id="icons/deliver--gray-5-F2F2F2" fill="#F2F2F2" x="0" y="0" width="43" height="30"></rect>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/client/src/images/details.svg b/client/src/images/details.svg
new file mode 100644
index 000000000..6999ed525
--- /dev/null
+++ b/client/src/images/details.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>icons/details</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <circle id="icons/details--path-1" cx="32" cy="32" r="32"></circle>
+        <path d="M32,4.09411765 L32,24.9058824 C32,27.1670011 30.1710356,29 27.9148936,29 L4.08510638,29 C1.82896443,29 3.02358611e-16,27.1670011 0,24.9058824 L0,4.09411765 C3.02358611e-16,1.83299891 1.82896443,0 4.08510638,0 L27.9148936,0 C30.1710356,2.42420463e-15 32,1.83299891 32,4.09411765 Z M4.08510638,1.36470588 C2.58101175,1.36470588 1.36170213,2.58670515 1.36170213,4.09411765 L1.36170213,22.6882353 L30.6382979,22.6882353 L30.6382979,4.09411765 C30.6382979,2.58670515 29.4189883,1.36470588 27.9148936,1.36470588 L4.08510638,1.36470588 Z M27.9148936,27.6352941 C29.4189883,27.6352941 30.6382979,26.4132948 30.6382979,24.9058824 L30.6382979,24.0529412 L1.36170213,24.0529412 L1.36170213,24.9058824 C1.36170213,26.4132948 2.58101175,27.6352941 4.08510638,27.6352941 L27.9148936,27.6352941 Z M8.33829661,6.9047619 C7.95936151,6.9047619 7.65217391,6.59562518 7.65217391,6.21428571 C7.65217391,5.83294624 7.95936151,5.52380952 8.33829661,5.52380952 L13.2269208,5.52380952 C13.6058559,5.52380952 13.9130435,5.83294624 13.9130435,6.21428571 C13.9130435,6.59562518 13.6058559,6.9047619 13.2269208,6.9047619 L8.33829661,6.9047619 Z M5.56521739,7.5952381 C5.1810193,7.5952381 4.86956522,7.25412171 4.86956522,6.83333333 L4.86956522,5.5952381 C4.86956522,5.17444971 5.1810193,4.83333333 5.56521739,4.83333333 C5.94941548,4.83333333 6.26086957,5.17444971 6.26086957,5.5952381 L6.26086957,6.83333333 C6.26086957,7.25412171 5.94941548,7.5952381 5.56521739,7.5952381 Z M21.5556879,6.9047619 C21.1767528,6.9047619 20.8695652,6.59562518 20.8695652,6.21428571 C20.8695652,5.83294624 21.1767528,5.52380952 21.5556879,5.52380952 L26.4443121,5.52380952 C26.8232472,5.52380952 27.1304348,5.83294624 27.1304348,6.21428571 C27.1304348,6.59562518 26.8232472,6.9047619 26.4443121,6.9047619 L21.5556879,6.9047619 Z M18.7826087,7.5952381 C18.3984106,7.5952381 18.0869565,7.25412171 18.0869565,6.83333333 L18.0869565,5.5952381 C18.0869565,5.17444971 18.3984106,4.83333333 18.7826087,4.83333333 C19.1668068,4.83333333 19.4782609,5.17444971 19.4782609,5.5952381 L19.4782609,6.83333333 C19.4782609,7.25412171 19.1668068,7.5952381 18.7826087,7.5952381 Z M8.33829661,13.1190476 C7.95936151,13.1190476 7.65217391,12.8099109 7.65217391,12.4285714 C7.65217391,12.047232 7.95936151,11.7380952 8.33829661,11.7380952 L13.2269208,11.7380952 C13.6058559,11.7380952 13.9130435,12.047232 13.9130435,12.4285714 C13.9130435,12.8099109 13.6058559,13.1190476 13.2269208,13.1190476 L8.33829661,13.1190476 Z M5.56521739,13.8095238 C5.1810193,13.8095238 4.86956522,13.4684074 4.86956522,13.047619 L4.86956522,11.8095238 C4.86956522,11.3887354 5.1810193,11.047619 5.56521739,11.047619 C5.94941548,11.047619 6.26086957,11.3887354 6.26086957,11.8095238 L6.26086957,13.047619 C6.26086957,13.4684074 5.94941548,13.8095238 5.56521739,13.8095238 Z M21.5556879,13.1190476 C21.1767528,13.1190476 20.8695652,12.8099109 20.8695652,12.4285714 C20.8695652,12.047232 21.1767528,11.7380952 21.5556879,11.7380952 L26.4443121,11.7380952 C26.8232472,11.7380952 27.1304348,12.047232 27.1304348,12.4285714 C27.1304348,12.8099109 26.8232472,13.1190476 26.4443121,13.1190476 L21.5556879,13.1190476 Z M18.7826087,13.8095238 C18.3984106,13.8095238 18.0869565,13.4684074 18.0869565,13.047619 L18.0869565,11.8095238 C18.0869565,11.3887354 18.3984106,11.047619 18.7826087,11.047619 C19.1668068,11.047619 19.4782609,11.3887354 19.4782609,11.8095238 L19.4782609,13.047619 C19.4782609,13.4684074 19.1668068,13.8095238 18.7826087,13.8095238 Z M8.33829661,18.6428571 C7.95936151,18.6428571 7.65217391,18.3337204 7.65217391,17.952381 C7.65217391,17.5710415 7.95936151,17.2619048 8.33829661,17.2619048 L13.2269208,17.2619048 C13.6058559,17.2619048 13.9130435,17.5710415 13.9130435,17.952381 C13.9130435,18.3337204 13.6058559,18.6428571 13.2269208,18.6428571 L8.33829661,18.6428571 Z M5.56521739,19.3333333 C5.1810193,19.3333333 4.86956522,18.992217 4.86956522,18.5714286 L4.86956522,17.3333333 C4.86956522,16.912545 5.1810193,16.5714286 5.56521739,16.5714286 C5.94941548,16.5714286 6.26086957,16.912545 6.26086957,17.3333333 L6.26086957,18.5714286 C6.26086957,18.992217 5.94941548,19.3333333 5.56521739,19.3333333 Z M21.5556879,18.6428571 C21.1767528,18.6428571 20.8695652,18.3337204 20.8695652,17.952381 C20.8695652,17.5710415 21.1767528,17.2619048 21.5556879,17.2619048 L26.4443121,17.2619048 C26.8232472,17.2619048 27.1304348,17.5710415 27.1304348,17.952381 C27.1304348,18.3337204 26.8232472,18.6428571 26.4443121,18.6428571 L21.5556879,18.6428571 Z M18.7826087,19.3333333 C18.3984106,19.3333333 18.0869565,18.992217 18.0869565,18.5714286 L18.0869565,17.3333333 C18.0869565,16.912545 18.3984106,16.5714286 18.7826087,16.5714286 C19.1668068,16.5714286 19.4782609,16.912545 19.4782609,17.3333333 L19.4782609,18.5714286 C19.4782609,18.992217 19.1668068,19.3333333 18.7826087,19.3333333 Z" id="icons/details--path-3"></path>
+    </defs>
+    <g id="icons/details--Guidelines" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icons/details--Artboard" transform="translate(-65.000000, -210.000000)">
+            <g id="icons/details--icons/bg-filled/oval/details" transform="translate(65.000000, 210.000000)">
+                <mask id="icons/details--mask-2" fill="white">
+                    <use xlink:href="#icons/details--path-1"></use>
+                </mask>
+                <use id="icons/details--Oval" fill="#333333" fill-rule="evenodd" xlink:href="#icons/details--path-1"></use>
+                <g id="icons/details--color/turteal/base-017FA3" mask="url(#icons/details--mask-2)" fill="#017FA3" fill-rule="evenodd" stroke="#017FA3" stroke-width="1">
+                    <rect id="icons/details--turteal-017FA3" x="0.5" y="0.5" width="63" height="63"></rect>
+                </g>
+                <g id="icons/details--icons/details" mask="url(#icons/details--mask-2)">
+                    <g transform="translate(16.000000, 17.333333)">
+                        <mask id="icons/details--mask-4" fill="white">
+                            <use xlink:href="#icons/details--path-3"></use>
+                        </mask>
+                        <use id="icons/details--Combined-Shape" stroke="none" fill="#1A1A1A" fill-rule="nonzero" xlink:href="#icons/details--path-3"></use>
+                        <g id="icons/details--color/white-FDFDFD" stroke="none" fill="none" mask="url(#icons/details--mask-4)" fill-rule="evenodd">
+                            <rect id="icons/details--white-FDFDFD" fill="#FDFDFD" x="0" y="0" width="33" height="29"></rect>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/client/src/images/edit.svg b/client/src/images/edit.svg
new file mode 100644
index 000000000..17e9d5714
--- /dev/null
+++ b/client/src/images/edit.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>icons/edit</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M23.1333333,2.73333333 L21.2333333,0.833333333 C20.2,-0.2 18.5,-0.2 17.4666667,0.833333333 L2.4,15.9333333 C2.13333333,16.2 1.96666667,16.5666667 1.93333333,16.9 L0.1,23.0333333 C0.0333333333,23.2666667 0.1,23.5333333 0.266666667,23.7 C0.4,23.8333333 0.566666667,23.9 0.733333333,23.9 C0.8,23.9 0.866666667,23.9 0.933333333,23.8666667 L7.1,22.0333333 C7.46666667,22 7.8,21.8333333 8.06666667,21.5666667 L23.1666667,6.46666667 C24.1666667,5.46666667 24.1666667,3.8 23.1333333,2.73333333 Z M2.8,18.7 L5.3,21.2 L1.73333333,22.2666667 L2.8,18.7 Z M22.2,5.56666667 L20.6666667,7.1 L16.9,3.33333333 L18.4333333,1.8 C18.9666667,1.26666667 19.8,1.26666667 20.3333333,1.8 L22.2333333,3.7 C22.7,4.2 22.7,5.06666667 22.2,5.56666667 Z" id="icons/edit--path-1"></path>
+    </defs>
+    <g id="icons/edit--Guidelines" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icons/edit--Artboard" transform="translate(-192.000000, -112.000000)">
+            <g id="icons/edit--icons/edit" transform="translate(192.000000, 112.000000)">
+                <mask id="icons/edit--mask-2" fill="white">
+                    <use xlink:href="#icons/edit--path-1"></use>
+                </mask>
+                <use id="icons/edit--edit" fill="#1A1A1A" fill-rule="nonzero" xlink:href="#icons/edit--path-1"></use>
+                <g id="icons/edit--color/turteal/base-017FA3" mask="url(#icons/edit--mask-2)" fill="#017FA3" fill-rule="evenodd" stroke="#017FA3" stroke-width="1">
+                    <rect id="icons/edit--turteal-017FA3" x="0.5" y="0.5" width="23" height="23"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/client/src/images/file-pdf.svg b/client/src/images/file-pdf.svg
new file mode 100644
index 000000000..d4c3ee737
--- /dev/null
+++ b/client/src/images/file-pdf.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="24px" viewBox="0 0 22 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>icons/file-pdf</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M5.32894737,14.612 C5.75210526,14.612 6.08605263,14.9538947 6.08684211,15.3657895 C6.08684211,15.7312632 5.75210526,16.0790526 5.32894737,16.0790526 L4.275,16.0790526 L4.275,14.612 L5.32894737,14.612 Z M9.57078947,14.6414737 C11.3502632,14.6414737 11.2752632,17.2808421 9.57078947,17.2808421 L8.52315789,17.2808421 L8.52315789,14.6414737 L9.57078947,14.6414737 Z M18.1578947,11.3684211 C18.5928947,11.3684211 18.9473684,11.7 18.9473684,12.1052632 L18.9473684,19.4736842 C18.9473684,19.8789474 18.5928947,20.2105263 18.1578947,20.2105263 L0.789473684,20.2105263 C0.355263158,20.2105263 7.531753e-13,19.8789474 7.531753e-13,19.4736842 L7.531753e-13,12.1052632 C7.531753e-13,11.7 0.355263158,11.3684211 0.789473684,11.3684211 L18.1578947,11.3684211 Z M5.32894737,16.8158947 C6.15,16.8158947 6.88815789,16.2971579 6.88894737,15.3657895 C6.88894737,14.3821053 6.15,13.8692632 5.32894737,13.8692632 L3.87078947,13.8692632 C3.60631579,13.8692632 3.44210526,14.0822105 3.44210526,14.2767368 L3.44210526,17.5932632 C3.44210526,17.8533684 3.66236842,18 3.87078947,18 C4.09815789,18 4.275,17.8533684 4.275,17.594 L4.275,16.8158947 L5.32894737,16.8158947 Z M9.62763158,18 C12.3923684,18 12.4555263,13.9230526 9.57078947,13.9230526 L8.12526316,13.9230526 C7.91684211,13.9230526 7.68947368,14.0763158 7.68947368,14.2885263 L7.68947368,17.6345263 C7.68947368,17.8931579 7.91684211,18 8.12526316,18 L9.62763158,18 Z M15.2526316,14.6886316 C15.5305263,14.6886316 15.6939474,14.4771579 15.6939474,14.2877895 C15.6939474,14.0755789 15.5305263,13.9223158 15.2526316,13.9223158 L13.0365789,13.9223158 C12.7594737,13.9223158 12.5881579,14.0755789 12.5881579,14.2877895 L12.5881579,17.6337895 C12.5881579,17.8401053 12.7586842,17.9992632 13.0365789,17.9992632 C13.2576316,17.9992632 13.4147368,17.8401053 13.4147368,17.6337895 L13.4147368,16.3966316 L15.0244737,16.3966316 C15.2526316,16.3966316 15.4792105,16.2382105 15.4792105,16.0436842 C15.4792105,15.8373684 15.2526316,15.6251579 15.0244737,15.6251579 L13.4147368,15.6251579 L13.4147368,14.6886316 L15.2526316,14.6886316 Z M20.6842105,5.6895 C21.1421053,6.12375 21.4736842,6.88575 21.4736842,7.5 L21.4736842,21.75 C21.4736842,22.9905 20.4110526,24 19.1052632,24 L4.89473684,24 C3.58894737,24 2.52631579,22.9905 2.52631579,21.75 C2.52631579,21.33525 2.87921053,21 3.31578947,21 C3.75236842,21 4.10526316,21.33525 4.10526316,21.75 C4.10526316,22.16325 4.45894737,22.5 4.89473684,22.5 L19.1052632,22.5 C19.5418421,22.5 19.8947368,22.16325 19.8947368,21.75 L19.8947368,9 C19.8947368,8.172 19.1881579,7.5 18.3157895,7.5 L15.3552632,7.5 C14.3794737,7.5 13.5789474,6.741 13.5789474,5.8125 L13.5789474,3 C13.5789474,2.172 12.8723684,1.5 12,1.5 L4.89473684,1.5 C4.45894737,1.5 4.10526316,1.83675 4.10526316,2.25 L4.10526316,9.75 C4.10526316,10.16475 3.75236842,10.5 3.31578947,10.5 C2.87921053,10.5 2.52631579,10.16475 2.52631579,9.75 L2.52631579,2.25 C2.52631579,1.0095 3.58894737,0 4.89473684,0 L13.5789474,0 C14.2263158,0 15.0284211,0.315 15.4847368,0.75 L20.6842105,5.6895 Z" id="icons/file-pdf--path-1"></path>
+    </defs>
+    <g id="icons/file-pdf--Guidelines" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icons/file-pdf--Artboard" transform="translate(-233.000000, -112.000000)">
+            <g id="icons/file-pdf--icons/file-pdf" transform="translate(233.000000, 112.000000)">
+                <mask id="icons/file-pdf--mask-2" fill="white">
+                    <use xlink:href="#icons/file-pdf--path-1"></use>
+                </mask>
+                <use id="icons/file-pdf--Combined-Shape" fill="#1A1A1A" fill-rule="nonzero" xlink:href="#icons/file-pdf--path-1"></use>
+                <g id="icons/file-pdf--color/black-tint/40-666666" mask="url(#icons/file-pdf--mask-2)" fill="#666666" fill-rule="evenodd">
+                    <rect id="icons/file-pdf--gray-60-666666" x="0" y="0" width="22" height="25"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/client/src/images/grant.svg b/client/src/images/grant.svg
new file mode 100644
index 000000000..a18423d47
--- /dev/null
+++ b/client/src/images/grant.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>badges/grant</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <circle id="badges/grant--path-1" cx="12" cy="12" r="12"></circle>
+        <path d="M9,14.4764474 L8.58612494,19.6181085 L8.24360764,19.955592 C8.12943521,20.0747039 7.98671967,19.93574 8.00099123,19.7570723 L8.45768095,14 C8.6289396,14.1786678 8.8144698,14.3374835 9,14.4764474 Z M15,14.4771174 C15.1855302,14.3379582 15.3710604,14.1590391 15.542319,14 L15.9990088,19.7651688 C16.0132803,19.9440878 15.8705648,20.0633672 15.7563924,19.9639677 L15.4138751,19.6260095 L15,14.4771174 Z M14.4747475,14 L15,19 L12.1313131,16.9752066 C12.0505051,16.9132231 11.9494949,16.9132231 11.8686869,16.9752066 L9,19 L9.54545455,14 C10.2929293,14.3512397 11.1212121,14.5578512 12.010101,14.5578512 C12.8989899,14.5578512 13.7272727,14.3512397 14.4747475,14 Z M12,4 C14.7615063,4 17,6.23849372 17,9 C17,11.7615063 14.7615063,14 12,14 C9.23849372,14 7,11.7615063 7,9 C7,6.23849372 9.23849372,4 12,4 Z M12,12.4728033 C13.9246862,12.4728033 15.4728033,10.9246862 15.4728033,9 C15.4728033,7.07531381 13.9246862,5.52719665 12,5.52719665 C10.0753138,5.52719665 8.52719665,7.07531381 8.52719665,9 C8.52719665,10.9246862 10.0753138,12.4728033 12,12.4728033 Z M12,7 L12.6168224,8.31372549 L14,8.52941176 L13.0093458,9.54901961 L13.2336449,11 L12,10.3137255 L10.7663551,11 L10.9906542,9.54901961 L10,8.52941176 L11.3831776,8.31372549 L12,7 Z" id="badges/grant--path-3"></path>
+    </defs>
+    <g id="badges/grant--Guidelines" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="badges/grant--Artboard" transform="translate(-243.000000, -229.000000)">
+            <g id="badges/grant--badges/grant" transform="translate(243.000000, 229.000000)">
+                <g id="badges/grant--oval" stroke-width="1" fill-rule="evenodd">
+                    <mask id="badges/grant--mask-2" fill="white">
+                        <use xlink:href="#badges/grant--path-1"></use>
+                    </mask>
+                    <use id="badges/grant--Mask" fill="#D8D8D8" xlink:href="#badges/grant--path-1"></use>
+                    <g id="badges/grant--color/turteal/base-017FA3" mask="url(#badges/grant--mask-2)" fill="#017FA3" stroke="#017FA3">
+                        <rect id="badges/grant--turteal-017FA3" x="0.5" y="0.5" width="23" height="23"></rect>
+                    </g>
+                </g>
+                <mask id="badges/grant--mask-4" fill="white">
+                    <use xlink:href="#badges/grant--path-3"></use>
+                </mask>
+                <use id="badges/grant--Combined-Shape" fill="#1A1A1A" fill-rule="nonzero" xlink:href="#badges/grant--path-3"></use>
+                <g id="badges/grant--color/black-tint/95-F2F2F2" mask="url(#badges/grant--mask-4)" fill="#F2F2F2" fill-rule="evenodd">
+                    <g transform="translate(-1.000000, 0.000000)" id="badges/grant--gray-5-F2F2F2">
+                        <rect x="0" y="0" width="24" height="24"></rect>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/client/src/images/info-blue.svg b/client/src/images/info-blue.svg
new file mode 100644
index 000000000..bdc0f399a
--- /dev/null
+++ b/client/src/images/info-blue.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>icons/info-blue</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M12,24 C5.372583,24 0,18.627417 0,12 C0,5.372583 5.372583,0 12,0 C18.627417,0 24,5.372583 24,12 C24,18.627417 18.627417,24 12,24 Z M12.0765662,7.32786885 C12.1461721,7.44262352 12.2442517,7.5 12.3708079,7.5 L14.1362581,7.5 C14.2628143,7.5 14.3798771,7.44262352 14.4874498,7.32786885 C14.5950226,7.21311418 14.6614636,7.07377131 14.6867749,6.90983607 L14.9905082,5.1147541 C15.0158195,4.93442533 14.9905086,4.78688582 14.9145749,4.67213115 C14.8386412,4.55737648 14.7373977,4.5 14.6108415,4.5 L12.8643747,4.5 C12.7251628,4.5 12.6017724,4.5614748 12.4941996,4.68442623 C12.3866268,4.80737766 12.3265135,4.95081885 12.3138579,5.1147541 L12.0101246,6.90983607 C11.9848133,7.07377131 12.0069603,7.21311418 12.0765662,7.32786885 Z M9.0775295,19.3586538 C9.14801111,19.4528851 9.25373195,19.5 9.39469518,19.5 L11.028579,19.5 C11.1567274,19.5 11.2720592,19.4528851 11.3745779,19.3586538 C11.4770966,19.2644226 11.5411699,19.1500007 11.5667995,19.0153846 L13.4890158,9.48461538 C13.5146455,9.34999933 13.4954235,9.23557739 13.4313493,9.14134615 C13.3672751,9.04711491 13.2711653,9 13.1430169,9 L11.5091331,9 C11.3809847,9 11.2624492,9.04374956 11.1535231,9.13125 C11.0445969,9.21875044 10.97732,9.33653772 10.9516903,9.48461538 L9.01025193,19.0153846 C8.98462225,19.1500007 9.00704788,19.2644226 9.0775295,19.3586538 Z" id="icons/info-blue--path-1"></path>
+    </defs>
+    <g id="icons/info-blue--Guidelines" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icons/info-blue--Artboard" transform="translate(-243.000000, -66.000000)">
+            <g id="icons/info-blue--icons/info" transform="translate(247.000000, 68.000000)">
+                <g id="icons/info-blue--color/gray/70-4A4A4A">
+                    <mask id="icons/info-blue--mask-2" fill="white">
+                        <use xlink:href="#icons/info-blue--path-1"></use>
+                    </mask>
+                    <use id="icons/info-blue--Combined-Shape" fill="#002F6C" xlink:href="#icons/info-blue--path-1"></use>
+                    <g id="icons/info-blue--color/info/blue-002f6c" mask="url(#icons/info-blue--mask-2)" fill="#002F6C">
+                        <g transform="translate(0.000000, 0.000000)" id="icons/info-blue--info-002f6c">
+                            <rect x="0" y="0" width="24" height="24"></rect>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/client/src/images/info-white.svg b/client/src/images/info-white.svg
new file mode 100644
index 000000000..6f2aaf5d5
--- /dev/null
+++ b/client/src/images/info-white.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>icons/info-white</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M12,24 C5.372583,24 0,18.627417 0,12 C0,5.372583 5.372583,0 12,0 C18.627417,0 24,5.372583 24,12 C24,18.627417 18.627417,24 12,24 Z M12.0765662,7.32786885 C12.1461721,7.44262352 12.2442517,7.5 12.3708079,7.5 L14.1362581,7.5 C14.2628143,7.5 14.3798771,7.44262352 14.4874498,7.32786885 C14.5950226,7.21311418 14.6614636,7.07377131 14.6867749,6.90983607 L14.9905082,5.1147541 C15.0158195,4.93442533 14.9905086,4.78688582 14.9145749,4.67213115 C14.8386412,4.55737648 14.7373977,4.5 14.6108415,4.5 L12.8643747,4.5 C12.7251628,4.5 12.6017724,4.5614748 12.4941996,4.68442623 C12.3866268,4.80737766 12.3265135,4.95081885 12.3138579,5.1147541 L12.0101246,6.90983607 C11.9848133,7.07377131 12.0069603,7.21311418 12.0765662,7.32786885 Z M9.0775295,19.3586538 C9.14801111,19.4528851 9.25373195,19.5 9.39469518,19.5 L11.028579,19.5 C11.1567274,19.5 11.2720592,19.4528851 11.3745779,19.3586538 C11.4770966,19.2644226 11.5411699,19.1500007 11.5667995,19.0153846 L13.4890158,9.48461538 C13.5146455,9.34999933 13.4954235,9.23557739 13.4313493,9.14134615 C13.3672751,9.04711491 13.2711653,9 13.1430169,9 L11.5091331,9 C11.3809847,9 11.2624492,9.04374956 11.1535231,9.13125 C11.0445969,9.21875044 10.97732,9.33653772 10.9516903,9.48461538 L9.01025193,19.0153846 C8.98462225,19.1500007 9.00704788,19.2644226 9.0775295,19.3586538 Z" id="icons/info-white--path-1"></path>
+    </defs>
+    <g id="icons/info-white--Guidelines" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icons/info-white--Artboard" transform="translate(-282.000000, -68.000000)">
+            <g id="icons/info-white--icons/info" transform="translate(282.000000, 68.000000)">
+                <g id="icons/info-white--color/gray/70-4A4A4A">
+                    <mask id="icons/info-white--mask-2" fill="white">
+                        <use xlink:href="#icons/info-white--path-1"></use>
+                    </mask>
+                    <use id="icons/info-white--Combined-Shape" fill="#002F6C" xlink:href="#icons/info-white--path-1"></use>
+                    <g id="icons/info-white--color/white-FDFDFD" mask="url(#icons/info-white--mask-2)" fill="#FDFDFD">
+                        <g transform="translate(0.000000, 0.000000)" id="icons/info-white--white-FDFDFD">
+                            <rect x="0" y="0" width="24" height="24"></rect>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/client/src/images/mta.svg b/client/src/images/mta.svg
new file mode 100644
index 000000000..30ded6c6a
--- /dev/null
+++ b/client/src/images/mta.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>icons/mta</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <circle id="icons/mta--path-1" cx="32" cy="32" r="32"></circle>
+        <path d="M8.73443793,27.7867724 C8.5494066,27.9620911 8.25301012,27.958198 8.07290763,27.7778183 C7.89293835,27.5975684 7.89693471,27.3088312 8.08209925,27.1333828 C8.1990593,27.0224299 8.30829306,26.9228966 8.40966732,26.8337449 C8.5224978,26.7347308 8.63412937,26.6410372 8.74336313,26.5527939 C8.94264814,26.3921392 9.23811213,26.4193908 9.40302847,26.613526 C9.5679448,26.8076613 9.5399703,27.0954901 9.3406853,27.2561448 C9.23837856,27.3386782 9.13660466,27.4241963 9.03642931,27.5119205 C8.92892731,27.606263 8.82741984,27.6982696 8.73430472,27.7866427 L8.73443793,27.7867724 Z M30.873057,6.03506211 L30.7654218,6.28928063 L31.4381419,6.55985012 C31.6700638,6.65315441 31.8415075,6.82951121 31.9303599,7.03766155 C32.0192122,7.24581189 32.0268053,7.48809162 31.9312923,7.71324176 L29.1323771,14.3181219 C29.0341999,14.5507987 28.7609823,14.6617516 28.5222666,14.5661115 C28.2834176,14.4704713 28.1695215,14.204314 28.2676986,13.971767 L31.0562234,7.39154308 L30.4088135,7.13122539 L29.943904,8.22829706 L29.9423054,8.23193061 L23.2637268,23.9920516 C23.2469421,24.0317611 23.2250953,24.0680966 23.1989858,24.1002794 L20.4379027,27.513348 C20.4193863,27.5363172 20.3990048,27.5569506 20.3772913,27.5755076 C18.4671659,29.3887774 17.4688759,28.448078 16.2232114,27.2734041 C15.1308738,26.2434233 13.7934263,24.982842 11.007033,26.2181183 C10.7712479,26.322453 10.4929682,26.221103 10.3858659,25.9914109 C10.2787635,25.7617188 10.382802,25.4906302 10.6185871,25.3862955 C13.984319,23.8943352 15.5756683,25.3943412 16.8756833,26.6200145 C17.7333015,27.4287383 18.4252041,28.08096 19.623978,27.0151628 L20.1181942,22.8627971 C20.1244551,22.8093321 20.1400409,22.759241 20.1629534,22.7134324 L24.9378007,11.445803 C24.8529448,11.5631146 24.7126726,11.6398084 24.5541505,11.6398084 C24.2951865,11.6398084 24.0851114,11.4351619 24.0851114,11.1828899 L24.0851114,3.91333017 C24.0851114,3.08929361 23.7383608,2.33909591 23.1802029,1.79536155 C22.6220451,1.25162719 21.8522135,0.913837082 21.0060515,0.913837082 L4.0653608,0.913837082 C4.32991963,1.27239031 4.48631041,1.7116602 4.48631041,2.18505947 L4.48631041,10.2048169 L4.48631041,25.1538783 L4.48631041,31.0861629 L22.3809315,31.0861629 L24.0851114,31.0861629 L24.0851114,25.1538783 C24.0851114,24.9016063 24.2951865,24.6969597 24.5541505,24.6969597 C24.8131144,24.6969597 25.0231896,24.9016063 25.0231896,25.1538783 L25.0231896,31.5430815 C25.0231896,31.7953534 24.8131144,32 24.5541505,32 L22.3809315,32 L4.01713809,32 C3.75817415,32 3.54809899,31.7953534 3.54809899,31.5430815 L3.54809899,25.1538783 L3.54809899,10.2048169 L3.54809899,5.26423105 L0.469039104,5.26423105 C0.210075168,5.26423105 0,5.05958449 0,4.80731251 L0,2.18518924 C0,1.58396697 0.252303341,1.03737768 0.658599639,0.641580593 L0.660331394,0.641580593 C1.0667609,0.245783504 1.62731658,0 2.24328842,0 L21.0061847,0 C22.1111774,0 23.1157284,0.44043781 23.8435982,1.14936879 C24.571468,1.85842955 25.023456,2.83728117 25.023456,3.91345994 L25.023456,11.1830197 C25.023456,11.2093629 25.0211914,11.2350572 25.0167954,11.2601028 L27.4749546,5.4591449 L27.475221,5.45862582 L27.7609606,4.78434331 C27.9381324,4.36596632 28.2739596,4.05672551 28.6715971,3.89581128 C29.0692346,3.73476729 29.5305475,3.72114149 29.9590901,3.89334566 C30.3884321,4.06593915 30.7060093,4.39308815 30.871192,4.78045022 C31.036508,5.16768252 31.0504952,5.6172042 30.8735898,6.0346728 L30.873057,6.03506211 Z M3.54769935,4.35065351 L3.54769935,2.18544878 C3.54769935,1.83636872 3.40063341,1.51843336 3.16404908,1.28796266 L3.14460014,1.26771861 C2.90974756,1.04905694 2.59150432,0.914226391 2.24262236,0.914226391 C1.88348307,0.914226391 1.5569807,1.05710265 1.32039636,1.28718404 C1.0846113,1.51843336 0.93754536,1.83636872 0.93754536,2.18544878 L0.93754536,4.35065351 L3.54756614,4.35065351 L3.54769935,4.35065351 Z M7.18744813,19.5187659 C6.92848419,19.5187659 6.71840902,19.2201765 6.71840902,18.8520992 C6.71840902,18.484022 6.92848419,18.1854326 7.18744813,18.1854326 L17.8136283,18.1854326 C18.0725922,18.1854326 18.2826674,18.484022 18.2826674,18.8520992 C18.2826674,19.2201765 18.0725922,19.5187659 17.8136283,19.5187659 L7.18744813,19.5187659 Z M7.18744813,15.4754066 C6.92848419,15.4754066 6.71840902,15.1768172 6.71840902,14.80874 C6.71840902,14.4406627 6.92848419,14.1420733 7.18744813,14.1420733 L21.3833076,14.1420733 C21.6422715,14.1420733 21.8523467,14.4406627 21.8523467,14.80874 C21.8523467,15.1768172 21.6422715,15.4754066 21.3833076,15.4754066 L7.18744813,15.4754066 Z M7.18744813,11.4320474 C6.92848419,11.4320474 6.71840902,11.133458 6.71840902,10.7653807 C6.71840902,10.3973035 6.92848419,10.0987141 7.18744813,10.0987141 L21.3833076,10.0987141 C21.6422715,10.0987141 21.8523467,10.3973035 21.8523467,10.7653807 C21.8523467,11.133458 21.6422715,11.4320474 21.3833076,11.4320474 L7.18744813,11.4320474 Z M7.18744813,7.38868815 C6.92848419,7.38868815 6.71840902,7.09009874 6.71840902,6.72202148 C6.71840902,6.35394423 6.92848419,6.05535482 7.18744813,6.05535482 L12.9155599,6.05535482 C13.1745238,6.05535482 13.384599,6.35394423 13.384599,6.72202148 C13.384599,7.09009874 13.1745238,7.38868815 12.9155599,7.38868815 L7.18744813,7.38868815 Z M28.5176042,5.3854358 L29.9010098,5.94188758 L30.0082453,5.68883698 C30.0864407,5.50417493 30.0796469,5.30420007 30.0058475,5.13095774 C29.9320481,4.95784518 29.7915096,4.81211399 29.6030147,4.73632858 C29.4135874,4.66015386 29.2081747,4.6667721 29.0303368,4.7387942 C28.8526321,4.81068652 28.7030351,4.94759338 28.6252394,5.13121728 L28.5176042,5.3854358 L28.5176042,5.3854358 Z M29.5442683,6.78383234 L28.1608627,6.22738056 L27.8732582,6.90594547 L29.2566638,7.46239725 L29.5442683,6.78383234 Z M28.7249744,8.30434201 L27.371044,7.74789023 L21.034582,23.0276044 L20.7249744,25.6843762 L22.3886427,23.5836669 L28.7249744,8.30421224 L28.7249744,8.30434201 Z" id="icons/mta--path-3"></path>
+    </defs>
+    <g id="icons/mta--Guidelines" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icons/mta--Artboard" transform="translate(-66.000000, -330.000000)">
+            <g id="icons/mta--icons/bg-filled/oval/mta" transform="translate(66.000000, 330.000000)">
+                <mask id="icons/mta--mask-2" fill="white">
+                    <use xlink:href="#icons/mta--path-1"></use>
+                </mask>
+                <use id="icons/mta--Oval" fill="#D8D8D8" fill-rule="evenodd" xlink:href="#icons/mta--path-1"></use>
+                <g id="icons/mta--color/turteal/base-017FA3" mask="url(#icons/mta--mask-2)" fill="#017FA3" fill-rule="evenodd" stroke="#017FA3" stroke-width="1">
+                    <g transform="translate(0.000000, -1.333333)" id="icons/mta--turteal-017FA3">
+                        <rect x="0.5" y="0.5" width="63" height="64"></rect>
+                    </g>
+                </g>
+                <g id="icons/mta--icons/mta" mask="url(#icons/mta--mask-2)">
+                    <g transform="translate(16.000000, 16.000000)">
+                        <mask id="icons/mta--mask-4" fill="white">
+                            <use xlink:href="#icons/mta--path-3"></use>
+                        </mask>
+                        <use id="icons/mta--Shape" stroke="none" fill="#1A1A1A" fill-rule="nonzero" xlink:href="#icons/mta--path-3"></use>
+                        <g id="icons/mta--color/white-FDFDFD" stroke="none" fill="none" mask="url(#icons/mta--mask-4)" fill-rule="evenodd">
+                            <rect id="icons/mta--white-FDFDFD" fill="#FDFDFD" x="0" y="0" width="32" height="32"></rect>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/client/src/images/organism.svg b/client/src/images/organism.svg
index a87d53ffe..116da7694 100644
--- a/client/src/images/organism.svg
+++ b/client/src/images/organism.svg
@@ -4,31 +4,27 @@
     <title>badges/organism</title>
     <desc>Created with Sketch.</desc>
     <defs>
-        <circle id="path-1" cx="12" cy="12" r="12"></circle>
-        <path d="M9.4979443,10.0716516 C8.67065251,10.0282951 8.05857901,8.87539349 8.13083989,7.49657384 C8.20310077,6.11775418 8.93233229,5.03514741 9.75962408,5.07850393 C10.5869159,5.12186046 11.1989894,6.27476205 11.1267285,7.65358171 C11.0544676,9.03240136 10.3252361,10.1150081 9.4979443,10.0716516 Z M15.0144252,10.1294022 C14.1905362,10.2159964 13.4056448,9.17303832 13.2613212,7.79989013 C13.1169975,6.42674194 13.6678939,5.24338691 14.4917828,5.15679269 C15.3156718,5.07019848 16.1005632,6.11315655 16.2448868,7.48630474 C16.3892105,8.85945293 15.8383141,10.042808 15.0144252,10.1294022 Z M19.8479328,13.9756702 C19.0275678,14.0909649 18.2067558,13.0760345 18.0145979,11.7087597 C17.8224399,10.3414848 18.3317023,9.1396246 19.1520672,9.02432983 C19.9724322,8.90903506 20.7932442,9.92396547 20.9854021,11.2912403 C21.1775601,12.6585152 20.6682977,13.8603754 19.8479328,13.9756702 Z M5.23867884,13.9863047 C4.41478993,13.8997105 3.86389347,12.7163555 4.00821716,11.3432073 C4.15254085,9.97005911 4.93743224,8.92710105 5.76132116,9.01369526 C6.58521007,9.10028948 7.13610653,10.2836445 6.99178284,11.6567927 C6.84745915,13.0299409 6.06256776,14.072899 5.23867884,13.9863047 Z M12.5,16.6204138 C9.46243388,16.6204138 7,19.7244827 7,16.6204138 C7,13.516345 9.46243388,11 12.5,11 C15.5375661,11 18,13.516345 18,16.6204138 C18,19.7244827 15.5375661,16.6204138 12.5,16.6204138 Z" id="path-3"></path>
+        <circle id="badges/organism--path-1" cx="12" cy="12" r="12"></circle>
+        <path d="M9.4979443,10.0716516 C8.67065251,10.0282951 8.05857901,8.87539349 8.13083989,7.49657384 C8.20310077,6.11775418 8.93233229,5.03514741 9.75962408,5.07850393 C10.5869159,5.12186046 11.1989894,6.27476205 11.1267285,7.65358171 C11.0544676,9.03240136 10.3252361,10.1150081 9.4979443,10.0716516 Z M15.0144252,10.1294022 C14.1905362,10.2159964 13.4056448,9.17303832 13.2613212,7.79989013 C13.1169975,6.42674194 13.6678939,5.24338691 14.4917828,5.15679269 C15.3156718,5.07019848 16.1005632,6.11315655 16.2448868,7.48630474 C16.3892105,8.85945293 15.8383141,10.042808 15.0144252,10.1294022 Z M19.8479328,13.9756702 C19.0275678,14.0909649 18.2067558,13.0760345 18.0145979,11.7087597 C17.8224399,10.3414848 18.3317023,9.1396246 19.1520672,9.02432983 C19.9724322,8.90903506 20.7932442,9.92396547 20.9854021,11.2912403 C21.1775601,12.6585152 20.6682977,13.8603754 19.8479328,13.9756702 Z M5.23867884,13.9863047 C4.41478993,13.8997105 3.86389347,12.7163555 4.00821716,11.3432073 C4.15254085,9.97005911 4.93743224,8.92710105 5.76132116,9.01369526 C6.58521007,9.10028948 7.13610653,10.2836445 6.99178284,11.6567927 C6.84745915,13.0299409 6.06256776,14.072899 5.23867884,13.9863047 Z M12.5,16.6204138 C9.46243388,16.6204138 7,19.7244827 7,16.6204138 C7,13.516345 9.46243388,11 12.5,11 C15.5375661,11 18,13.516345 18,16.6204138 C18,19.7244827 15.5375661,16.6204138 12.5,16.6204138 Z" id="badges/organism--path-3"></path>
     </defs>
-    <g id="Search-Resources" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="search-results-other" transform="translate(-703.000000, -433.000000)">
-            <g id="result-card-other-biosample" transform="translate(464.000000, 313.000000)">
-                <g id="organisms" transform="translate(239.000000, 120.000000)">
-                    <g id="badges/organism">
-                        <mask id="mask-2" fill="white">
-                            <use xlink:href="#path-1"></use>
-                        </mask>
-                        <use id="Oval" fill="#017FA3" fill-rule="evenodd" xlink:href="#path-1"></use>
-                        <g id="color/turteal/base-017FA3" mask="url(#mask-2)" fill="#017FA3" fill-rule="evenodd" stroke="#017FA3" stroke-width="1">
-                            <rect id="turteal-017FA3" x="0.5" y="0.5" width="23" height="23"></rect>
-                        </g>
-                        <mask id="mask-4" fill="white">
-                            <use xlink:href="#path-3"></use>
-                        </mask>
-                        <use id="Combined-Shape" fill="#F2F2F2" fill-rule="evenodd" xlink:href="#path-3"></use>
-                        <g id="color/gray/white-FDFDFD" mask="url(#mask-4)" fill="#FDFDFD" fill-rule="evenodd">
-                            <rect id="white-FDFDFD" x="0" y="0" width="24" height="24"></rect>
-                        </g>
-                    </g>
+    <g id="badges/organism--Guidelines" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="badges/organism--Artboard" transform="translate(-321.000000, -229.000000)">
+            <g id="badges/organism--badges/organism" transform="translate(321.000000, 229.000000)">
+                <mask id="badges/organism--mask-2" fill="white">
+                    <use xlink:href="#badges/organism--path-1"></use>
+                </mask>
+                <use id="badges/organism--Oval" fill="#017FA3" fill-rule="evenodd" xlink:href="#badges/organism--path-1"></use>
+                <g id="badges/organism--color/turteal/base-017FA3" mask="url(#badges/organism--mask-2)" fill="#017FA3" fill-rule="evenodd" stroke="#017FA3" stroke-width="1">
+                    <rect id="badges/organism--turteal-017FA3" x="0.5" y="0.5" width="23" height="23"></rect>
+                </g>
+                <mask id="badges/organism--mask-4" fill="white">
+                    <use xlink:href="#badges/organism--path-3"></use>
+                </mask>
+                <use id="badges/organism--Combined-Shape" fill="#F2F2F2" fill-rule="evenodd" xlink:href="#badges/organism--path-3"></use>
+                <g id="badges/organism--color/white-FDFDFD" mask="url(#badges/organism--mask-4)" fill="#FDFDFD" fill-rule="evenodd">
+                    <rect id="badges/organism--white-FDFDFD" x="0" y="0" width="24" height="24"></rect>
                 </g>
             </g>
         </g>
     </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/client/src/images/resource-type.svg b/client/src/images/resource-type.svg
index 0e3ad59d7..e9c50dbaf 100644
--- a/client/src/images/resource-type.svg
+++ b/client/src/images/resource-type.svg
@@ -4,31 +4,27 @@
     <title>badges/resource-type</title>
     <desc>Created with Sketch.</desc>
     <defs>
-        <circle id="path-1" cx="12" cy="12" r="12"></circle>
+        <circle id="badges/resource-type--path-1" cx="12" cy="12" r="12"></circle>
     </defs>
-    <g id="Search-Resources" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="search-results-other" transform="translate(-496.000000, -433.000000)">
-            <g id="result-card-other-biosample" transform="translate(464.000000, 313.000000)">
-                <g id="resource-type" transform="translate(32.000000, 120.000000)">
-                    <g id="badges/resource-type">
-                        <mask id="mask-2" fill="white">
-                            <use xlink:href="#path-1"></use>
-                        </mask>
-                        <use id="Oval" fill="#017FA3" fill-rule="evenodd" xlink:href="#path-1"></use>
-                        <g id="color/turteal/base-017FA3" mask="url(#mask-2)" fill="#017FA3" fill-rule="evenodd" stroke="#017FA3" stroke-width="1">
-                            <rect id="turteal-017FA3" x="0.5" y="0.5" width="23" height="23"></rect>
-                        </g>
-                        <g id="test-tube" stroke-width="1" fill-rule="evenodd" mask="url(#mask-2)" fill="#FDFDFD">
-                            <path d="M14.8003104,10.1878952 L14.8003104,7.29000073 L15.8383494,7.29000073 L15.8383494,4 L8.68822799,4 L8.68822799,7.29000073 L9.18972012,7.29000073 L9.72600538,7.29000073 L9.72600538,10.1878952 C7.48354817,11.1379796 6,13.2910718 6,15.6484484 C6,17.8818575 7.29231669,19.91198 9.37336512,20.9458734 L9.48219179,21 L15.044124,21 L15.1532123,20.9458734 C17.2339991,19.9117306 18.5263158,17.8818575 18.5263158,15.6484484 C18.5263158,13.2910718 17.0427676,11.1377302 14.8003104,10.1878952 Z M14.7956016,20.0426821 L9.73097583,20.0426821 C8.04547048,19.1589465 7.00350745,17.485511 7.00350745,15.648199 C7.00350745,13.5746754 8.37064248,11.6887242 10.404864,10.9561441 L10.7292512,10.8391607 L10.7292512,7.2897513 L12.2630271,7.2897513 L12.2630271,6.33293229 L10.7292512,6.33293229 L9.69147384,6.33293229 L9.69147384,4.95681902 L14.8345803,4.95681902 L14.8345803,6.33293229 L13.796803,6.33293229 L13.796803,10.8391607 L14.1211901,10.9561441 C16.1556733,11.6889737 17.5228083,13.5746754 17.5228083,15.648199 C17.5230699,17.485511 16.4808453,19.1589465 14.7956016,20.0426821 Z" id="Shape" fill-rule="nonzero"></path>
-                            <path d="M16.506352,13.1661826 C15.8346015,13.7686595 13.8211427,15.3181739 12.2632859,13.8449407 C10.9090287,12.5645692 8.98341225,12.9364756 7.99153665,13.2539778 C7.86015731,13.7263451 7.78947368,14.2295127 7.78947368,14.750815 C7.78947368,16.6903706 8.76777598,18.3720096 10.1993754,19.2105263 L14.3271965,19.2105263 C15.7585398,18.3720096 16.7368421,16.6903706 16.7368421,14.750815 C16.7368421,14.1964096 16.6536096,13.6647445 16.506352,13.1661826 Z M9.87976252,16.079258 C9.53428351,16.079258 9.25462223,15.7643465 9.25462223,15.3766081 C9.25462223,14.9888697 9.53453961,14.6739582 9.87976252,14.6739582 C10.2249854,14.6739582 10.5049028,14.9888697 10.5049028,15.3766081 C10.5049028,15.7643465 10.2247293,16.079258 9.87976252,16.079258 Z M11.0690913,17.6414379 C10.8657478,17.6414379 10.7008194,17.4557726 10.7008194,17.2275049 C10.7008194,16.9983736 10.8660039,16.8129961 11.0690913,16.8129961 C11.2726908,16.8129961 11.4376193,16.9986615 11.4376193,17.2275049 C11.4378754,17.4560604 11.2726908,17.6414379 11.0690913,17.6414379 Z M12.9719149,16.3990631 C12.6328384,16.3990631 12.3577869,16.0899086 12.3577869,15.7090787 C12.3577869,15.3282488 12.6328384,15.0190943 12.9719149,15.0190943 C13.3109914,15.0190943 13.5857867,15.3282488 13.5857867,15.7090787 C13.5857867,16.0899086 13.3109914,16.3990631 12.9719149,16.3990631 Z M14.3525504,17.9865741 C14.1658534,17.9865741 14.0147544,17.8164527 14.0147544,17.6071834 C14.0147544,17.3970505 14.1658534,17.2277927 14.3525504,17.2277927 C14.5389912,17.2277927 14.6900903,17.3970505 14.6900903,17.6071834 C14.6903464,17.8167406 14.5389912,17.9865741 14.3525504,17.9865741 Z" id="Shape" fill-rule="nonzero"></path>
-                            <path d="M12.7105263,8.47368421 C12.9578316,8.47368421 13.1578947,8.34252472 13.1578947,8.18143936 L13.1578947,7.87119222 C13.1578947,7.70987306 12.9578316,7.57894737 12.7105263,7.57894737 C12.4635789,7.57894737 12.2631579,7.70987306 12.2631579,7.87119222 L12.2631579,8.18143936 C12.2631579,8.34275852 12.4635789,8.47368421 12.7105263,8.47368421 Z" id="Path" fill-rule="nonzero"></path>
-                            <path d="M12.7105263,12.9473684 C12.9578316,12.9473684 13.1578947,12.8166082 13.1578947,12.6549708 L13.1578947,12.3450292 C13.1578947,12.1833918 12.9578316,12.0526316 12.7105263,12.0526316 C12.4635789,12.0526316 12.2631579,12.1833918 12.2631579,12.3450292 L12.2631579,12.6549708 C12.2631579,12.8166082 12.4635789,12.9473684 12.7105263,12.9473684 Z" id="Path" fill-rule="nonzero"></path>
-                            <path d="M12.7105263,8.47368421 C12.9578316,8.47368421 13.1578947,8.3427243 13.1578947,8.18136297 L13.1578947,7.87126861 C13.1578947,7.70990728 12.9578316,7.57894737 12.7105263,7.57894737 C12.4635789,7.57894737 12.2631579,7.70990728 12.2631579,7.87126861 L12.2631579,8.18136297 C12.2631579,8.3427243 12.4635789,8.47368421 12.7105263,8.47368421 Z" id="Path" fill-rule="nonzero"></path>
-                            <path d="M12.7105263,11.1578947 C12.9578316,11.1578947 13.1578947,11.0269348 13.1578947,10.8655735 L13.1578947,10.5554791 C13.1578947,10.3941178 12.9578316,10.2631579 12.7105263,10.2631579 C12.4635789,10.2631579 12.2631579,10.3941178 12.2631579,10.5554791 L12.2631579,10.8655735 C12.2631579,11.0271687 12.4635789,11.1578947 12.7105263,11.1578947 Z" id="Path" fill-rule="nonzero"></path>
-                        </g>
-                    </g>
+    <g id="badges/resource-type--Guidelines" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="badges/resource-type--Artboard" transform="translate(-282.000000, -229.000000)">
+            <g id="badges/resource-type--badges/resource-type" transform="translate(282.000000, 229.000000)">
+                <mask id="badges/resource-type--mask-2" fill="white">
+                    <use xlink:href="#badges/resource-type--path-1"></use>
+                </mask>
+                <use id="badges/resource-type--Oval" fill="#017FA3" fill-rule="evenodd" xlink:href="#badges/resource-type--path-1"></use>
+                <g id="badges/resource-type--color/turteal/base-017FA3" mask="url(#badges/resource-type--mask-2)" fill="#017FA3" fill-rule="evenodd" stroke="#017FA3" stroke-width="1">
+                    <rect id="badges/resource-type--turteal-017FA3" x="0.5" y="0.5" width="23" height="23"></rect>
+                </g>
+                <g id="badges/resource-type--test-tube" stroke-width="1" fill-rule="evenodd" mask="url(#badges/resource-type--mask-2)" fill="#FDFDFD">
+                    <path d="M14.8003104,10.1878952 L14.8003104,7.29000073 L15.8383494,7.29000073 L15.8383494,4 L8.68822799,4 L8.68822799,7.29000073 L9.18972012,7.29000073 L9.72600538,7.29000073 L9.72600538,10.1878952 C7.48354817,11.1379796 6,13.2910718 6,15.6484484 C6,17.8818575 7.29231669,19.91198 9.37336512,20.9458734 L9.48219179,21 L15.044124,21 L15.1532123,20.9458734 C17.2339991,19.9117306 18.5263158,17.8818575 18.5263158,15.6484484 C18.5263158,13.2910718 17.0427676,11.1377302 14.8003104,10.1878952 Z M14.7956016,20.0426821 L9.73097583,20.0426821 C8.04547048,19.1589465 7.00350745,17.485511 7.00350745,15.648199 C7.00350745,13.5746754 8.37064248,11.6887242 10.404864,10.9561441 L10.7292512,10.8391607 L10.7292512,7.2897513 L12.2630271,7.2897513 L12.2630271,6.33293229 L10.7292512,6.33293229 L9.69147384,6.33293229 L9.69147384,4.95681902 L14.8345803,4.95681902 L14.8345803,6.33293229 L13.796803,6.33293229 L13.796803,10.8391607 L14.1211901,10.9561441 C16.1556733,11.6889737 17.5228083,13.5746754 17.5228083,15.648199 C17.5230699,17.485511 16.4808453,19.1589465 14.7956016,20.0426821 Z" id="badges/resource-type--Shape" fill-rule="nonzero"></path>
+                    <path d="M16.506352,13.1661826 C15.8346015,13.7686595 13.8211427,15.3181739 12.2632859,13.8449407 C10.9090287,12.5645692 8.98341225,12.9364756 7.99153665,13.2539778 C7.86015731,13.7263451 7.78947368,14.2295127 7.78947368,14.750815 C7.78947368,16.6903706 8.76777598,18.3720096 10.1993754,19.2105263 L14.3271965,19.2105263 C15.7585398,18.3720096 16.7368421,16.6903706 16.7368421,14.750815 C16.7368421,14.1964096 16.6536096,13.6647445 16.506352,13.1661826 Z M9.87976252,16.079258 C9.53428351,16.079258 9.25462223,15.7643465 9.25462223,15.3766081 C9.25462223,14.9888697 9.53453961,14.6739582 9.87976252,14.6739582 C10.2249854,14.6739582 10.5049028,14.9888697 10.5049028,15.3766081 C10.5049028,15.7643465 10.2247293,16.079258 9.87976252,16.079258 Z M11.0690913,17.6414379 C10.8657478,17.6414379 10.7008194,17.4557726 10.7008194,17.2275049 C10.7008194,16.9983736 10.8660039,16.8129961 11.0690913,16.8129961 C11.2726908,16.8129961 11.4376193,16.9986615 11.4376193,17.2275049 C11.4378754,17.4560604 11.2726908,17.6414379 11.0690913,17.6414379 Z M12.9719149,16.3990631 C12.6328384,16.3990631 12.3577869,16.0899086 12.3577869,15.7090787 C12.3577869,15.3282488 12.6328384,15.0190943 12.9719149,15.0190943 C13.3109914,15.0190943 13.5857867,15.3282488 13.5857867,15.7090787 C13.5857867,16.0899086 13.3109914,16.3990631 12.9719149,16.3990631 Z M14.3525504,17.9865741 C14.1658534,17.9865741 14.0147544,17.8164527 14.0147544,17.6071834 C14.0147544,17.3970505 14.1658534,17.2277927 14.3525504,17.2277927 C14.5389912,17.2277927 14.6900903,17.3970505 14.6900903,17.6071834 C14.6903464,17.8167406 14.5389912,17.9865741 14.3525504,17.9865741 Z" id="badges/resource-type--Shape" fill-rule="nonzero"></path>
+                    <path d="M12.7105263,8.47368421 C12.9578316,8.47368421 13.1578947,8.34252472 13.1578947,8.18143936 L13.1578947,7.87119222 C13.1578947,7.70987306 12.9578316,7.57894737 12.7105263,7.57894737 C12.4635789,7.57894737 12.2631579,7.70987306 12.2631579,7.87119222 L12.2631579,8.18143936 C12.2631579,8.34275852 12.4635789,8.47368421 12.7105263,8.47368421 Z" id="badges/resource-type--Path" fill-rule="nonzero"></path>
+                    <path d="M12.7105263,12.9473684 C12.9578316,12.9473684 13.1578947,12.8166082 13.1578947,12.6549708 L13.1578947,12.3450292 C13.1578947,12.1833918 12.9578316,12.0526316 12.7105263,12.0526316 C12.4635789,12.0526316 12.2631579,12.1833918 12.2631579,12.3450292 L12.2631579,12.6549708 C12.2631579,12.8166082 12.4635789,12.9473684 12.7105263,12.9473684 Z" id="badges/resource-type--Path" fill-rule="nonzero"></path>
+                    <path d="M12.7105263,8.47368421 C12.9578316,8.47368421 13.1578947,8.3427243 13.1578947,8.18136297 L13.1578947,7.87126861 C13.1578947,7.70990728 12.9578316,7.57894737 12.7105263,7.57894737 C12.4635789,7.57894737 12.2631579,7.70990728 12.2631579,7.87126861 L12.2631579,8.18136297 C12.2631579,8.3427243 12.4635789,8.47368421 12.7105263,8.47368421 Z" id="badges/resource-type--Path" fill-rule="nonzero"></path>
+                    <path d="M12.7105263,11.1578947 C12.9578316,11.1578947 13.1578947,11.0269348 13.1578947,10.8655735 L13.1578947,10.5554791 C13.1578947,10.3941178 12.9578316,10.2631579 12.7105263,10.2631579 C12.4635789,10.2631579 12.2631579,10.3941178 12.2631579,10.5554791 L12.2631579,10.8655735 C12.2631579,11.0271687 12.4635789,11.1578947 12.7105263,11.1578947 Z" id="badges/resource-type--Path" fill-rule="nonzero"></path>
                 </g>
             </g>
         </g>
     </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/client/src/images/warning-black-tint-30.svg b/client/src/images/warning-black-tint-30.svg
new file mode 100644
index 000000000..03d49b7f0
--- /dev/null
+++ b/client/src/images/warning-black-tint-30.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>icons/warning-black-tint-30</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M0,24 L24,24 L12,0 L0,24 Z M13.2857143,20.3076923 L10.7142857,20.3076923 L10.7142857,17.5384615 L13.2857143,17.5384615 L13.2857143,20.3076923 Z M13.2857143,15.6923077 L10.7142857,15.6923077 L10.7142857,10.1538462 L13.2857143,10.1538462 L13.2857143,15.6923077 Z" id="icons/warning-black-tint-30--path-1"></path>
+    </defs>
+    <g id="icons/warning-black-tint-30--Guidelines" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icons/warning-black-tint-30--Artboard" transform="translate(-327.000000, -109.000000)">
+            <g id="icons/warning-black-tint-30--icons/warning" transform="translate(327.000000, 109.000000)">
+                <mask id="icons/warning-black-tint-30--mask-2" fill="white">
+                    <use xlink:href="#icons/warning-black-tint-30--path-1"></use>
+                </mask>
+                <use id="icons/warning-black-tint-30--warning" fill="#000000" fill-rule="nonzero" xlink:href="#icons/warning-black-tint-30--path-1"></use>
+                <g id="icons/warning-black-tint-30--color/black-tint/30-4A4A4A" mask="url(#icons/warning-black-tint-30--mask-2)" fill="#4A4A4A" fill-rule="evenodd">
+                    <rect id="icons/warning-black-tint-30--gray-70-4A4A4A" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/client/src/images/warning-red.svg b/client/src/images/warning-red.svg
new file mode 100644
index 000000000..3c402b94a
--- /dev/null
+++ b/client/src/images/warning-red.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>icons/warning-red</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M0,24 L24,24 L12,0 L0,24 Z M13.2857143,20.3076923 L10.7142857,20.3076923 L10.7142857,17.5384615 L13.2857143,17.5384615 L13.2857143,20.3076923 Z M13.2857143,15.6923077 L10.7142857,15.6923077 L10.7142857,10.1538462 L13.2857143,10.1538462 L13.2857143,15.6923077 Z" id="icons/warning-red--path-1"></path>
+    </defs>
+    <g id="icons/warning-red--Guidelines" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icons/warning-red--Artboard" transform="translate(-287.000000, -109.000000)">
+            <g id="icons/warning-red--icons/warning" transform="translate(287.000000, 109.000000)">
+                <mask id="icons/warning-red--mask-2" fill="white">
+                    <use xlink:href="#icons/warning-red--path-1"></use>
+                </mask>
+                <use id="icons/warning-red--warning" fill="#000000" fill-rule="nonzero" xlink:href="#icons/warning-red--path-1"></use>
+                <g id="icons/warning-red--color/error/red-DB3B28" mask="url(#icons/warning-red--mask-2)" fill="#DB3B28" fill-rule="evenodd">
+                    <rect id="icons/warning-red--error-DB3B28" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/client/src/images/warning-white.svg b/client/src/images/warning-white.svg
new file mode 100644
index 000000000..83f1b8191
--- /dev/null
+++ b/client/src/images/warning-white.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>icons/warning-white</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M0,24 L24,24 L12,0 L0,24 Z M13.2857143,20.3076923 L10.7142857,20.3076923 L10.7142857,17.5384615 L13.2857143,17.5384615 L13.2857143,20.3076923 Z M13.2857143,15.6923077 L10.7142857,15.6923077 L10.7142857,10.1538462 L13.2857143,10.1538462 L13.2857143,15.6923077 Z" id="icons/warning-white--path-1"></path>
+    </defs>
+    <g id="icons/warning-white--Guidelines" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icons/warning-white--Artboard" transform="translate(-368.000000, -109.000000)">
+            <g id="icons/warning-white--icons/warning" transform="translate(368.000000, 109.000000)">
+                <mask id="icons/warning-white--mask-2" fill="white">
+                    <use xlink:href="#icons/warning-white--path-1"></use>
+                </mask>
+                <use id="icons/warning-white--warning" fill="#000000" fill-rule="nonzero" xlink:href="#icons/warning-white--path-1"></use>
+                <g id="icons/warning-white--color/white-FDFDFD" mask="url(#icons/warning-white--mask-2)" fill="#FDFDFD" fill-rule="evenodd">
+                    <rect id="icons/warning-white--white-FDFDFD" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/client/src/theme.js b/client/src/theme.js
index fa8f8cdf3..bf284dc72 100644
--- a/client/src/theme.js
+++ b/client/src/theme.js
@@ -26,6 +26,7 @@ const theme = {
     },
     extend: (props) =>
       !props.role &&
+      !props.plain &&
       `
         ${
           !props.primary &&
@@ -379,12 +380,13 @@ const theme = {
       white: '#FDFDFD',
       info: '#002F6C', // alexs-navy-base
       success: '#41A36D',
+      'success-shade-20': '#348257',
       error: '#DB3B28',
+      'error-shade-20': '#A72A1B',
       warning: '#DACE00', // alexs-lemon-shade-10
       'active-background': 'brand',
       'active-text': 'text-strong',
       'background-highlight': '#F2F2F2',
-
       background: {
         dark: '#111111',
         light: 'white'