diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 00000000..2dc5b675
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,19 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+  - enhancement
+  - bug
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
diff --git a/components/WebsiteDetails.js b/components/WebsiteDetails.js
index 3a933638..e3a7e2c2 100644
--- a/components/WebsiteDetails.js
+++ b/components/WebsiteDetails.js
@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
 import { FormattedMessage } from 'react-intl';
+import { useRouter } from 'next/router';
 import classNames from 'classnames';
 import WebsiteChart from 'components/metrics/WebsiteChart';
 import WorldMap from 'components/common/WorldMap';
@@ -19,12 +20,29 @@ import EventsChart from './metrics/EventsChart';
 import useFetch from 'hooks/useFetch';
 import Loading from 'components/common/Loading';
 
-export default function WebsiteDetails({ websiteId }) {
-  const { data } = useFetch(`/api/website/${websiteId}`);
+const views = {
+  url: PagesTable,
+  referrer: ReferrersTable,
+  browser: BrowsersTable,
+  os: OSTable,
+  device: DevicesTable,
+  country: CountriesTable,
+  event: EventsTable,
+};
+
+export default function WebsiteDetails({ websiteId, token }) {
+  const router = useRouter();
+  const { data } = useFetch(`/api/website/${websiteId}`, { token });
   const [chartLoaded, setChartLoaded] = useState(false);
   const [countryData, setCountryData] = useState();
   const [eventsData, setEventsData] = useState();
-  const [expand, setExpand] = useState();
+  const {
+    query: { id, view },
+    basePath,
+    asPath,
+  } = router;
+
+  const path = `${basePath}/${asPath.split('/')[1]}/${id.join('/')}`;
 
   const BackButton = () => (
     <Button
@@ -32,7 +50,7 @@ export default function WebsiteDetails({ websiteId }) {
       className={styles.backButton}
       icon={<Arrow />}
       size="xsmall"
-      onClick={() => setExpand(null)}
+      onClick={() => router.push(path)}
     >
       <div>
         <FormattedMessage id="button.back" defaultMessage="Back" />
@@ -46,53 +64,43 @@ export default function WebsiteDetails({ websiteId }) {
     },
     {
       label: <FormattedMessage id="metrics.pages" defaultMessage="Pages" />,
-      value: 'url',
-      component: PagesTable,
+      value: `${path}?view=url`,
     },
     {
       label: <FormattedMessage id="metrics.referrers" defaultMessage="Referrers" />,
-      value: 'referrer',
-      component: ReferrersTable,
+      value: `${path}?view=referrer`,
     },
     {
       label: <FormattedMessage id="metrics.browsers" defaultMessage="Browsers" />,
-      value: 'browser',
-      component: BrowsersTable,
+      value: `${path}?view=browser`,
     },
     {
       label: <FormattedMessage id="metrics.operating-systems" defaultMessage="Operating system" />,
-      value: 'os',
-      component: OSTable,
+      value: `${path}?view=os`,
     },
     {
       label: <FormattedMessage id="metrics.devices" defaultMessage="Devices" />,
-      value: 'device',
-      component: DevicesTable,
+      value: `${path}?view=device`,
     },
     {
       label: <FormattedMessage id="metrics.countries" defaultMessage="Countries" />,
-      value: 'country',
-      component: CountriesTable,
+      value: `${path}?view=country`,
     },
     {
       label: <FormattedMessage id="metrics.events" defaultMessage="Events" />,
-      value: 'event',
-      component: EventsTable,
+      value: `${path}?view=event`,
     },
   ];
 
   const tableProps = {
     websiteId,
+    token,
     websiteDomain: data?.domain,
     limit: 10,
     onExpand: handleExpand,
   };
 
-  const DetailsComponent = expand?.component;
-
-  function getSelectedMenuOption(value) {
-    return menuOptions.find(e => e.value === value);
-  }
+  const DetailsComponent = views[view];
 
   function handleDataLoad() {
     if (!chartLoaded) {
@@ -101,11 +109,7 @@ export default function WebsiteDetails({ websiteId }) {
   }
 
   function handleExpand(value) {
-    setExpand(getSelectedMenuOption(value));
-  }
-
-  function handleMenuSelect(value) {
-    setExpand(getSelectedMenuOption(value));
+    router.push(`${path}?view=${value}`);
   }
 
   if (!data) {
@@ -118,6 +122,7 @@ export default function WebsiteDetails({ websiteId }) {
         <div className={classNames(styles.chart, 'col')}>
           <WebsiteChart
             websiteId={websiteId}
+            token={token}
             title={data.name}
             onDataLoad={handleDataLoad}
             showLink={false}
@@ -126,7 +131,7 @@ export default function WebsiteDetails({ websiteId }) {
         </div>
       </div>
       {!chartLoaded && <Loading />}
-      {chartLoaded && !expand && (
+      {chartLoaded && !view && (
         <>
           <div className={classNames(styles.row, 'row')}>
             <div className="col-md-12 col-lg-6">
@@ -162,19 +167,17 @@ export default function WebsiteDetails({ websiteId }) {
               <EventsTable {...tableProps} onDataLoad={setEventsData} />
             </div>
             <div className="col-12 col-md-12 col-lg-8 pt-5 pb-5">
-              <EventsChart websiteId={websiteId} />
+              <EventsChart websiteId={websiteId} token={token} />
             </div>
           </div>
         </>
       )}
-      {expand && (
+      {view && (
         <MenuLayout
-          className={styles.expand}
+          className={styles.view}
           menuClassName={styles.menu}
-          optionClassName={styles.option}
+          contentClassName={styles.content}
           menu={menuOptions}
-          selectedOption={expand.value}
-          onMenuSelect={handleMenuSelect}
         >
           <DetailsComponent {...tableProps} limit={false} />
         </MenuLayout>
diff --git a/components/WebsiteDetails.module.css b/components/WebsiteDetails.module.css
index 9e7352a9..4f117ba1 100644
--- a/components/WebsiteDetails.module.css
+++ b/components/WebsiteDetails.module.css
@@ -2,7 +2,7 @@
   margin-bottom: 30px;
 }
 
-.expand {
+.view {
   border-top: 1px solid var(--gray300);
 }
 
@@ -10,8 +10,8 @@
   font-size: var(--font-size-small);
 }
 
-.menu .option {
-  font-size: var(--font-size-small);
+.content {
+  min-height: 600px;
 }
 
 .backButton {
diff --git a/components/WebsiteList.js b/components/WebsiteList.js
index 051d523a..b1819748 100644
--- a/components/WebsiteList.js
+++ b/components/WebsiteList.js
@@ -11,7 +11,7 @@ import styles from './WebsiteList.module.css';
 
 export default function WebsiteList({ userId }) {
   const router = useRouter();
-  const { data } = useFetch('/api/websites', { userId });
+  const { data } = useFetch('/api/websites', { user_id: userId });
 
   if (!data) {
     return null;
@@ -28,17 +28,14 @@ export default function WebsiteList({ userId }) {
         <EmptyPlaceholder
           msg={
             <FormattedMessage
-              id="placeholder.message.no-websites-configured"
+              id="message.no-websites-configured"
               defaultMessage="You don't have any websites configured."
             />
           }
         >
           <Button icon={<Arrow />} size="medium" onClick={() => router.push('/settings')}>
             <div>
-              <FormattedMessage
-                id="placeholder.message.go-to-settings"
-                defaultMessage="Go to settings"
-              />
+              <FormattedMessage id="message.go-to-settings" defaultMessage="Go to settings" />
             </div>
           </Button>
         </EmptyPlaceholder>
diff --git a/components/common/Calendar.js b/components/common/Calendar.js
index 9ad1be88..0414ff7f 100644
--- a/components/common/Calendar.js
+++ b/components/common/Calendar.js
@@ -70,34 +70,36 @@ export default function Calendar({ date, minDate, maxDate, onChange }) {
           <Icon className={styles.icon} icon={selectYear ? <Cross /> : <Chevron />} size="small" />
         </div>
       </div>
-      {!selectMonth && !selectYear && (
-        <DaySelector
-          date={date}
-          minDate={minDate}
-          maxDate={maxDate}
-          locale={locale}
-          onSelect={handleChange}
-        />
-      )}
-      {selectMonth && (
-        <MonthSelector
-          date={date}
-          minDate={minDate}
-          maxDate={maxDate}
-          locale={locale}
-          onSelect={handleChange}
-          onClose={toggleMonthSelect}
-        />
-      )}
-      {selectYear && (
-        <YearSelector
-          date={date}
-          minDate={minDate}
-          maxDate={maxDate}
-          onSelect={handleChange}
-          onClose={toggleYearSelect}
-        />
-      )}
+      <div className={styles.body}>
+        {!selectMonth && !selectYear && (
+          <DaySelector
+            date={date}
+            minDate={minDate}
+            maxDate={maxDate}
+            locale={locale}
+            onSelect={handleChange}
+          />
+        )}
+        {selectMonth && (
+          <MonthSelector
+            date={date}
+            minDate={minDate}
+            maxDate={maxDate}
+            locale={locale}
+            onSelect={handleChange}
+            onClose={toggleMonthSelect}
+          />
+        )}
+        {selectYear && (
+          <YearSelector
+            date={date}
+            minDate={minDate}
+            maxDate={maxDate}
+            onSelect={handleChange}
+            onClose={toggleYearSelect}
+          />
+        )}
+      </div>
     </div>
   );
 }
@@ -220,42 +222,46 @@ const YearSelector = ({ date, minDate, maxDate, onSelect }) => {
 
   return (
     <div className={styles.pager}>
-      <Button
-        icon={<Chevron />}
-        size="small"
-        className={styles.left}
-        onClick={handlePrevClick}
-        disabled={years[0] <= minYear}
-        variant="light"
-      />
-      <table>
-        <tbody>
-          {chunk(years, 5).map((row, i) => (
-            <tr key={i}>
-              {row.map((n, j) => (
-                <td
-                  key={j}
-                  className={classNames({
-                    [styles.selected]: n === year,
-                    [styles.disabled]: n < minYear || n > maxYear,
-                  })}
-                  onClick={() => (n < minYear || n > maxYear ? null : handleSelect(n))}
-                >
-                  {n}
-                </td>
-              ))}
-            </tr>
-          ))}
-        </tbody>
-      </table>
-      <Button
-        icon={<Chevron />}
-        size="small"
-        className={styles.right}
-        onClick={handleNextClick}
-        disabled={years[years.length - 1] > maxYear}
-        variant="light"
-      />
+      <div className={styles.left}>
+        <Button
+          icon={<Chevron />}
+          size="small"
+          onClick={handlePrevClick}
+          disabled={years[0] <= minYear}
+          variant="light"
+        />
+      </div>
+      <div className={styles.middle}>
+        <table>
+          <tbody>
+            {chunk(years, 5).map((row, i) => (
+              <tr key={i}>
+                {row.map((n, j) => (
+                  <td
+                    key={j}
+                    className={classNames({
+                      [styles.selected]: n === year,
+                      [styles.disabled]: n < minYear || n > maxYear,
+                    })}
+                    onClick={() => (n < minYear || n > maxYear ? null : handleSelect(n))}
+                  >
+                    {n}
+                  </td>
+                ))}
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      </div>
+      <div className={styles.right}>
+        <Button
+          icon={<Chevron />}
+          size="small"
+          onClick={handleNextClick}
+          disabled={years[years.length - 1] > maxYear}
+          variant="light"
+        />
+      </div>
     </div>
   );
 };
diff --git a/components/common/Calendar.module.css b/components/common/Calendar.module.css
index b7e56df1..eb07431b 100644
--- a/components/common/Calendar.module.css
+++ b/components/common/Calendar.module.css
@@ -3,11 +3,11 @@
   flex-direction: column;
   font-size: var(--font-size-small);
   flex: 1;
-  min-height: 285px;
+  min-height: 306px;
 }
 
 .calendar table {
-  flex: 1;
+  width: 100%;
   border-spacing: 5px;
 }
 
@@ -64,18 +64,34 @@
   font-size: var(--font-size-normal);
 }
 
+.body {
+  display: flex;
+}
+
 .selector {
   cursor: pointer;
 }
 
 .pager {
   display: flex;
+  flex: 1;
 }
 
 .pager button {
   align-self: center;
 }
 
+.middle {
+  flex: 1;
+}
+
+.left,
+.right {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
 .left svg {
   transform: rotate(90deg);
 }
diff --git a/components/common/DateFilter.js b/components/common/DateFilter.js
index c43cb860..fb76a081 100644
--- a/components/common/DateFilter.js
+++ b/components/common/DateFilter.js
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { FormattedMessage } from 'react-intl';
-import { endOfYear } from 'date-fns';
+import { endOfYear, isSameDay } from 'date-fns';
 import Modal from './Modal';
 import DropDown from './DropDown';
 import DatePickerForm from 'components/forms/DatePickerForm';
@@ -112,7 +112,8 @@ const CustomRange = ({ startDate, endDate, onClick }) => {
   return (
     <>
       <Icon icon={<Calendar />} className="mr-2" onClick={handleClick} />
-      {`${dateFormat(startDate, 'd LLL y', locale)} — ${dateFormat(endDate, 'd LLL y', locale)}`}
+      {dateFormat(startDate, 'd LLL y', locale)}
+      {!isSameDay(startDate, endDate) && ` — ${dateFormat(endDate, 'd LLL y', locale)}`}
     </>
   );
 };
diff --git a/components/common/LanguageButton.js b/components/common/LanguageButton.js
index 5565b45e..6fe7eb83 100644
--- a/components/common/LanguageButton.js
+++ b/components/common/LanguageButton.js
@@ -1,12 +1,13 @@
 import React, { useState, useRef } from 'react';
 import Head from 'next/head';
-import Globe from 'assets/globe.svg';
-import useDocumentClick from 'hooks/useDocumentClick';
 import Menu from './Menu';
 import Button from './Button';
 import { menuOptions } from 'lib/lang';
+import { setItem } from 'lib/web';
+import useLocale from 'hooks/useLocale';
+import useDocumentClick from 'hooks/useDocumentClick';
+import Globe from 'assets/globe.svg';
 import styles from './LanguageButton.module.css';
-import useLocale from '../../hooks/useLocale';
 
 export default function LanguageButton({ menuPosition = 'bottom', menuAlign = 'left' }) {
   const [showMenu, setShowMenu] = useState(false);
@@ -16,7 +17,7 @@ export default function LanguageButton({ menuPosition = 'bottom', menuAlign = 'l
 
   function handleSelect(value) {
     setLocale(value);
-    window.localStorage.setItem('locale', value);
+    setItem('umami.locale', value);
     setShowMenu(false);
   }
 
diff --git a/components/common/Link.module.css b/components/common/Link.module.css
index 54cebc0c..d6dc0536 100644
--- a/components/common/Link.module.css
+++ b/components/common/Link.module.css
@@ -1,12 +1,12 @@
-.link,
-.link:active,
-.link:visited {
+a.link,
+a.link:active,
+a.link:visited {
   position: relative;
   color: #2c2c2c;
   text-decoration: none;
 }
 
-.link:before {
+a.link:before {
   content: '';
   position: absolute;
   bottom: -2px;
@@ -17,7 +17,7 @@
   transition: width 100ms;
 }
 
-.link:hover:before {
+a.link:hover:before {
   width: 100%;
   transition: width 100ms;
 }
diff --git a/components/common/NavMenu.js b/components/common/NavMenu.js
new file mode 100644
index 00000000..6cbe7559
--- /dev/null
+++ b/components/common/NavMenu.js
@@ -0,0 +1,32 @@
+import React from 'react';
+import { useRouter } from 'next/router';
+import classNames from 'classnames';
+import styles from './NavMenu.module.css';
+
+export default function NavMenu({ options = [], className, onSelect = () => {} }) {
+  const router = useRouter();
+
+  return (
+    <div className={classNames(styles.menu, className)}>
+      {options
+        .filter(({ hidden }) => !hidden)
+        .map(option => {
+          const { label, value, className: customClassName, render } = option;
+
+          return render ? (
+            render(option)
+          ) : (
+            <div
+              key={value}
+              className={classNames(styles.option, customClassName, {
+                [styles.selected]: router.asPath === value,
+              })}
+              onClick={e => onSelect(value, e)}
+            >
+              {label}
+            </div>
+          );
+        })}
+    </div>
+  );
+}
diff --git a/components/common/NavMenu.module.css b/components/common/NavMenu.module.css
new file mode 100644
index 00000000..c5d6c9db
--- /dev/null
+++ b/components/common/NavMenu.module.css
@@ -0,0 +1,20 @@
+.menu {
+  border: 1px solid var(--gray500);
+  border-radius: 4px;
+  overflow: hidden;
+  z-index: 2;
+}
+
+.option {
+  padding: 8px 16px;
+  cursor: pointer;
+  border-radius: 4px;
+}
+
+.option:hover {
+  background: var(--gray75);
+}
+
+.selected {
+  font-weight: 600;
+}
diff --git a/components/common/RefreshButton.js b/components/common/RefreshButton.js
index 60d0976e..1fa02f48 100644
--- a/components/common/RefreshButton.js
+++ b/components/common/RefreshButton.js
@@ -1,10 +1,11 @@
 import React, { useState, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import { FormattedMessage } from 'react-intl';
 import { setDateRange } from 'redux/actions/websites';
 import Button from './Button';
 import Refresh from 'assets/redo.svg';
 import Dots from 'assets/ellipsis-h.svg';
-import { useDateRange } from 'hooks/useDateRange';
+import useDateRange from 'hooks/useDateRange';
 import { getDateRange } from '../../lib/date';
 
 export default function RefreshButton({ websiteId }) {
@@ -24,5 +25,13 @@ export default function RefreshButton({ websiteId }) {
     setLoading(false);
   }, [completed]);
 
-  return <Button icon={loading ? <Dots /> : <Refresh />} size="small" onClick={handleClick} />;
+  return (
+    <Button
+      icon={loading ? <Dots /> : <Refresh />}
+      tooltip={<FormattedMessage id="button.refresh" defaultMessage="Refresh" />}
+      tooltipId="button-refresh"
+      size="small"
+      onClick={handleClick}
+    />
+  );
 }
diff --git a/components/common/UserButton.js b/components/common/UserButton.js
index d3c078be..fdcc59fb 100644
--- a/components/common/UserButton.js
+++ b/components/common/UserButton.js
@@ -27,6 +27,7 @@ export default function UserButton() {
       value: 'username',
       className: styles.username,
     },
+    { label: <FormattedMessage id="label.profile" defaultMessage="Profile" />, value: 'profile' },
     { label: <FormattedMessage id="label.logout" defaultMessage="Logout" />, value: 'logout' },
   ];
 
@@ -35,6 +36,8 @@ export default function UserButton() {
 
     if (value === 'logout') {
       router.push('/logout');
+    } else if (value === 'profile') {
+      router.push('/settings/profile');
     }
   }
 
diff --git a/components/forms/DatePickerForm.js b/components/forms/DatePickerForm.js
index 8ead373d..f8b6416e 100644
--- a/components/forms/DatePickerForm.js
+++ b/components/forms/DatePickerForm.js
@@ -1,11 +1,15 @@
 import React, { useState } from 'react';
 import { FormattedMessage } from 'react-intl';
-import { isAfter } from 'date-fns';
+import { isAfter, isBefore, isSameDay } from 'date-fns';
 import Calendar from 'components/common/Calendar';
 import Button from 'components/common/Button';
 import { FormButtons } from 'components/layout/FormLayout';
 import { getDateRangeValues } from 'lib/date';
 import styles from './DatePickerForm.module.css';
+import ButtonGroup from '../common/ButtonGroup';
+
+const FILTER_DAY = 0;
+const FILTER_RANGE = 1;
 
 export default function DatePickerForm({
   startDate: defaultStartDate,
@@ -15,21 +19,59 @@ export default function DatePickerForm({
   onChange,
   onClose,
 }) {
+  const [selected, setSelected] = useState(
+    isSameDay(defaultStartDate, defaultEndDate) ? FILTER_DAY : FILTER_RANGE,
+  );
+  const [date, setDate] = useState(defaultStartDate);
   const [startDate, setStartDate] = useState(defaultStartDate);
   const [endDate, setEndDate] = useState(defaultEndDate);
 
+  const disabled =
+    selected === FILTER_DAY
+      ? isAfter(minDate, date) && isBefore(maxDate, date)
+      : isAfter(startDate, endDate);
+
+  const buttons = [
+    {
+      label: <FormattedMessage id="button.single-day" defaultMessage="Single day" />,
+      value: FILTER_DAY,
+    },
+    {
+      label: <FormattedMessage id="button.date-range" defaultMessage="Date range" />,
+      value: FILTER_RANGE,
+    },
+  ];
+
   function handleSave() {
-    onChange({ ...getDateRangeValues(startDate, endDate), value: 'custom' });
+    if (selected === FILTER_DAY) {
+      onChange({ ...getDateRangeValues(date, date), value: 'custom' });
+    } else {
+      onChange({ ...getDateRangeValues(startDate, endDate), value: 'custom' });
+    }
   }
 
   return (
     <div className={styles.container}>
+      <div className={styles.filter}>
+        <ButtonGroup size="small" items={buttons} selectedItem={selected} onClick={setSelected} />
+      </div>
       <div className={styles.calendars}>
-        <Calendar date={startDate} minDate={minDate} maxDate={endDate} onChange={setStartDate} />
-        <Calendar date={endDate} minDate={startDate} maxDate={maxDate} onChange={setEndDate} />
+        {selected === FILTER_DAY ? (
+          <Calendar date={date} minDate={minDate} maxDate={maxDate} onChange={setDate} />
+        ) : (
+          <>
+            <Calendar
+              date={startDate}
+              minDate={minDate}
+              maxDate={endDate}
+              onChange={setStartDate}
+            />
+            <Calendar date={endDate} minDate={startDate} maxDate={maxDate} onChange={setEndDate} />
+          </>
+        )}
       </div>
       <FormButtons>
-        <Button variant="action" onClick={handleSave} disabled={isAfter(startDate, endDate)}>
+        <Button variant="action" onClick={handleSave} disabled={disabled}>
           <FormattedMessage id="button.save" defaultMessage="Save" />
         </Button>
         <Button onClick={onClose}>
diff --git a/components/forms/DatePickerForm.module.css b/components/forms/DatePickerForm.module.css
index dcedc17a..96e2d2ec 100644
--- a/components/forms/DatePickerForm.module.css
+++ b/components/forms/DatePickerForm.module.css
@@ -1,25 +1,40 @@
 .container {
   display: flex;
   flex-direction: column;
-  width: 800px;
   max-width: 100vw;
 }
 
 .calendars {
   display: flex;
+  justify-content: center;
 }
 
-.calendars > div:first-child {
-  padding-right: 20px;
-  border-right: 1px solid var(--gray300);
+.calendars > div {
+  width: 380px;
 }
 
-.calendars > div:last-child {
+.calendars > div + div {
+  margin-left: 20px;
   padding-left: 20px;
+  border-left: 1px solid var(--gray300);
+}
+
+.filter {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 20px;
 }
 
 @media only screen and (max-width: 768px) {
   .calendars {
     flex-direction: column;
   }
+
+  .calendars > div + div {
+    padding: 0;
+    margin-left: 0;
+    margin-top: 20px;
+    border: 0;
+  }
 }
diff --git a/components/layout/ButtonLayout.module.css b/components/layout/ButtonLayout.module.css
index 73841169..f153ba54 100644
--- a/components/layout/ButtonLayout.module.css
+++ b/components/layout/ButtonLayout.module.css
@@ -1,7 +1,8 @@
 .buttons {
   display: flex;
+  align-items: center;
 }
 
-.buttons button + button {
+.buttons button + * {
   margin-left: 10px;
 }
diff --git a/components/layout/Footer.js b/components/layout/Footer.js
index 241ac275..7bd1ebd3 100644
--- a/components/layout/Footer.js
+++ b/components/layout/Footer.js
@@ -1,21 +1,27 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
-import classNames from 'classnames';
-import Button from 'components/common/Button';
-import Logo from 'assets/logo.svg';
+import Link from 'components/common/Link';
 import styles from './Footer.module.css';
 
 export default function Footer() {
   const version = process.env.VERSION;
   return (
     <footer className="container">
-      <div className={classNames(styles.footer, 'row justify-content-center')}>
-        <FormattedMessage id="footer.powered-by" defaultMessage="Powered by" />
-        <a href="https://umami.is">
-          <Button className={styles.button} icon={<Logo />} size="small">
-            <b>umami</b>
-          </Button>
-        </a>
+      <div className={styles.footer}>
+        <div />
+        <div>
+          <FormattedMessage
+            id="message.powered-by"
+            defaultMessage="Powered by {name}"
+            values={{
+              name: (
+                <Link href="https://umami.is">
+                  <b>umami</b>
+                </Link>
+              ),
+            }}
+          />
+        </div>
         <div>{`v${version}`}</div>
       </div>
     </footer>
diff --git a/components/layout/Footer.module.css b/components/layout/Footer.module.css
index 87008340..7c671d7e 100644
--- a/components/layout/Footer.module.css
+++ b/components/layout/Footer.module.css
@@ -5,11 +5,3 @@
   font-size: var(--font-size-small);
   min-height: 100px;
 }
-
-.footer a {
-  text-decoration: none;
-}
-
-.button {
-  margin: 0 5px;
-}
diff --git a/components/layout/Header.js b/components/layout/Header.js
index 7df55d0d..f275bda3 100644
--- a/components/layout/Header.js
+++ b/components/layout/Header.js
@@ -26,10 +26,10 @@ export default function Header() {
             {user ? (
               <>
                 <Link href="/dashboard">
-                  <FormattedMessage id="header.nav.dashboard" defaultMessage="Dashboard" />
+                  <FormattedMessage id="label.dashboard" defaultMessage="Dashboard" />
                 </Link>
                 <Link href="/settings">
-                  <FormattedMessage id="header.nav.settings" defaultMessage="Settings" />
+                  <FormattedMessage id="label.settings" defaultMessage="Settings" />
                 </Link>
                 <LanguageButton menuAlign="right" />
                 <UserButton />
diff --git a/components/layout/MenuLayout.js b/components/layout/MenuLayout.js
index f28cc8a3..7183ad10 100644
--- a/components/layout/MenuLayout.js
+++ b/components/layout/MenuLayout.js
@@ -1,29 +1,37 @@
 import React from 'react';
+import { useRouter } from 'next/router';
 import classNames from 'classnames';
-import Menu from 'components/common/Menu';
+import NavMenu from 'components/common/NavMenu';
 import styles from './MenuLayout.module.css';
 
 export default function MenuLayout({
   menu,
   selectedOption,
-  onMenuSelect,
   className,
   menuClassName,
   contentClassName,
-  optionClassName,
   children,
+  replace = false,
 }) {
+  const router = useRouter();
+
+  function handleSelect(url) {
+    if (replace) {
+      router.replace(url);
+    } else {
+      router.push(url);
+    }
+  }
+
   return (
     <div className={classNames(styles.container, className, 'row')}>
-      <Menu
+      <NavMenu
         options={menu}
         selectedOption={selectedOption}
-        className={classNames(styles.menu, menuClassName, 'col-12 col-lg-3')}
-        selectedClassName={styles.selected}
-        optionClassName={classNames(styles.option, optionClassName)}
-        onSelect={onMenuSelect}
+        className={classNames(styles.menu, menuClassName, 'col-12 col-lg-2')}
+        onSelect={handleSelect}
       />
-      <div className={classNames(styles.content, contentClassName, 'col-12 col-lg-9')}>
+      <div className={classNames(styles.content, contentClassName, 'col-12 col-lg-10')}>
         {children}
       </div>
     </div>
diff --git a/components/layout/MenuLayout.module.css b/components/layout/MenuLayout.module.css
index 1bdd7473..c0665d4c 100644
--- a/components/layout/MenuLayout.module.css
+++ b/components/layout/MenuLayout.module.css
@@ -10,25 +10,11 @@
 }
 
 .container .content {
+  flex: 1;
   position: relative;
   border-left: 1px solid var(--gray300);
   padding-left: 30px;
-}
-
-.option {
-  font-size: var(--font-size-normal);
-  padding: 8px 16px;
-  cursor: pointer;
-  margin-right: 30px;
-  border-radius: 4px;
-}
-
-.option:hover {
-  background: var(--gray75);
-}
-
-.selected {
-  font-weight: 600;
+  margin-left: 30px;
 }
 
 @media only screen and (max-width: 992px) {
@@ -40,5 +26,6 @@
     border-top: 1px solid var(--gray300);
     border-left: 0;
     padding-left: 0;
+    margin-left: 0;
   }
 }
diff --git a/components/messages.js b/components/messages.js
new file mode 100644
index 00000000..f6b589eb
--- /dev/null
+++ b/components/messages.js
@@ -0,0 +1,17 @@
+import React from 'react';
+import { defineMessages, FormattedMessage } from 'react-intl';
+
+export const labels = defineMessages({
+  unknown: { id: 'label.unknown', defaultMessage: 'Unknown' },
+});
+
+export const devices = defineMessages({
+  desktop: { id: 'metrics.device.desktop', defaultMessage: 'Desktop' },
+  laptop: { id: 'metrics.device.laptop', defaultMessage: 'Laptop' },
+  tablet: { id: 'metrics.device.tablet', defaultMessage: 'Tablet' },
+  mobile: { id: 'metrics.device.mobile', defaultMessage: 'Mobile' },
+});
+
+export function getDeviceMessage(device) {
+  return <FormattedMessage {...(devices[device] || labels.unknown)} />;
+}
diff --git a/components/metrics/ActiveUsers.js b/components/metrics/ActiveUsers.js
index 83ae00b8..3d7b7001 100644
--- a/components/metrics/ActiveUsers.js
+++ b/components/metrics/ActiveUsers.js
@@ -4,8 +4,8 @@ import useFetch from 'hooks/useFetch';
 import styles from './ActiveUsers.module.css';
 import { FormattedMessage } from 'react-intl';
 
-export default function ActiveUsers({ websiteId, className }) {
-  const { data } = useFetch(`/api/website/${websiteId}/active`, {}, { interval: 60000 });
+export default function ActiveUsers({ websiteId, token, className }) {
+  const { data } = useFetch(`/api/website/${websiteId}/active`, { token }, { interval: 60000 });
   const count = useMemo(() => {
     return data?.[0]?.x || 0;
   }, [data]);
@@ -20,7 +20,7 @@ export default function ActiveUsers({ websiteId, className }) {
       <div className={styles.text}>
         <div>
           <FormattedMessage
-            id="active-users.message"
+            id="message.active-users"
             defaultMessage="{x} current {x, plural, one {visitor} other {visitors}}"
             values={{ x: count }}
           />
diff --git a/components/metrics/BrowsersTable.js b/components/metrics/BrowsersTable.js
index 36cfe82f..f092e62f 100644
--- a/components/metrics/BrowsersTable.js
+++ b/components/metrics/BrowsersTable.js
@@ -3,13 +3,14 @@ import { FormattedMessage } from 'react-intl';
 import MetricsTable from './MetricsTable';
 import { browserFilter } from 'lib/filters';
 
-export default function BrowsersTable({ websiteId, limit, onExpand }) {
+export default function BrowsersTable({ websiteId, token, limit, onExpand }) {
   return (
     <MetricsTable
       title={<FormattedMessage id="metrics.browsers" defaultMessage="Browsers" />}
       type="browser"
       metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
       websiteId={websiteId}
+      token={token}
       limit={limit}
       dataFilter={browserFilter}
       onExpand={onExpand}
diff --git a/components/metrics/CountriesTable.js b/components/metrics/CountriesTable.js
index e7857b6d..1f516653 100644
--- a/components/metrics/CountriesTable.js
+++ b/components/metrics/CountriesTable.js
@@ -3,13 +3,20 @@ import MetricsTable from './MetricsTable';
 import { countryFilter, percentFilter } from 'lib/filters';
 import { FormattedMessage } from 'react-intl';
 
-export default function CountriesTable({ websiteId, limit, onDataLoad = () => {}, onExpand }) {
+export default function CountriesTable({
+  websiteId,
+  token,
+  limit,
+  onDataLoad = () => {},
+  onExpand,
+}) {
   return (
     <MetricsTable
       title={<FormattedMessage id="metrics.countries" defaultMessage="Countries" />}
       type="country"
       metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
       websiteId={websiteId}
+      token={token}
       limit={limit}
       dataFilter={countryFilter}
       onDataLoad={data => onDataLoad(percentFilter(data))}
diff --git a/components/metrics/DevicesTable.js b/components/metrics/DevicesTable.js
index 0f9c54e7..85d2bdfd 100644
--- a/components/metrics/DevicesTable.js
+++ b/components/metrics/DevicesTable.js
@@ -2,16 +2,19 @@ import React from 'react';
 import MetricsTable from './MetricsTable';
 import { deviceFilter } from 'lib/filters';
 import { FormattedMessage } from 'react-intl';
+import { getDeviceMessage } from 'components/messages';
 
-export default function DevicesTable({ websiteId, limit, onExpand }) {
+export default function DevicesTable({ websiteId, token, limit, onExpand }) {
   return (
     <MetricsTable
       title={<FormattedMessage id="metrics.devices" defaultMessage="Devices" />}
       type="device"
       metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
       websiteId={websiteId}
+      token={token}
       limit={limit}
       dataFilter={deviceFilter}
+      renderLabel={({ x }) => getDeviceMessage(x)}
       onExpand={onExpand}
     />
   );
diff --git a/components/metrics/EventsChart.js b/components/metrics/EventsChart.js
index 1d8bb557..4a49d129 100644
--- a/components/metrics/EventsChart.js
+++ b/components/metrics/EventsChart.js
@@ -3,7 +3,7 @@ import tinycolor from 'tinycolor2';
 import BarChart from './BarChart';
 import { getTimezone, getDateArray, getDateLength } from 'lib/date';
 import useFetch from 'hooks/useFetch';
-import { useDateRange } from 'hooks/useDateRange';
+import useDateRange from 'hooks/useDateRange';
 
 const COLORS = [
   '#2680eb',
@@ -16,7 +16,7 @@ const COLORS = [
   '#85d044',
 ];
 
-export default function EventsChart({ websiteId }) {
+export default function EventsChart({ websiteId, token }) {
   const dateRange = useDateRange(websiteId);
   const { startDate, endDate, unit, modified } = dateRange;
   const { data } = useFetch(
@@ -26,6 +26,7 @@ export default function EventsChart({ websiteId }) {
       end_at: +endDate,
       unit,
       tz: getTimezone(),
+      token,
     },
     { update: [modified] },
   );
diff --git a/components/metrics/EventsTable.js b/components/metrics/EventsTable.js
index ccc13411..948b9f7a 100644
--- a/components/metrics/EventsTable.js
+++ b/components/metrics/EventsTable.js
@@ -3,13 +3,14 @@ import { FormattedMessage } from 'react-intl';
 import MetricsTable from './MetricsTable';
 import styles from './EventsTable.module.css';
 
-export default function EventsTable({ websiteId, limit, onExpand, onDataLoad }) {
+export default function EventsTable({ websiteId, token, limit, onExpand, onDataLoad }) {
   return (
     <MetricsTable
       title={<FormattedMessage id="metrics.events" defaultMessage="Events" />}
       type="event"
       metric={<FormattedMessage id="metrics.actions" defaultMessage="Actions" />}
       websiteId={websiteId}
+      token={token}
       limit={limit}
       renderLabel={({ x }) => <Label value={x} />}
       onExpand={onExpand}
diff --git a/components/metrics/MetricsBar.js b/components/metrics/MetricsBar.js
index 8e3fe009..8d128c18 100644
--- a/components/metrics/MetricsBar.js
+++ b/components/metrics/MetricsBar.js
@@ -3,12 +3,12 @@ import { FormattedMessage } from 'react-intl';
 import classNames from 'classnames';
 import Loading from 'components/common/Loading';
 import useFetch from 'hooks/useFetch';
-import { useDateRange } from 'hooks/useDateRange';
+import useDateRange from 'hooks/useDateRange';
 import { formatShortTime, formatNumber, formatLongNumber } from 'lib/format';
 import MetricCard from './MetricCard';
 import styles from './MetricsBar.module.css';
 
-export default function MetricsBar({ websiteId, className }) {
+export default function MetricsBar({ websiteId, token, className }) {
   const dateRange = useDateRange(websiteId);
   const { startDate, endDate, modified } = dateRange;
   const { data } = useFetch(
@@ -16,6 +16,7 @@ export default function MetricsBar({ websiteId, className }) {
     {
       start_at: +startDate,
       end_at: +endDate,
+      token,
     },
     {
       update: [modified],
diff --git a/components/metrics/MetricsTable.js b/components/metrics/MetricsTable.js
index 05756614..560c25f0 100644
--- a/components/metrics/MetricsTable.js
+++ b/components/metrics/MetricsTable.js
@@ -10,12 +10,13 @@ import useFetch from 'hooks/useFetch';
 import Arrow from 'assets/arrow-right.svg';
 import { percentFilter } from 'lib/filters';
 import { formatNumber, formatLongNumber } from 'lib/format';
-import { useDateRange } from 'hooks/useDateRange';
+import useDateRange from 'hooks/useDateRange';
 import styles from './MetricsTable.module.css';
 
 export default function MetricsTable({
   websiteId,
   websiteDomain,
+  token,
   title,
   metric,
   type,
@@ -37,6 +38,7 @@ export default function MetricsTable({
       start_at: +startDate,
       end_at: +endDate,
       domain: websiteDomain,
+      token,
     },
     { onDataLoad, delay: 300, update: [modified] },
   );
diff --git a/components/metrics/OSTable.js b/components/metrics/OSTable.js
index 499e0f33..14f943a1 100644
--- a/components/metrics/OSTable.js
+++ b/components/metrics/OSTable.js
@@ -3,13 +3,14 @@ import MetricsTable from './MetricsTable';
 import { osFilter } from 'lib/filters';
 import { FormattedMessage } from 'react-intl';
 
-export default function OSTable({ websiteId, limit, onExpand }) {
+export default function OSTable({ websiteId, token, limit, onExpand }) {
   return (
     <MetricsTable
       title={<FormattedMessage id="metrics.operating-systems" defaultMessage="Operating system" />}
       type="os"
       metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
       websiteId={websiteId}
+      token={token}
       limit={limit}
       dataFilter={osFilter}
       onExpand={onExpand}
diff --git a/components/metrics/PagesTable.js b/components/metrics/PagesTable.js
index 71466728..5730cf90 100644
--- a/components/metrics/PagesTable.js
+++ b/components/metrics/PagesTable.js
@@ -5,7 +5,7 @@ import { urlFilter } from 'lib/filters';
 import { FILTER_COMBINED, FILTER_RAW } from 'lib/constants';
 import MetricsTable from './MetricsTable';
 
-export default function PagesTable({ websiteId, websiteDomain, limit, onExpand }) {
+export default function PagesTable({ websiteId, token, websiteDomain, limit, onExpand }) {
   const [filter, setFilter] = useState(FILTER_COMBINED);
 
   const buttons = [
@@ -25,6 +25,7 @@ export default function PagesTable({ websiteId, websiteDomain, limit, onExpand }
         limit ? null : <FilterButtons buttons={buttons} selected={filter} onClick={setFilter} />
       }
       websiteId={websiteId}
+      token={token}
       limit={limit}
       dataFilter={urlFilter}
       filterOptions={{ domain: websiteDomain, raw: filter === FILTER_RAW }}
diff --git a/components/metrics/QuickButtons.js b/components/metrics/QuickButtons.js
deleted file mode 100644
index 57e7a251..00000000
--- a/components/metrics/QuickButtons.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-import ButtonGroup from 'components/common/ButtonGroup';
-import { getDateRange } from 'lib/date';
-import styles from './QuickButtons.module.css';
-
-const options = [
-  { label: '24h', value: '24hour' },
-  { label: '7d', value: '7day' },
-  { label: '30d', value: '30day' },
-];
-
-export default function QuickButtons({ value, onChange }) {
-  const selectedItem = options.find(item => item.value === value)?.value;
-
-  function handleClick(selected) {
-    if (selected !== value) {
-      onChange(getDateRange(selected));
-    }
-  }
-
-  return (
-    <ButtonGroup
-      size="xsmall"
-      className={styles.buttons}
-      items={options}
-      selectedItem={selectedItem}
-      onClick={handleClick}
-    />
-  );
-}
diff --git a/components/metrics/QuickButtons.module.css b/components/metrics/QuickButtons.module.css
deleted file mode 100644
index c5c6e3c7..00000000
--- a/components/metrics/QuickButtons.module.css
+++ /dev/null
@@ -1,33 +0,0 @@
-.buttons {
-  display: flex;
-  align-content: center;
-  position: absolute;
-  top: 0;
-  right: 0;
-  margin: auto;
-}
-
-.buttons button + button {
-  margin-left: 10px;
-}
-
-.buttons .button {
-  font-size: var(--font-size-xsmall);
-  padding: 4px 8px;
-}
-
-.active {
-  font-weight: 600;
-}
-
-@media only screen and (max-width: 768px) {
-  .buttons button:last-child {
-    display: none;
-  }
-}
-
-@media only screen and (max-width: 576px) {
-  .buttons {
-    display: none;
-  }
-}
diff --git a/components/metrics/ReferrersTable.js b/components/metrics/ReferrersTable.js
index 85834212..39136a71 100644
--- a/components/metrics/ReferrersTable.js
+++ b/components/metrics/ReferrersTable.js
@@ -5,7 +5,13 @@ import { refFilter } from 'lib/filters';
 import ButtonGroup from 'components/common/ButtonGroup';
 import { FILTER_DOMAIN_ONLY, FILTER_COMBINED, FILTER_RAW } from 'lib/constants';
 
-export default function ReferrersTable({ websiteId, websiteDomain, limit, onExpand = () => {} }) {
+export default function ReferrersTable({
+  websiteId,
+  websiteDomain,
+  token,
+  limit,
+  onExpand = () => {},
+}) {
   const [filter, setFilter] = useState(FILTER_COMBINED);
 
   const buttons = [
@@ -20,9 +26,9 @@ export default function ReferrersTable({ websiteId, websiteDomain, limit, onExpa
     { label: <FormattedMessage id="metrics.filter.raw" defaultMessage="Raw" />, value: FILTER_RAW },
   ];
 
-  const renderLink = ({ x: url }) => {
-    return url.startsWith('http') ? (
-      <a href={url} target="_blank" rel="noreferrer">
+  const renderLink = ({ w: href, x: url }) => {
+    return (href || url).startsWith('http') ? (
+      <a href={href || url} target="_blank" rel="noreferrer">
         {decodeURI(url)}
       </a>
     ) : (
@@ -40,6 +46,7 @@ export default function ReferrersTable({ websiteId, websiteDomain, limit, onExpa
       }
       websiteId={websiteId}
       websiteDomain={websiteDomain}
+      token={token}
       limit={limit}
       dataFilter={refFilter}
       filterOptions={{
diff --git a/components/metrics/WebsiteChart.js b/components/metrics/WebsiteChart.js
index 8cf01a5a..f2485888 100644
--- a/components/metrics/WebsiteChart.js
+++ b/components/metrics/WebsiteChart.js
@@ -3,17 +3,18 @@ import { useDispatch } from 'react-redux';
 import classNames from 'classnames';
 import PageviewsChart from './PageviewsChart';
 import MetricsBar from './MetricsBar';
+import WebsiteHeader from './WebsiteHeader';
 import DateFilter from 'components/common/DateFilter';
 import StickyHeader from 'components/helpers/StickyHeader';
 import useFetch from 'hooks/useFetch';
+import useDateRange from 'hooks/useDateRange';
 import { getDateArray, getDateLength, getTimezone } from 'lib/date';
 import { setDateRange } from 'redux/actions/websites';
 import styles from './WebsiteChart.module.css';
-import WebsiteHeader from './WebsiteHeader';
-import { useDateRange } from '../../hooks/useDateRange';
 
 export default function WebsiteChart({
   websiteId,
+  token,
   title,
   stickyHeader = false,
   showLink = false,
@@ -30,6 +31,7 @@ export default function WebsiteChart({
       end_at: +endDate,
       unit,
       tz: getTimezone(),
+      token,
     },
     { onDataLoad, update: [modified] },
   );
@@ -50,7 +52,7 @@ export default function WebsiteChart({
 
   return (
     <>
-      <WebsiteHeader websiteId={websiteId} title={title} showLink={showLink} />
+      <WebsiteHeader websiteId={websiteId} token={token} title={title} showLink={showLink} />
       <div className={classNames(styles.header, 'row')}>
         <StickyHeader
           className={classNames(styles.metrics, 'col row')}
@@ -58,7 +60,7 @@ export default function WebsiteChart({
           enabled={stickyHeader}
         >
           <div className="col-12 col-lg-9">
-            <MetricsBar websiteId={websiteId} />
+            <MetricsBar websiteId={websiteId} token={token} />
           </div>
           <div className={classNames(styles.filter, 'col-12 col-lg-3')}>
             <DateFilter
diff --git a/components/metrics/WebsiteHeader.js b/components/metrics/WebsiteHeader.js
index 71d0fa8a..d8f53421 100644
--- a/components/metrics/WebsiteHeader.js
+++ b/components/metrics/WebsiteHeader.js
@@ -1,37 +1,30 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
-import { useRouter } from 'next/router';
+import Link from 'components/common/Link';
 import PageHeader from 'components/layout/PageHeader';
-import Button from 'components/common/Button';
+import RefreshButton from 'components/common/RefreshButton';
+import ButtonLayout from 'components/layout/ButtonLayout';
+import Icon from 'components/common/Icon';
 import ActiveUsers from './ActiveUsers';
 import Arrow from 'assets/arrow-right.svg';
 import styles from './WebsiteHeader.module.css';
-import RefreshButton from '../common/RefreshButton';
-import ButtonLayout from '../layout/ButtonLayout';
-
-export default function WebsiteHeader({ websiteId, title, showLink = false }) {
-  const router = useRouter();
 
+export default function WebsiteHeader({ websiteId, token, title, showLink = false }) {
   return (
     <PageHeader>
       <div className={styles.title}>{title}</div>
-      <ActiveUsers className={styles.active} websiteId={websiteId} />
+      <ActiveUsers className={styles.active} websiteId={websiteId} token={token} />
       <ButtonLayout>
         <RefreshButton websiteId={websiteId} />
         {showLink && (
-          <Button
-            icon={<Arrow />}
-            onClick={() =>
-              router.push('/website/[...id]', `/website/${websiteId}/${title}`, {
-                shallow: true,
-              })
-            }
-            size="small"
+          <Link
+            href="/website/[...id]"
+            as={`/website/${websiteId}/${title}`}
+            className={styles.link}
           >
-            <div>
-              <FormattedMessage id="button.view-details" defaultMessage="View details" />
-            </div>
-          </Button>
+            <FormattedMessage id="button.view-details" defaultMessage="View details" />
+            <Icon icon={<Arrow />} size="small" />
+          </Link>
         )}
       </ButtonLayout>
     </PageHeader>
diff --git a/components/metrics/WebsiteHeader.module.css b/components/metrics/WebsiteHeader.module.css
index 99dbd8bc..71ff5b1b 100644
--- a/components/metrics/WebsiteHeader.module.css
+++ b/components/metrics/WebsiteHeader.module.css
@@ -4,8 +4,13 @@
   line-height: var(--font-size-large);
 }
 
-.button {
+.link {
   font-size: var(--font-size-small);
+  font-weight: 600;
+}
+
+.link svg {
+  margin-left: 10px;
 }
 
 @media only screen and (max-width: 576px) {
diff --git a/components/settings/AccountSettings.js b/components/settings/AccountSettings.js
index 21ca04f5..bc555a0f 100644
--- a/components/settings/AccountSettings.js
+++ b/components/settings/AccountSettings.js
@@ -92,7 +92,7 @@ export default function AccountSettings() {
     <>
       <PageHeader>
         <div>
-          <FormattedMessage id="settings.accounts" defaultMessage="Accounts" />
+          <FormattedMessage id="label.accounts" defaultMessage="Accounts" />
         </div>
         <Button icon={<Plus />} size="small" onClick={() => setAddAccount(true)}>
           <div>
diff --git a/components/settings/ProfileSettings.js b/components/settings/ProfileSettings.js
index 9d9b011a..69bc34e9 100644
--- a/components/settings/ProfileSettings.js
+++ b/components/settings/ProfileSettings.js
@@ -1,29 +1,44 @@
 import React, { useState } from 'react';
 import { FormattedMessage } from 'react-intl';
-import { useSelector } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import PageHeader from 'components/layout/PageHeader';
 import Button from 'components/common/Button';
 import Modal from 'components/common/Modal';
 import Toast from 'components/common/Toast';
 import ChangePasswordForm from 'components/forms/ChangePasswordForm';
+import DateFilter from 'components/common/DateFilter';
 import Dots from 'assets/ellipsis-h.svg';
+import { getTimezone } from 'lib/date';
+import { setItem } from 'lib/web';
+import useDateRange from 'hooks/useDateRange';
+import { setDateRange } from 'redux/actions/websites';
+import styles from './ProfileSettings.module.css';
 
 export default function ProfileSettings() {
+  const dispatch = useDispatch();
   const user = useSelector(state => state.user);
   const [changePassword, setChangePassword] = useState(false);
   const [message, setMessage] = useState();
   const { user_id } = user;
+  const timezone = getTimezone();
+  const dateRange = useDateRange(0);
+  const { startDate, endDate, value } = dateRange;
 
   function handleSave() {
     setChangePassword(false);
     setMessage(<FormattedMessage id="message.save-success" defaultMessage="Saved successfully." />);
   }
 
+  function handleDateChange(values) {
+    setItem(`umami.date-range`, values);
+    dispatch(setDateRange(0, values));
+  }
+
   return (
     <>
       <PageHeader>
         <div>
-          <FormattedMessage id="settings.profile" defaultMessage="Profile" />
+          <FormattedMessage id="label.profile" defaultMessage="Profile" />
         </div>
         <Button icon={<Dots />} size="small" onClick={() => setChangePassword(true)}>
           <div>
@@ -36,6 +51,21 @@ export default function ProfileSettings() {
           <FormattedMessage id="label.username" defaultMessage="Username" />
         </dt>
         <dd>{user.username}</dd>
+        <dt>
+          <FormattedMessage id="label.timezone" defaultMessage="Timezone" />
+        </dt>
+        <dd>{timezone}</dd>
+        <dt>
+          <FormattedMessage id="label.default-date-range" defaultMessage="Default date range" />
+        </dt>
+        <dd className={styles.date}>
+          <DateFilter
+            value={value}
+            startDate={startDate}
+            endDate={endDate}
+            onChange={handleDateChange}
+          />
+        </dd>
       </dl>
       {changePassword && (
         <Modal
diff --git a/components/settings/ProfileSettings.module.css b/components/settings/ProfileSettings.module.css
new file mode 100644
index 00000000..ea7711ac
--- /dev/null
+++ b/components/settings/ProfileSettings.module.css
@@ -0,0 +1,3 @@
+.date {
+  display: flex;
+}
diff --git a/components/settings/Settings.js b/components/settings/Settings.js
index a0a9db25..be9feb35 100644
--- a/components/settings/Settings.js
+++ b/components/settings/Settings.js
@@ -1,4 +1,5 @@
 import React, { useState } from 'react';
+import { useRouter } from 'next/router';
 import Page from 'components/layout/Page';
 import MenuLayout from 'components/layout/MenuLayout';
 import WebsiteSettings from './WebsiteSettings';
@@ -7,33 +8,38 @@ import ProfileSettings from './ProfileSettings';
 import { useSelector } from 'react-redux';
 import { FormattedMessage } from 'react-intl';
 
-const WEBSITES = 1;
-const ACCOUNTS = 2;
-const PROFILE = 3;
+const WEBSITES = '/settings';
+const ACCOUNTS = '/settings/accounts';
+const PROFILE = '/settings/profile';
 
 export default function Settings() {
   const user = useSelector(state => state.user);
   const [option, setOption] = useState(WEBSITES);
+  const router = useRouter();
+  const { pathname } = router;
 
   const menuOptions = [
     {
-      label: <FormattedMessage id="settings.websites" defaultMessage="Websites" />,
+      label: <FormattedMessage id="label.websites" defaultMessage="Websites" />,
       value: WEBSITES,
     },
     {
-      label: <FormattedMessage id="settings.accounts" defaultMessage="Accounts" />,
+      label: <FormattedMessage id="label.accounts" defaultMessage="Accounts" />,
       value: ACCOUNTS,
       hidden: !user.is_admin,
     },
-    { label: <FormattedMessage id="settings.profile" defaultMessage="Profile" />, value: PROFILE },
+    {
+      label: <FormattedMessage id="label.profile" defaultMessage="Profile" />,
+      value: PROFILE,
+    },
   ];
 
   return (
     <Page>
       <MenuLayout menu={menuOptions} selectedOption={option} onMenuSelect={setOption}>
-        {option === WEBSITES && <WebsiteSettings />}
-        {option === ACCOUNTS && <AccountSettings />}
-        {option === PROFILE && <ProfileSettings />}
+        {pathname === WEBSITES && <WebsiteSettings />}
+        {pathname === ACCOUNTS && <AccountSettings />}
+        {pathname === PROFILE && <ProfileSettings />}
       </MenuLayout>
     </Page>
   );
diff --git a/components/settings/WebsiteSettings.js b/components/settings/WebsiteSettings.js
index 3bcf6bb4..3754e4dc 100644
--- a/components/settings/WebsiteSettings.js
+++ b/components/settings/WebsiteSettings.js
@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 import { FormattedMessage } from 'react-intl';
 import classNames from 'classnames';
+import Link from 'components/common/Link';
 import Table from 'components/common/Table';
 import Button from 'components/common/Button';
 import PageHeader from 'components/layout/PageHeader';
@@ -16,7 +17,7 @@ import Pen from 'assets/pen.svg';
 import Trash from 'assets/trash.svg';
 import Plus from 'assets/plus.svg';
 import Code from 'assets/code.svg';
-import Link from 'assets/link.svg';
+import LinkIcon from 'assets/link.svg';
 import useFetch from 'hooks/useFetch';
 import styles from './WebsiteSettings.module.css';
 
@@ -34,9 +35,9 @@ export default function WebsiteSettings() {
     <ButtonLayout>
       {row.share_id && (
         <Button
-          icon={<Link />}
+          icon={<LinkIcon />}
           size="small"
-          tooltip={<FormattedMessage id="tooltip.get-share-url" defaultMessage="Get share URL" />}
+          tooltip={<FormattedMessage id="message.get-share-url" defaultMessage="Get share URL" />}
           tooltipId={`button-share-${row.website_id}`}
           onClick={() => setShowUrl(row)}
         />
@@ -45,7 +46,7 @@ export default function WebsiteSettings() {
         icon={<Code />}
         size="small"
         tooltip={
-          <FormattedMessage id="tooltip.get-tracking-code" defaultMessage="Get tracking code" />
+          <FormattedMessage id="message.get-tracking-code" defaultMessage="Get tracking code" />
         }
         tooltipId={`button-code-${row.website_id}`}
         onClick={() => setShowCode(row)}
@@ -63,11 +64,18 @@ export default function WebsiteSettings() {
     </ButtonLayout>
   );
 
+  const DetailsLink = ({ website_id, name }) => (
+    <Link href="/website/[...id]" as={`/website/${website_id}/${name}`}>
+      {name}
+    </Link>
+  );
+
   const columns = [
     {
       key: 'name',
       label: <FormattedMessage id="label.name" defaultMessage="Name" />,
       className: 'col-6 col-xl-4',
+      render: DetailsLink,
     },
     {
       key: 'domain',
@@ -103,7 +111,7 @@ export default function WebsiteSettings() {
     <EmptyPlaceholder
       msg={
         <FormattedMessage
-          id="placeholder.message.no-websites-configured"
+          id="message.no-websites-configured"
           defaultMessage="You don't have any websites configured."
         />
       }
@@ -120,7 +128,7 @@ export default function WebsiteSettings() {
     <>
       <PageHeader>
         <div>
-          <FormattedMessage id="settings.websites" defaultMessage="Websites" />
+          <FormattedMessage id="label.websites" defaultMessage="Websites" />
         </div>
         <Button icon={<Plus />} size="small" onClick={() => setAddWebsite(true)}>
           <div>
diff --git a/hooks/useDateRange.js b/hooks/useDateRange.js
index 99e49dfd..e6ad6808 100644
--- a/hooks/useDateRange.js
+++ b/hooks/useDateRange.js
@@ -1,8 +1,18 @@
 import { useSelector } from 'react-redux';
+import { parseISO } from 'date-fns';
 import { getDateRange } from 'lib/date';
+import { getItem } from 'lib/web';
+
+export default function useDateRange(websiteId, defaultDateRange = '24hour') {
+  const globalDefault = getItem('umami.date-range');
+
+  if (globalDefault) {
+    globalDefault.startDate = parseISO(globalDefault.startDate);
+    globalDefault.endDate = parseISO(globalDefault.endDate);
+  }
 
-export function useDateRange(websiteId, defaultDateRange = '7day') {
   return useSelector(
-    state => state.websites[websiteId]?.dateRange || getDateRange(defaultDateRange),
+    state =>
+      state.websites[websiteId]?.dateRange || globalDefault || getDateRange(defaultDateRange),
   );
 }
diff --git a/lang/de-DE.json b/lang/de-DE.json
index df6adaa1..dbdb2b6f 100644
--- a/lang/de-DE.json
+++ b/lang/de-DE.json
@@ -1,25 +1,26 @@
 {
-  "active-users.message": "{x} {x, plural, one {aktiver Besucher} other {aktive Besucher}}",
   "button.add-account": "Konto hinzufügen",
   "button.add-website": "Webseite hinzufügen",
   "button.back": "Zurück",
   "button.cancel": "Abbrechen",
   "button.change-password": "Passwort ändern",
   "button.copy-to-clipboard": "In die Zwischenablage kopieren",
+  "button.date-range": "Date range",
   "button.delete": "Löschen",
   "button.edit": "Bearbeiten",
   "button.login": "Anmelden",
   "button.more": "Mehr",
+  "button.refresh": "Refresh",
   "button.save": "Speichern",
+  "button.single-day": "Single day",
   "button.view-details": "Details anzeigen",
   "button.websites": "Webseiten",
-  "footer.powered-by": "Powered by",
-  "header.nav.dashboard": "Übersicht",
-  "header.nav.settings": "Einstellungen",
+  "label.accounts": "Konten",
   "label.administrator": "Administrator",
   "label.confirm-password": "Passwort wiederholen",
   "label.current-password": "Derzeitiges Passwort",
   "label.custom-range": "Custom range",
+  "label.dashboard": "Übersicht",
   "label.domain": "Domain",
   "label.enable-share-url": "Freigabe-URL aktivieren",
   "label.invalid": "Ungültig",
@@ -32,19 +33,29 @@
   "label.new-password": "Neues Passwort",
   "label.password": "Passwort",
   "label.passwords-dont-match": "Passwörter stimmen nicht überein",
+  "label.profile": "Profil",
   "label.required": "Erforderlich",
+  "label.settings": "Einstellungen",
   "label.this-month": "Diesen Monat",
   "label.this-week": "Diese Woche",
   "label.this-year": "Dieses Jahr",
   "label.today": "Heute",
+  "label.unknown": "Unknown",
   "label.username": "Benutzername",
+  "label.websites": "Webseiten",
+  "message.active-users": "{x} {x, plural, one {aktiver Besucher} other {aktive Besucher}}",
   "message.confirm-delete": "Sind sie sich sicher {target} zu löschen?",
   "message.copied": "In Zwischenablage kopiert!",
   "message.delete-warning": "Alle zugehörigen Daten werden auch gelöscht.",
   "message.failure": "Es it ein Fehler aufgetreten.",
+  "message.get-share-url": "Freigabe-URL abrufen",
+  "message.get-tracking-code": "Erstelle Tracking Kennung",
+  "message.go-to-settings": "Zu den Einstellungen",
   "message.incorrect-username-password": "Falsches Passwort oder Benutzername.",
   "message.no-data-available": "Keine Daten vorhanden.",
+  "message.no-websites-configured": "Es ist keine Webseite vorhanden.",
   "message.page-not-found": "Seite nicht gefunden.",
+  "message.powered-by": "Powered by {name}",
   "message.save-success": "Erfolgreich gespeichert.",
   "message.share-url": "Dies ist der öffentliche URL zum Teilen für {target}.",
   "message.track-stats": "Um die Statistiken für {target} zu übermitteln, platzieren Sie bitte den folgenden Quelltext im {head} ihrer Homepage.",
@@ -54,6 +65,10 @@
   "metrics.bounce-rate": "Absprungrate",
   "metrics.browsers": "Browsers",
   "metrics.countries": "Länder",
+  "metrics.device.desktop": "Desktop",
+  "metrics.device.laptop": "Laptop",
+  "metrics.device.mobile": "Mobile",
+  "metrics.device.tablet": "Tablet",
   "metrics.devices": "Geräte",
   "metrics.events": "Events",
   "metrics.filter.combined": "Kombiniert",
@@ -66,11 +81,6 @@
   "metrics.unique-visitors": "Eindeutige Besucher",
   "metrics.views": "Aufrufe",
   "metrics.visitors": "Besucher",
-  "placeholder.message.go-to-settings": "Zu den Einstellungen",
-  "placeholder.message.no-websites-configured": "Es ist keine Webseite vorhanden.",
-  "settings.accounts": "Konten",
-  "settings.profile": "Profil",
-  "settings.websites": "Webseiten",
   "title.add-account": "Konto hinzugfügen",
   "title.add-website": "Webseite hinzufügen",
   "title.change-password": "Passwort ändern",
@@ -79,7 +89,5 @@
   "title.edit-account": "Konto bearbeiten",
   "title.edit-website": "Webseite bearbeiten",
   "title.share-url": "Freigabe-URL",
-  "title.tracking-code": "Tracking Kennung",
-  "tooltip.get-share-url": "Freigabe-URL abrufen",
-  "tooltip.get-tracking-code": "Erstelle Tracking Kennung"
+  "title.tracking-code": "Tracking Kennung"
 }
diff --git a/lang/en-US.json b/lang/en-US.json
index e24b9347..1feeada1 100644
--- a/lang/en-US.json
+++ b/lang/en-US.json
@@ -1,25 +1,26 @@
 {
-  "active-users.message": "{x} current {x, plural, one {visitor} other {visitors}}",
   "button.add-account": "Add account",
   "button.add-website": "Add website",
   "button.back": "Back",
   "button.cancel": "Cancel",
   "button.change-password": "Change password",
   "button.copy-to-clipboard": "Copy to clipboard",
+  "button.date-range": "Date range",
   "button.delete": "Delete",
   "button.edit": "Edit",
   "button.login": "Login",
   "button.more": "More",
+  "button.refresh": "Refresh",
   "button.save": "Save",
+  "button.single-day": "Single day",
   "button.view-details": "View details",
   "button.websites": "Websites",
-  "footer.powered-by": "Powered by",
-  "header.nav.dashboard": "Dashboard",
-  "header.nav.settings": "Settings",
+  "label.accounts": "Accounts",
   "label.administrator": "Administrator",
   "label.confirm-password": "Confirm password",
   "label.current-password": "Current password",
   "label.custom-range": "Custom range",
+  "label.dashboard": "Dashboard",
   "label.domain": "Domain",
   "label.enable-share-url": "Enable share URL",
   "label.invalid": "Invalid",
@@ -32,19 +33,29 @@
   "label.new-password": "New password",
   "label.password": "Password",
   "label.passwords-dont-match": "Passwords don't match",
+  "label.profile": "Profile",
   "label.required": "Required",
+  "label.settings": "Settings",
   "label.this-month": "This month",
   "label.this-week": "This week",
   "label.this-year": "This year",
   "label.today": "Today",
+  "label.unknown": "Unknown",
   "label.username": "Username",
+  "label.websites": "Websites",
+  "message.active-users": "{x} current {x, plural, one {visitor} other {visitors}}",
   "message.confirm-delete": "Are your sure you want to delete {target}?",
   "message.copied": "Copied!",
   "message.delete-warning": "All associated data will be deleted as well.",
   "message.failure": "Something went wrong.",
+  "message.get-share-url": "Get share URL",
+  "message.get-tracking-code": "Get tracking code",
+  "message.go-to-settings": "Go to settings",
   "message.incorrect-username-password": "Incorrect username/password.",
   "message.no-data-available": "No data available.",
+  "message.no-websites-configured": "You don't have any websites configured.",
   "message.page-not-found": "Page not found.",
+  "message.powered-by": "Powered by {name}",
   "message.save-success": "Saved successfully.",
   "message.share-url": "This is the publicly shared URL for {target}.",
   "message.track-stats": "To track stats for {target}, place the following code in the {head} section of your website.",
@@ -54,6 +65,10 @@
   "metrics.bounce-rate": "Bounce rate",
   "metrics.browsers": "Browsers",
   "metrics.countries": "Countries",
+  "metrics.device.desktop": "Desktop",
+  "metrics.device.laptop": "Laptop",
+  "metrics.device.mobile": "Mobile",
+  "metrics.device.tablet": "Tablet",
   "metrics.devices": "Devices",
   "metrics.events": "Events",
   "metrics.filter.combined": "Combined",
@@ -66,11 +81,6 @@
   "metrics.unique-visitors": "Unique visitors",
   "metrics.views": "Views",
   "metrics.visitors": "Visitors",
-  "placeholder.message.go-to-settings": "Go to settings",
-  "placeholder.message.no-websites-configured": "You don't have any websites configured.",
-  "settings.accounts": "Accounts",
-  "settings.profile": "Profile",
-  "settings.websites": "Websites",
   "title.add-account": "Add account",
   "title.add-website": "Add website",
   "title.change-password": "Change password",
@@ -79,7 +89,5 @@
   "title.edit-account": "Edit account",
   "title.edit-website": "Edit website",
   "title.share-url": "Share URL",
-  "title.tracking-code": "Tracking code",
-  "tooltip.get-share-url": "Get share URL",
-  "tooltip.get-tracking-code": "Get tracking code"
+  "title.tracking-code": "Tracking code"
 }
diff --git a/lang/es-MX.json b/lang/es-MX.json
index e089ef7f..c42d15b4 100644
--- a/lang/es-MX.json
+++ b/lang/es-MX.json
@@ -1,25 +1,26 @@
 {
-  "active-users.message": "{x} {x, plural, one {activo} other {activos}}",
   "button.add-account": "Agregar usuario",
   "button.add-website": "Agregar sitio",
   "button.back": "Atrás",
   "button.cancel": "Cancelar",
   "button.change-password": "Cambiar contraseña",
   "button.copy-to-clipboard": "Copiar al portapapeles",
+  "button.date-range": "Date range",
   "button.delete": "Eliminar",
   "button.edit": "Editar",
   "button.login": "Iniciar sesión",
   "button.more": "Más",
+  "button.refresh": "Refresh",
   "button.save": "Guardar",
+  "button.single-day": "Single day",
   "button.view-details": "Ver detalles",
   "button.websites": "Sitios",
-  "footer.powered-by": "Desarrollado con",
-  "header.nav.dashboard": "Panel de control",
-  "header.nav.settings": "Configuraciones",
+  "label.accounts": "Usuarios",
   "label.administrator": "Administrador",
   "label.confirm-password": "Confirmar contraseña",
   "label.current-password": "Contraseña actual",
   "label.custom-range": "Custom range",
+  "label.dashboard": "Panel de control",
   "label.domain": "Dominio",
   "label.enable-share-url": "Habilitar compartir URL",
   "label.invalid": "Inválido",
@@ -32,19 +33,29 @@
   "label.new-password": "Nueva contraseña",
   "label.password": "Contraseña",
   "label.passwords-dont-match": "Las contraseñas no coinciden",
+  "label.profile": "Perfil",
   "label.required": "Requerido",
+  "label.settings": "Configuraciones",
   "label.this-month": "Este mes",
   "label.this-week": "Esta semana",
   "label.this-year": "Este año",
   "label.today": "Hoy",
+  "label.unknown": "Unknown",
   "label.username": "Nombre de usuario",
+  "label.websites": "Sitios",
+  "message.active-users": "{x} {x, plural, one {activo} other {activos}}",
   "message.confirm-delete": "¿Estás seguro(a) de querer eliminar {target}?",
   "message.copied": "Copiado!",
   "message.delete-warning": "Toda la información relacionada será eliminada.",
   "message.failure": "Algo falló.",
+  "message.get-share-url": "Obtener URL para compartir",
+  "message.get-tracking-code": "Obtener código de rastreo",
+  "message.go-to-settings": "Ir a la configuración",
   "message.incorrect-username-password": "Nombre de usuario o contraseña incorrectos.",
   "message.no-data-available": "Sin información disponible.",
+  "message.no-websites-configured": "No tienes ningún sitio configurado.",
   "message.page-not-found": "Page not found",
+  "message.powered-by": "Desarrollado con {name}",
   "message.save-success": "Guardado exitosamente.",
   "message.share-url": "Esta es la URL compartida públicamente para {target}.",
   "message.track-stats": "Para registrar estadísticas para {target}, copia el siguiente código dentro de la etiqueta {head} de tu sitio.",
@@ -54,6 +65,10 @@
   "metrics.bounce-rate": "Porcentaje de rebote",
   "metrics.browsers": "Navegadores",
   "metrics.countries": "Países",
+  "metrics.device.desktop": "Desktop",
+  "metrics.device.laptop": "Laptop",
+  "metrics.device.mobile": "Mobile",
+  "metrics.device.tablet": "Tablet",
   "metrics.devices": "Dispositivos",
   "metrics.events": "Eventos",
   "metrics.filter.combined": "Combinado",
@@ -66,11 +81,6 @@
   "metrics.unique-visitors": "Visitantes únicos",
   "metrics.views": "Vistas",
   "metrics.visitors": "Visitantes",
-  "placeholder.message.go-to-settings": "Ir a la configuración",
-  "placeholder.message.no-websites-configured": "No tienes ningún sitio configurado.",
-  "settings.accounts": "Usuarios",
-  "settings.profile": "Perfil",
-  "settings.websites": "Sitios",
   "title.add-account": "Agregar usuario",
   "title.add-website": "Agregar sitio",
   "title.change-password": "Cambiar contraseña",
@@ -79,7 +89,5 @@
   "title.edit-account": "Editar usuario",
   "title.edit-website": "Editar sitio",
   "title.share-url": "Compartir URL",
-  "title.tracking-code": "Código de rastreo",
-  "tooltip.get-share-url": "Obtener URL para compartir",
-  "tooltip.get-tracking-code": "Obtener código de rastreo"
+  "title.tracking-code": "Código de rastreo"
 }
diff --git a/lang/fr-FR.json b/lang/fr-FR.json
index f333ade5..c4a12df2 100644
--- a/lang/fr-FR.json
+++ b/lang/fr-FR.json
@@ -1,25 +1,26 @@
 {
-  "active-users.message": "{x} {x, plural, one {visiteur} other {visiteurs}} actuellement",
   "button.add-account": "Ajouter un compte",
   "button.add-website": "Ajouter un site",
   "button.back": "Retour",
   "button.cancel": "Annuler",
   "button.change-password": "Changer de mot de passse",
   "button.copy-to-clipboard": "Copier dans le presse papier",
+  "button.date-range": "Date range",
   "button.delete": "Supprimer",
   "button.edit": "Modifier",
   "button.login": "Connexion",
   "button.more": "Plus",
+  "button.refresh": "Refresh",
   "button.save": "Sauvegarder",
+  "button.single-day": "Single day",
   "button.view-details": "Voir les details",
   "button.websites": "Sites",
-  "footer.powered-by": "Propulsé par",
-  "header.nav.dashboard": "Tableau de bord",
-  "header.nav.settings": "Paramètres",
+  "label.accounts": "Comptes",
   "label.administrator": "Administrateur",
   "label.confirm-password": "Confirmation du mot de passe",
   "label.current-password": "Mot de passe actuel",
   "label.custom-range": "Plage personnalisée",
+  "label.dashboard": "Tableau de bord",
   "label.domain": "Domaine",
   "label.enable-share-url": "Activer le partage d'URL",
   "label.invalid": "Invalide",
@@ -32,19 +33,29 @@
   "label.new-password": "Nouveau mot de passe",
   "label.password": "Mot de passe",
   "label.passwords-dont-match": "Les mots de passe ne correspondent pas",
+  "label.profile": "Profile",
   "label.required": "Requis",
+  "label.settings": "Paramètres",
   "label.this-month": "Ce mois ci",
   "label.this-week": "Cette semaine",
   "label.this-year": "Cette année",
   "label.today": "Aujourd'hui",
+  "label.unknown": "Unknown",
   "label.username": "Nom d'utilisateur",
+  "label.websites": "Sites",
+  "message.active-users": "{x} {x, plural, one {visiteur} other {visiteurs}} actuellement",
   "message.confirm-delete": "Êtes-vous sur de vouloir supprimer {target}?",
   "message.copied": "Copié !",
   "message.delete-warning": "Toutes les données associées seront également supprimées.",
   "message.failure": "Un problème est survenu.",
+  "message.get-share-url": "Obtenez l'URL de partage",
+  "message.get-tracking-code": "Obtenez le code de suivi",
+  "message.go-to-settings": "Aller aux paramètres",
   "message.incorrect-username-password": "nom d'utilisateurs/mot de passe incorrect.",
   "message.no-data-available": "Pas de données disponibles.",
+  "message.no-websites-configured": "Vous n'avez configuré aucun site Web.",
   "message.page-not-found": "Page non trouvée.",
+  "message.powered-by": "Propulsé par {name}",
   "message.save-success": "Enregistré avec succès.",
   "message.share-url": "Ceci est l'URL partagée pour {target}.",
   "message.track-stats": "Pour suivre les statistiques de {target}, placez le code suivant dans la section {head} de votre site Web.",
@@ -54,6 +65,10 @@
   "metrics.bounce-rate": "Taux de rebond",
   "metrics.browsers": "Navigateurs",
   "metrics.countries": "Pays",
+  "metrics.device.desktop": "Desktop",
+  "metrics.device.laptop": "Laptop",
+  "metrics.device.mobile": "Mobile",
+  "metrics.device.tablet": "Tablet",
   "metrics.devices": "Appareils",
   "metrics.events": "Événements",
   "metrics.filter.combined": "Combiné",
@@ -66,11 +81,6 @@
   "metrics.unique-visitors": "Visiteurs uniques",
   "metrics.views": "Vues",
   "metrics.visitors": "Visiteurs",
-  "placeholder.message.go-to-settings": "Aller aux paramètres",
-  "placeholder.message.no-websites-configured": "Vous n'avez configuré aucun site Web.",
-  "settings.accounts": "Comptes",
-  "settings.profile": "Profile",
-  "settings.websites": "Sites",
   "title.add-account": "Ajouter un compte",
   "title.add-website": "Ajouter un site",
   "title.change-password": "Changer le mot de passe",
@@ -79,7 +89,5 @@
   "title.edit-account": "Modifier le compte",
   "title.edit-website": "Modifier le site",
   "title.share-url": "Partager l'URL",
-  "title.tracking-code": "Code de suivi",
-  "tooltip.get-share-url": "Obtenez l'URL de partage",
-  "tooltip.get-tracking-code": "Obtenez le code de suivi"
+  "title.tracking-code": "Code de suivi"
 }
diff --git a/lang/ja-JP.json b/lang/ja-JP.json
index cdeec4c8..a2529db5 100644
--- a/lang/ja-JP.json
+++ b/lang/ja-JP.json
@@ -1,25 +1,26 @@
 {
-  "active-users.message": "{x}人が閲覧中です。",
   "button.add-account": "アカウントを追加する",
   "button.add-website": "Webサイトを追加する",
   "button.back": "戻る",
   "button.cancel": "キャンセル",
   "button.change-password": "パスワード変更",
   "button.copy-to-clipboard": "クリップボードにコピー",
+  "button.date-range": "Date range",
   "button.delete": "削除",
   "button.edit": "編集",
   "button.login": "ログイン",
   "button.more": "さらに表示",
+  "button.refresh": "Refresh",
   "button.save": "保存",
+  "button.single-day": "Single day",
   "button.view-details": "詳細表示",
   "button.websites": "Webサイト",
-  "footer.powered-by": "Powered by",
-  "header.nav.dashboard": "ダッシュボード",
-  "header.nav.settings": "設定",
+  "label.accounts": "アカウント",
   "label.administrator": "管理者",
   "label.confirm-password": "パスワード（確認）",
   "label.current-password": "現在のパスワード",
   "label.custom-range": "Custom range",
+  "label.dashboard": "ダッシュボード",
   "label.domain": "ドメイン",
   "label.enable-share-url": "共有リンクを有効にする",
   "label.invalid": "無効",
@@ -32,19 +33,29 @@
   "label.new-password": "新しいパスワード",
   "label.password": "パスワード",
   "label.passwords-dont-match": "パスワードが一致しません",
+  "label.profile": "プロファイル",
   "label.required": "必須",
+  "label.settings": "設定",
   "label.this-month": "今月",
   "label.this-week": "今週",
   "label.this-year": "今年",
   "label.today": "今日",
+  "label.unknown": "Unknown",
   "label.username": "ユーザー名",
+  "label.websites": "Webサイト",
+  "message.active-users": "{x}人が閲覧中です。",
   "message.confirm-delete": "{target}を削除してもよろしいですか？",
   "message.copied": "コピーしました！",
   "message.delete-warning": "関連するすべてのデータも削除されます。",
   "message.failure": "問題が発生しました。",
+  "message.get-share-url": "共有リンクを取得",
+  "message.get-tracking-code": "トラッキングコードを取得",
+  "message.go-to-settings": "設定する",
   "message.incorrect-username-password": "ユーザー名/パスワードが正しくありません。",
   "message.no-data-available": "データがありません。",
+  "message.no-websites-configured": "Webサイトが設定されていません。",
   "message.page-not-found": "ページが見つかりません。",
+  "message.powered-by": "Powered by {name}",
   "message.save-success": "正常に保存されました。",
   "message.share-url": "これは {target} の共有リンクです。",
   "message.track-stats": "{target}のアクセス解析を開始するには、次のコードをWebサイトの{head}セクションへ追加してください。",
@@ -54,6 +65,10 @@
   "metrics.bounce-rate": "直帰率",
   "metrics.browsers": "ブラウザ",
   "metrics.countries": "国",
+  "metrics.device.desktop": "Desktop",
+  "metrics.device.laptop": "Laptop",
+  "metrics.device.mobile": "Mobile",
+  "metrics.device.tablet": "Tablet",
   "metrics.devices": "デバイス",
   "metrics.events": "イベント",
   "metrics.filter.combined": "パスまで",
@@ -66,11 +81,6 @@
   "metrics.unique-visitors": "ユニーク訪問者数",
   "metrics.views": "閲覧数",
   "metrics.visitors": "訪問者数",
-  "placeholder.message.go-to-settings": "設定する",
-  "placeholder.message.no-websites-configured": "Webサイトが設定されていません。",
-  "settings.accounts": "アカウント",
-  "settings.profile": "プロファイル",
-  "settings.websites": "Webサイト",
   "title.add-account": "アカウントの追加",
   "title.add-website": "Webサイトの追加",
   "title.change-password": "パスワード変更",
@@ -79,7 +89,5 @@
   "title.edit-account": "アカウントの編集",
   "title.edit-website": "Webサイトの編集",
   "title.share-url": "共有リンク",
-  "title.tracking-code": "トラッキングコード",
-  "tooltip.get-share-url": "共有リンクを取得",
-  "tooltip.get-tracking-code": "トラッキングコードを取得"
+  "title.tracking-code": "トラッキングコード"
 }
diff --git a/lang/mn-MN.json b/lang/mn-MN.json
index 2b4d7743..ab38ebb8 100644
--- a/lang/mn-MN.json
+++ b/lang/mn-MN.json
@@ -1,25 +1,26 @@
 {
-  "active-users.message": "одоо {x} {x, plural, one {зочин} other {зочин}} байна",
   "button.add-account": "Хэрэглэгч нэмэх",
   "button.add-website": "Веб нэмэх",
   "button.back": "Буцах",
   "button.cancel": "Цуцлах",
   "button.change-password": "Нууц үг солих",
   "button.copy-to-clipboard": "Хуулах",
+  "button.date-range": "Date range",
   "button.delete": "Устгах",
   "button.edit": "Засах",
   "button.login": "Нэвтрэх",
   "button.more": "Цааш",
+  "button.refresh": "Refresh",
   "button.save": "Хадгалах",
+  "button.single-day": "Single day",
   "button.view-details": "Дэлгэрүүлж харах",
   "button.websites": "Вебүүд",
-  "footer.powered-by": "Powered by",
-  "header.nav.dashboard": "Хянах самбар",
-  "header.nav.settings": "Тохиргоо",
+  "label.accounts": "Хэрэглэгчид",
   "label.administrator": "Админ",
   "label.confirm-password": "Шинэ нууц үгээ давтах",
   "label.current-password": "Ашиглаж буй нууц үг",
   "label.custom-range": "Дурын хугацаа",
+  "label.dashboard": "Хянах самбар",
   "label.domain": "Домэйн",
   "label.enable-share-url": "Хуваалцах холбоос идэвхжүүлэх",
   "label.invalid": "Буруу",
@@ -32,19 +33,29 @@
   "label.new-password": "Шинэ нууц үг",
   "label.password": "Нууц үг",
   "label.passwords-dont-match": "Нууц үг тохирохгүй байна",
+  "label.profile": "Бүртгэл",
   "label.required": "Шаардлагатай",
+  "label.settings": "Тохиргоо",
   "label.this-month": "Энэ сар",
   "label.this-week": "Энэ долоо хоног",
   "label.this-year": "Энэ жил",
   "label.today": "Өнөөдөр",
+  "label.unknown": "Unknown",
   "label.username": "Хэрэглэгчийн нэр",
+  "label.websites": "Вебүүд",
+  "message.active-users": "одоо {x} {x, plural, one {зочин} other {зочин}} байна",
   "message.confirm-delete": "Та {target}-г устгахдаа итгэлтэй байна уу?",
   "message.copied": "Хуулсан!",
   "message.delete-warning": "Үүнтэй холбоотой бүх өгөгдөл устах болно.",
   "message.failure": "Ямар нэг зүйл буруу боллоо.",
+  "message.get-share-url": "Хуваалцах холбоос авах",
+  "message.get-tracking-code": "Мөрдөх код авах",
+  "message.go-to-settings": "Тохиргоо руу очих",
   "message.incorrect-username-password": "Буруу хэрэглэгчийн нэр/нууц үг.",
   "message.no-data-available": "Өгөгдөл алга.",
+  "message.no-websites-configured": "Та ямар нэгэн веб тохируулаагүй байна.",
   "message.page-not-found": "Хуудас олдсонгүй.",
+  "message.powered-by": "Powered by {name}",
   "message.save-success": "Амжилттай хадгаллаа.",
   "message.share-url": "{target}-г нийтэд хуваалцах холбоос.",
   "message.track-stats": "{target} вебийн статистикийг бүртгэхийн тулд доорх кодыг вебийнхээ {head} хэсэгт байрлуулна уу.",
@@ -54,6 +65,10 @@
   "metrics.bounce-rate": "Нэг хуудас үзээд гарсан",
   "metrics.browsers": "Хөтөч",
   "metrics.countries": "Улс",
+  "metrics.device.desktop": "Desktop",
+  "metrics.device.laptop": "Laptop",
+  "metrics.device.mobile": "Mobile",
+  "metrics.device.tablet": "Tablet",
   "metrics.devices": "Төхөөрөмж",
   "metrics.events": "Үйлдэл",
   "metrics.filter.combined": "Нэгтгэсэн",
@@ -66,11 +81,6 @@
   "metrics.unique-visitors": "Зочид",
   "metrics.views": "Үзсэн",
   "metrics.visitors": "Зочид",
-  "placeholder.message.go-to-settings": "Тохиргоо руу очих",
-  "placeholder.message.no-websites-configured": "Та ямар нэгэн веб тохируулаагүй байна.",
-  "settings.accounts": "Хэрэглэгчид",
-  "settings.profile": "Бүртгэл",
-  "settings.websites": "Вебүүд",
   "title.add-account": "Хэрэглэгч нэмэх",
   "title.add-website": "Веб нэмэх",
   "title.change-password": "Нууц үг солих",
@@ -79,7 +89,5 @@
   "title.edit-account": "Хэрэглэгч засах",
   "title.edit-website": "Веб засах",
   "title.share-url": "Хуваалцах холбоос",
-  "title.tracking-code": "Мөрдөх код",
-  "tooltip.get-share-url": "Хуваалцах холбоос авах",
-  "tooltip.get-tracking-code": "Мөрдөх код авах"
+  "title.tracking-code": "Мөрдөх код"
 }
diff --git a/lang/nl-NL.json b/lang/nl-NL.json
index 8d97ca43..ef781c3a 100644
--- a/lang/nl-NL.json
+++ b/lang/nl-NL.json
@@ -1,25 +1,26 @@
 {
-  "active-users.message": "{x} actieve {x, plural, one {bezoeker} other {bezoekers}}",
   "button.add-account": "Account toevoegen",
   "button.add-website": "Website toevoegen",
   "button.back": "Terug",
   "button.cancel": "Annuleren",
   "button.change-password": "Wachtwoord wijzigen",
   "button.copy-to-clipboard": "Kopiëer naar klembord",
+  "button.date-range": "Date range",
   "button.delete": "Verwijderen",
   "button.edit": "Bewerken",
   "button.login": "Inloggen",
   "button.more": "Toon meer",
+  "button.refresh": "Refresh",
   "button.save": "Opslaan",
+  "button.single-day": "Single day",
   "button.view-details": "Meer details",
   "button.websites": "Websites",
-  "footer.powered-by": "mogelijk gemaakt door",
-  "header.nav.dashboard": "Dashboard",
-  "header.nav.settings": "Instellingen",
+  "label.accounts": "Accounts",
   "label.administrator": "Administrator",
   "label.confirm-password": "Wachtwoord bevestigen",
   "label.current-password": "Huidig wachtwoord",
   "label.custom-range": "Custom range",
+  "label.dashboard": "Dashboard",
   "label.domain": "Domein",
   "label.enable-share-url": "Sta delen via openbare URL toe",
   "label.invalid": "Ongeldig",
@@ -32,19 +33,29 @@
   "label.new-password": "Nieuw wachtwoord",
   "label.password": "Wachtwoord",
   "label.passwords-dont-match": "Wachtwoorden komen niet overeen",
+  "label.profile": "Profiel",
   "label.required": "Verplicht",
+  "label.settings": "Instellingen",
   "label.this-month": "Deze maand",
   "label.this-week": "Deze week",
   "label.this-year": "Dit jaar",
   "label.today": "Vandaag",
+  "label.unknown": "Unknown",
   "label.username": "Gebruikersnaam",
+  "label.websites": "Websites",
+  "message.active-users": "{x} actieve {x, plural, one {bezoeker} other {bezoekers}}",
   "message.confirm-delete": "Weet je zeker dat je {target} wilt verwijderen?",
   "message.copied": "Gekopiëerd!",
   "message.delete-warning": "Alle verwante gegezens zullen ook verwijderd worden.",
   "message.failure": "Er is iets misgegaan.",
+  "message.get-share-url": "Openbare URL",
+  "message.get-tracking-code": "Tracking code",
+  "message.go-to-settings": "Naar instellingen",
   "message.incorrect-username-password": "Incorrecte gebruikersnaam/wachtwoord.",
   "message.no-data-available": "Geen gegevens beschikbaar.",
+  "message.no-websites-configured": "Je hebt geen websites ingesteld.",
   "message.page-not-found": "Pagina niet gevonden.",
+  "message.powered-by": "mogelijk gemaakt door {name}",
   "message.save-success": "Opslaan succesvol.",
   "message.share-url": "Met deze URL kan {target} openbaar gedeeld worden.",
   "message.track-stats": "Om statistieken voor {target} bij te houden, plaats je de volgende code in het {head} gedeelte van je website.",
@@ -54,6 +65,10 @@
   "metrics.bounce-rate": "Bouncepercentage",
   "metrics.browsers": "Browsers",
   "metrics.countries": "Landen",
+  "metrics.device.desktop": "Desktop",
+  "metrics.device.laptop": "Laptop",
+  "metrics.device.mobile": "Mobile",
+  "metrics.device.tablet": "Tablet",
   "metrics.devices": "Apparaten",
   "metrics.events": "Gebeurtenissen",
   "metrics.filter.combined": "Gecombineerd",
@@ -66,11 +81,6 @@
   "metrics.unique-visitors": "Unieke bezoekers",
   "metrics.views": "Weergaven",
   "metrics.visitors": "Bezoekers",
-  "placeholder.message.go-to-settings": "Naar instellingen",
-  "placeholder.message.no-websites-configured": "Je hebt geen websites ingesteld.",
-  "settings.accounts": "Accounts",
-  "settings.profile": "Profiel",
-  "settings.websites": "Websites",
   "title.add-account": "Account toevoegen",
   "title.add-website": "Website toevoegen",
   "title.change-password": "Wachtwoord wijzigen",
@@ -79,7 +89,5 @@
   "title.edit-account": "Account bewerken",
   "title.edit-website": "Website bewerken",
   "title.share-url": "URL delen",
-  "title.tracking-code": "Tracking code",
-  "tooltip.get-share-url": "Openbare URL",
-  "tooltip.get-tracking-code": "Tracking code"
+  "title.tracking-code": "Tracking code"
 }
diff --git a/lang/ru-RU.json b/lang/ru-RU.json
index c2c24a10..fda4511f 100644
--- a/lang/ru-RU.json
+++ b/lang/ru-RU.json
@@ -1,25 +1,26 @@
 {
-  "active-users.message": "{x} текущих посетителей",
   "button.add-account": "Добавить аккаунт",
   "button.add-website": "Добавить сайт",
   "button.back": "Назад",
   "button.cancel": "Отменить",
   "button.change-password": "Изменить пароль",
   "button.copy-to-clipboard": "Скопировать в буфер обмена",
+  "button.date-range": "Date range",
   "button.delete": "Удалить",
   "button.edit": "Редактировать",
   "button.login": "Войти",
   "button.more": "Больше",
+  "button.refresh": "Refresh",
   "button.save": "Сохранить",
+  "button.single-day": "Single day",
   "button.view-details": "Посмотреть детали",
   "button.websites": "Сайты",
-  "footer.powered-by": "На движке",
-  "header.nav.dashboard": "Информационная панель",
-  "header.nav.settings": "Настройки",
+  "label.accounts": "Аккаунты",
   "label.administrator": "Администратор",
   "label.confirm-password": "Подтвердить пароль",
   "label.current-password": "Текущий пароль",
   "label.custom-range": "Другой период",
+  "label.dashboard": "Информационная панель",
   "label.domain": "Домен",
   "label.enable-share-url": "Разрешить делиться ссылкой",
   "label.invalid": "Некорректный",
@@ -32,19 +33,29 @@
   "label.new-password": "Новый пароль",
   "label.password": "Пароль",
   "label.passwords-dont-match": "Пароли не совпадают",
+  "label.profile": "Профиль",
   "label.required": "Обязательное",
+  "label.settings": "Настройки",
   "label.this-month": "Этот месяц",
   "label.this-week": "Эта неделя",
   "label.this-year": "Этот год",
   "label.today": "Сегодня",
+  "label.unknown": "Unknown",
   "label.username": "Имя пользователя",
+  "label.websites": "Сайты",
+  "message.active-users": "{x} текущих посетителей",
   "message.confirm-delete": "Вы уверены, что хотите удалить {target}?",
   "message.copied": "Скопировано!",
   "message.delete-warning": "Все связанные данные будут также удалены.",
   "message.failure": "Что-то пошло не так.",
+  "message.get-share-url": "Получить публичную ссылку",
+  "message.get-tracking-code": "Получить код отслеживания",
+  "message.go-to-settings": "Перейти к настройкам",
   "message.incorrect-username-password": "Неверное имя пользователя/пароль.",
   "message.no-data-available": "Нет данных.",
+  "message.no-websites-configured": "У вас нет настроенных сайтов.",
   "message.page-not-found": "Страница не найдена.",
+  "message.powered-by": "на движке {name}",
   "message.save-success": "Успешно сохранено.",
   "message.share-url": "Это публичная ссылка для {target}.",
   "message.track-stats": "Чтобы отслеживать статистику для {target}, поместите следующий код в раздел {head} вашего сайта.",
@@ -54,6 +65,10 @@
   "metrics.bounce-rate": "Отказы",
   "metrics.browsers": "Браузеры",
   "metrics.countries": "Страны",
+  "metrics.device.desktop": "Desktop",
+  "metrics.device.laptop": "Laptop",
+  "metrics.device.mobile": "Mobile",
+  "metrics.device.tablet": "Tablet",
   "metrics.devices": "Устройства",
   "metrics.events": "События",
   "metrics.filter.combined": "Объединенные",
@@ -66,11 +81,6 @@
   "metrics.unique-visitors": "Уникальные посетители",
   "metrics.views": "Просмотры",
   "metrics.visitors": "Посетители",
-  "placeholder.message.go-to-settings": "Перейти к настройкам",
-  "placeholder.message.no-websites-configured": "У вас нет настроенных сайтов.",
-  "settings.accounts": "Аккаунты",
-  "settings.profile": "Профиль",
-  "settings.websites": "Сайты",
   "title.add-account": "Добавить аккаунт",
   "title.add-website": "Добавить сайт",
   "title.change-password": "Изменить пароль",
@@ -79,7 +89,5 @@
   "title.edit-account": "Редактировать аккаунт",
   "title.edit-website": "Редактировать сайт",
   "title.share-url": "Поделиться ссылкой",
-  "title.tracking-code": "Код отслеживания",
-  "tooltip.get-share-url": "Получить публичную ссылку",
-  "tooltip.get-tracking-code": "Получить код отслеживания"
+  "title.tracking-code": "Код отслеживания"
 }
diff --git a/lang/tr-TR.json b/lang/tr-TR.json
index 8e9f100c..eeced942 100644
--- a/lang/tr-TR.json
+++ b/lang/tr-TR.json
@@ -1,25 +1,26 @@
 {
-  "active-users.message": "{x} aktif ziyaretçi",
   "button.add-account": "Yeni Hesap Ekle",
   "button.add-website": "Web sitesi ekle",
   "button.back": "Geri",
   "button.cancel": "İptal",
   "button.change-password": "Şifre değiştir",
   "button.copy-to-clipboard": "Panoya kopyala",
+  "button.date-range": "Date range",
   "button.delete": "Sil",
   "button.edit": "Düzenle",
   "button.login": "Giriş Yap",
   "button.more": "Detaylı göster",
+  "button.refresh": "Refresh",
   "button.save": "Kaydet",
+  "button.single-day": "Single day",
   "button.view-details": "Detayı incele",
   "button.websites": "Web siteleri",
-  "footer.powered-by": "Sağlayıcı:",
-  "header.nav.dashboard": "Kontrol Paneli",
-  "header.nav.settings": "Ayarlar",
+  "label.accounts": "Hesaplar",
   "label.administrator": "Yönetici",
   "label.confirm-password": "Parolayı onayla",
   "label.current-password": "Mevcut parola",
   "label.custom-range": "Custom range",
+  "label.dashboard": "Kontrol Paneli",
   "label.domain": "Alan adı",
   "label.enable-share-url": "Anonim paylaşım URL'i aktif",
   "label.invalid": "Geçeriz",
@@ -32,19 +33,29 @@
   "label.new-password": "Yeni parola",
   "label.password": "Parola",
   "label.passwords-dont-match": "Parolalar uyuşmuyor",
+  "label.profile": "Profil",
   "label.required": "Zorunlu alan",
+  "label.settings": "Ayarlar",
   "label.this-month": "Bu ay",
   "label.this-week": "Bu hafta",
   "label.this-year": "Bu yıl",
   "label.today": "Bugün",
+  "label.unknown": "Unknown",
   "label.username": "Kullanıcı adı",
+  "label.websites": "Web siteleri",
+  "message.active-users": "{x} aktif ziyaretçi",
   "message.confirm-delete": "{target} kaydını silmek istediğinizden emin misiniz?",
   "message.copied": "Panoya kopyalandı!",
   "message.delete-warning": "İlişkili tüm veriler de  silinecektir.",
   "message.failure": "Bir şeyler ters gitti!",
+  "message.get-share-url": "Paylaşım adresini al",
+  "message.get-tracking-code": "İzleme kodunu al",
+  "message.go-to-settings": "Ayarlara git",
   "message.incorrect-username-password": "Hatalı kullanıcı adı ya da parola.",
   "message.no-data-available": "Henüz hiç veri yok.",
+  "message.no-websites-configured": "Henüz hiç web sitesi tanımlamadınız",
   "message.page-not-found": "Sayfa bulunamadı.",
+  "message.powered-by": "Sağlayıcı: {name}",
   "message.save-success": "Başarıyla kaydedildi.",
   "message.share-url": "{target} için kullanılabilir anonim paylaşım adresidir.",
   "message.track-stats": "{target} alanı adı istatistiklerini takip etmek için, aşağıdaki kodu web sitenizin {head} bloğuna yerleştirin.",
@@ -54,6 +65,10 @@
   "metrics.bounce-rate": "Çıkma oranı",
   "metrics.browsers": "Tarayıcılar",
   "metrics.countries": "Ülkeler",
+  "metrics.device.desktop": "Desktop",
+  "metrics.device.laptop": "Laptop",
+  "metrics.device.mobile": "Mobile",
+  "metrics.device.tablet": "Tablet",
   "metrics.devices": "Cihazlar",
   "metrics.events": "Olaylar",
   "metrics.filter.combined": "Birleşik",
@@ -66,11 +81,6 @@
   "metrics.unique-visitors": "Tekil kullanıcı",
   "metrics.views": "Görüntüleme",
   "metrics.visitors": "Ziyaretçi",
-  "placeholder.message.go-to-settings": "Ayarlara git",
-  "placeholder.message.no-websites-configured": "Henüz hiç web sitesi tanımlamadınız",
-  "settings.accounts": "Hesaplar",
-  "settings.profile": "Profil",
-  "settings.websites": "Web siteleri",
   "title.add-account": "Hesap ekle",
   "title.add-website": "Web sitesi ekle",
   "title.change-password": "Şifre değiştir",
@@ -79,7 +89,5 @@
   "title.edit-account": "Hesabı düzenle",
   "title.edit-website": "Web sitesini düzenle",
   "title.share-url": "Paylaşım adresi",
-  "title.tracking-code": "İzleme kodu",
-  "tooltip.get-share-url": "Paylaşım adresini al",
-  "tooltip.get-tracking-code": "İzleme kodunu al"
+  "title.tracking-code": "İzleme kodu"
 }
diff --git a/lang/zh-CN.json b/lang/zh-CN.json
index 1f21eb0f..3e192a64 100644
--- a/lang/zh-CN.json
+++ b/lang/zh-CN.json
@@ -1,25 +1,26 @@
 {
-  "active-users.message": "当前在线 {x} 人",
   "button.add-account": "添加账户",
   "button.add-website": "添加网站",
   "button.back": "返回",
   "button.cancel": "取消",
   "button.change-password": "更新密码",
   "button.copy-to-clipboard": "复制",
+  "button.date-range": "多日",
   "button.delete": "删除",
   "button.edit": "编辑",
   "button.login": "登录",
   "button.more": "更多",
+  "button.refresh": "刷新",
   "button.save": "保存",
+  "button.single-day": "单日",
   "button.view-details": "查看更多",
   "button.websites": "网站",
-  "footer.powered-by": "运行",
-  "header.nav.dashboard": "仪表板",
-  "header.nav.settings": "设置",
+  "label.accounts": "账户",
   "label.administrator": "管理员",
   "label.confirm-password": "确认密码",
   "label.current-password": "目前密码",
-  "label.custom-range": "Custom range",
+  "label.custom-range": "自定义时间段",
+  "label.dashboard": "仪表板",
   "label.domain": "域名",
   "label.enable-share-url": "激活共享链接",
   "label.invalid": "输入无效",
@@ -32,19 +33,29 @@
   "label.new-password": "新密码",
   "label.password": "密码",
   "label.passwords-dont-match": "密码不一致",
+  "label.profile": "个人资料",
   "label.required": "必填",
+  "label.settings": "设置",
   "label.this-month": "本月",
   "label.this-week": "本周",
   "label.this-year": "今年",
   "label.today": "今天",
+  "label.unknown": "未知",
   "label.username": "用户名",
+  "label.websites": "网站",
+  "message.active-users": "当前在线 {x} 人",
   "message.confirm-delete": "你确定要删除{target}吗?",
   "message.copied": "复制成功!",
   "message.delete-warning": "所有相关数据将会被删除.",
   "message.failure": "出现错误.",
+  "message.get-share-url": "获得共享链接",
+  "message.get-tracking-code": "获得跟踪代码",
+  "message.go-to-settings": "去设置",
   "message.incorrect-username-password": "用户名密码不正确.",
   "message.no-data-available": "无可用数据.",
+  "message.no-websites-configured": "你还没有设置任何网站.",
   "message.page-not-found": "网页未找到.",
+  "message.powered-by": "运行 {name}",
   "message.save-success": "成功保存.",
   "message.share-url": "这是 {target} 的共享链接.",
   "message.track-stats": "把以下代码放到你的网站的{head}部分来收集{target}的数据.",
@@ -54,6 +65,10 @@
   "metrics.bounce-rate": "跳出率",
   "metrics.browsers": "浏览器",
   "metrics.countries": "国家",
+  "metrics.device.desktop": "台式机",
+  "metrics.device.laptop": "笔记本",
+  "metrics.device.mobile": "手机",
+  "metrics.device.tablet": "平板",
   "metrics.devices": "设备",
   "metrics.events": "行为类别",
   "metrics.filter.combined": "总和",
@@ -66,11 +81,6 @@
   "metrics.unique-visitors": "独立访客",
   "metrics.views": "页面流量",
   "metrics.visitors": "独立访客",
-  "placeholder.message.go-to-settings": "去设置",
-  "placeholder.message.no-websites-configured": "你还没有设置任何网站.",
-  "settings.accounts": "账户",
-  "settings.profile": "个人资料",
-  "settings.websites": "网站",
   "title.add-account": "添加账户",
   "title.add-website": "添加网站",
   "title.change-password": "更新密码",
@@ -79,7 +89,5 @@
   "title.edit-account": "编辑账户",
   "title.edit-website": "编辑网站",
   "title.share-url": "共享链接",
-  "title.tracking-code": "跟踪代码",
-  "tooltip.get-share-url": "获得共享链接",
-  "tooltip.get-tracking-code": "获得跟踪代码"
+  "title.tracking-code": "跟踪代码"
 }
diff --git a/lib/auth.js b/lib/auth.js
index b9344448..370db1c4 100644
--- a/lib/auth.js
+++ b/lib/auth.js
@@ -1,9 +1,49 @@
 import { parse } from 'cookie';
-import { parseSecureToken } from './crypto';
+import { parseSecureToken, parseToken } from './crypto';
 import { AUTH_COOKIE_NAME } from './constants';
+import { getWebsiteById } from './queries';
 
-export async function verifyAuthToken(req) {
+export async function getAuthToken(req) {
   const token = parse(req.headers.cookie || '')[AUTH_COOKIE_NAME];
 
   return parseSecureToken(token);
 }
+
+export async function isValidToken(token, validation) {
+  try {
+    const result = await parseToken(token);
+
+    if (typeof validation === 'object') {
+      return !Object.keys(validation).find(key => result[key] !== validation[key]);
+    } else if (typeof validation === 'function') {
+      return validation(result);
+    }
+  } catch (e) {
+    return false;
+  }
+
+  return false;
+}
+
+export async function allowQuery(req, skipToken) {
+  const { id, token } = req.query;
+  const websiteId = +id;
+
+  const website = await getWebsiteById(websiteId);
+
+  if (website) {
+    if (token && !skipToken) {
+      return isValidToken(token, { website_id: websiteId });
+    }
+
+    const authToken = await getAuthToken(req);
+
+    if (authToken) {
+      const { user_id, is_admin } = authToken;
+
+      return is_admin || website.user_id === user_id;
+    }
+  }
+
+  return false;
+}
diff --git a/lib/constants.js b/lib/constants.js
index 4f5c6e4c..27fa2461 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -54,13 +54,6 @@ export const DESKTOP_OS = [
 
 export const MOBILE_OS = ['iOS', 'Android OS', 'BlackBerry OS', 'Windows Mobile', 'Amazon OS'];
 
-export const DEVICES = {
-  desktop: 'Desktop',
-  laptop: 'Laptop',
-  tablet: 'Tablet',
-  mobile: 'Mobile',
-};
-
 export const BROWSERS = {
   aol: 'AOL',
   edge: 'Edge',
diff --git a/lib/crypto.js b/lib/crypto.js
index 8a96e785..37279daf 100644
--- a/lib/crypto.js
+++ b/lib/crypto.js
@@ -27,7 +27,7 @@ export function uuid(...args) {
   return v5(args.join(''), salt());
 }
 
-export function isValidId(s) {
+export function isValidUuid(s) {
   return validate(s);
 }
 
diff --git a/lib/date.js b/lib/date.js
index 363e68dd..63bad45e 100644
--- a/lib/date.js
+++ b/lib/date.js
@@ -89,7 +89,7 @@ export function getDateRange(value) {
 
 export function getDateRangeValues(startDate, endDate) {
   let unit = 'year';
-  if (differenceInHours(endDate, startDate) <= 72) {
+  if (differenceInHours(endDate, startDate) <= 48) {
     unit = 'hour';
   } else if (differenceInCalendarDays(endDate, startDate) <= 90) {
     unit = 'day';
diff --git a/lib/filters.js b/lib/filters.js
index 0430e437..ee0a1759 100644
--- a/lib/filters.js
+++ b/lib/filters.js
@@ -1,6 +1,6 @@
 import firstBy from 'thenby';
-import { BROWSERS, ISO_COUNTRIES, DEVICES } from './constants';
-import { removeTrailingSlash, getDomainName } from './url';
+import { BROWSERS, ISO_COUNTRIES } from './constants';
+import { removeTrailingSlash, removeWWW, getDomainName } from './url';
 
 export const urlFilter = (data, { raw }) => {
   const isValidUrl = url => {
@@ -55,6 +55,7 @@ export const urlFilter = (data, { raw }) => {
 export const refFilter = (data, { domain, domainOnly, raw }) => {
   const domainName = getDomainName(domain);
   const regex = new RegExp(`http[s]?://${domainName}`);
+  const links = {};
 
   const isValidRef = ref => {
     return ref !== '' && !ref.startsWith('/') && !ref.startsWith('#');
@@ -85,7 +86,7 @@ export const refFilter = (data, { domain, domainOnly, raw }) => {
         const ref = searchParams.get('ref');
         const query = ref ? `?ref=${ref}` : '';
 
-        return `${origin}${path}${query}`;
+        return removeTrailingSlash(`${removeWWW(hostname)}${path}`) + query;
       }
 
       return null;
@@ -101,6 +102,10 @@ export const refFilter = (data, { domain, domainOnly, raw }) => {
 
     const url = cleanUrl(x);
 
+    if (!domainOnly && !raw) {
+      links[url] = x;
+    }
+
     if (url) {
       if (!obj[url]) {
         obj[url] = y;
@@ -113,20 +118,19 @@ export const refFilter = (data, { domain, domainOnly, raw }) => {
   }, {});
 
   return Object.keys(map)
-    .map(key => ({ x: key, y: map[key] }))
+    .map(key => ({ x: key, y: map[key], w: links[key] }))
     .sort(firstBy('y', -1).thenBy('x'));
 };
 
 export const browserFilter = data =>
-  data.map(({ x, y }) => ({ x: BROWSERS[x], y })).filter(({ x }) => x);
+  data.map(({ x, y }) => ({ x: BROWSERS[x] || x, y })).filter(({ x }) => x);
 
 export const osFilter = data => data.filter(({ x }) => x);
 
-export const deviceFilter = data =>
-  data.map(({ x, y }) => ({ x: DEVICES[x], y })).filter(({ x }) => x);
+export const deviceFilter = data => data.filter(({ x }) => x);
 
 export const countryFilter = data =>
-  data.map(({ x, y }) => ({ x: ISO_COUNTRIES[x], y })).filter(({ x }) => x);
+  data.map(({ x, y }) => ({ x: ISO_COUNTRIES[x] || x, y })).filter(({ x }) => x);
 
 export const percentFilter = data => {
   const total = data.reduce((n, { y }) => n + y, 0);
diff --git a/lib/lang.js b/lib/lang.js
index d45d7ce0..8568ed4f 100644
--- a/lib/lang.js
+++ b/lib/lang.js
@@ -38,7 +38,7 @@ export const dateLocales = {
 };
 
 export const menuOptions = [
-  { label: 'English', value: 'en', display: 'EN' },
+  { label: 'English', value: 'en-US', display: 'EN' },
   { label: '中文', value: 'zh-CN', display: 'CN' },
   { label: 'Deutsch', value: 'de-DE', display: 'DE' },
   { label: 'Español', value: 'es-MX', display: 'ES' },
diff --git a/lib/middleware.js b/lib/middleware.js
index 5cbe9c2c..014b225d 100644
--- a/lib/middleware.js
+++ b/lib/middleware.js
@@ -1,6 +1,6 @@
 import cors from 'cors';
-import { verifySession } from './session';
-import { verifyAuthToken } from './auth';
+import { getSession } from './session';
+import { getAuthToken } from './auth';
 import { unauthorized, badRequest, serverError } from './response';
 
 export function use(middleware) {
@@ -21,7 +21,7 @@ export const useSession = use(async (req, res, next) => {
   let session;
 
   try {
-    session = await verifySession(req);
+    session = await getSession(req);
   } catch (e) {
     return serverError(res, e.message);
   }
@@ -35,13 +35,7 @@ export const useSession = use(async (req, res, next) => {
 });
 
 export const useAuth = use(async (req, res, next) => {
-  let token;
-
-  try {
-    token = await verifyAuthToken(req);
-  } catch (e) {
-    return serverError(res, e.message);
-  }
+  const token = await getAuthToken(req);
 
   if (!token) {
     return unauthorized(res);
diff --git a/lib/session.js b/lib/session.js
index ef9f403f..0488b730 100644
--- a/lib/session.js
+++ b/lib/session.js
@@ -1,8 +1,8 @@
 import { getWebsiteByUuid, getSessionByUuid, createSession } from 'lib/queries';
 import { getClientInfo } from 'lib/request';
-import { uuid, isValidId } from 'lib/crypto';
+import { uuid, isValidUuid } from 'lib/crypto';
 
-export async function verifySession(req) {
+export async function getSession(req) {
   const { payload } = req.body;
 
   if (!payload) {
@@ -11,7 +11,7 @@ export async function verifySession(req) {
 
   const { website: website_uuid, hostname, screen, language } = payload;
 
-  if (!isValidId(website_uuid)) {
+  if (!isValidUuid(website_uuid)) {
     throw new Error(`Invalid website: ${website_uuid}`);
   }
 
diff --git a/lib/url.js b/lib/url.js
index 0eb4a04a..d90c390e 100644
--- a/lib/url.js
+++ b/lib/url.js
@@ -2,6 +2,10 @@ export function removeTrailingSlash(url) {
   return url && url.length > 1 && url.endsWith('/') ? url.slice(0, -1) : url;
 }
 
+export function removeWWW(url) {
+  return url && url.length > 1 && url.startsWith('www.') ? url.slice(4) : url;
+}
+
 export function getDomainName(str) {
   try {
     return new URL(str).hostname;
diff --git a/lib/web.js b/lib/web.js
index 4a8578f1..4081b3ab 100644
--- a/lib/web.js
+++ b/lib/web.js
@@ -19,7 +19,7 @@ export const apiRequest = (method, url, body) =>
     return null;
   });
 
-function parseQuery(url, params = {}) {
+const parseQuery = (url, params = {}) => {
   const query = Object.keys(params).reduce((values, key) => {
     if (params[key] !== undefined) {
       return values.concat(`${key}=${encodeURIComponent(params[key])}`);
@@ -27,7 +27,7 @@ function parseQuery(url, params = {}) {
     return values;
   }, []);
   return query.length ? `${url}?${query.join('&')}` : url;
-}
+};
 
 export const get = (url, params) => apiRequest('get', parseQuery(url, params));
 
@@ -62,3 +62,14 @@ export const doNotTrack = () => {
 
   return dnt === true || dnt === 1 || dnt === 'yes' || dnt === '1';
 };
+
+export const setItem = (key, data, session) => {
+  if (typeof window !== 'undefined') {
+    (session ? sessionStorage : localStorage).setItem(key, JSON.stringify(data));
+  }
+};
+
+export const getItem = (key, session) =>
+  typeof window !== 'undefined'
+    ? JSON.parse((session ? sessionStorage : localStorage).getItem(key))
+    : null;
diff --git a/package.json b/package.json
index 18207e6c..15de064c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "0.34.0",
+  "version": "0.37.0",
   "description": "A simple, fast, website analytics alternative to Google Analytics. ",
   "author": "Mike Cao <mike@mikecao.com>",
   "license": "MIT",
@@ -22,6 +22,7 @@
     "build-mysql-client": "dotenv prisma generate -- --schema=./prisma/schema.mysql.prisma",
     "build-postgresql-schema": "dotenv prisma introspect -- --schema=./prisma/schema.postgresql.prisma",
     "build-postgresql-client": "dotenv prisma generate -- --schema=./prisma/schema.postgresql.prisma",
+    "generate-lang": "npm-run-all extract-lang merge-lang",
     "build-lang": "npm-run-all format-lang compile-lang",
     "extract-lang": "formatjs extract {pages,components}/**/*.js --out-file build/messages.json",
     "merge-lang": "node scripts/merge-lang.js",
@@ -47,7 +48,7 @@
     }
   },
   "dependencies": {
-    "@prisma/client": "2.6.2",
+    "@prisma/client": "2.7.0",
     "@reduxjs/toolkit": "^1.4.0",
     "bcrypt": "^5.0.0",
     "chart.js": "^2.9.3",
@@ -60,21 +61,21 @@
     "dotenv": "^8.2.0",
     "formik": "^2.1.5",
     "geolite2-redist": "^1.0.7",
-    "immer": "^7.0.8",
+    "immer": "^7.0.9",
     "is-localhost-ip": "^1.4.0",
     "isbot-fast": "^1.2.0",
-    "jose": "^1.28.0",
+    "jose": "^2.0.2",
     "maxmind": "^4.1.4",
     "moment-timezone": "^0.5.31",
     "next": "^9.5.3",
     "promise-polyfill": "^8.1.3",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "react-intl": "^5.8.0",
+    "react-intl": "^5.8.1",
     "react-redux": "^7.2.1",
     "react-simple-maps": "^2.1.2",
     "react-spring": "^8.0.27",
-    "react-tooltip": "^4.2.9",
+    "react-tooltip": "^4.2.10",
     "react-window": "^1.8.5",
     "redux": "^4.0.5",
     "redux-thunk": "^2.3.0",
@@ -85,32 +86,32 @@
     "uuid": "^8.3.0"
   },
   "devDependencies": {
-    "@formatjs/cli": "^2.9.0",
-    "@prisma/cli": "2.6.2",
+    "@formatjs/cli": "^2.11.2",
+    "@prisma/cli": "2.7.0",
     "@rollup/plugin-buble": "^0.21.3",
     "@rollup/plugin-node-resolve": "^9.0.0",
     "@rollup/plugin-replace": "^2.3.3",
     "@svgr/webpack": "^5.4.0",
     "cross-env": "^7.0.2",
-    "dotenv-cli": "^3.2.0",
-    "eslint": "^7.8.1",
+    "dotenv-cli": "^4.0.0",
+    "eslint": "^7.9.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-react": "^7.20.6",
-    "eslint-plugin-react-hooks": "^4.1.0",
+    "eslint-plugin-react-hooks": "^4.1.2",
     "extract-react-intl-messages": "^4.1.1",
-    "husky": "^4.2.5",
+    "husky": "^4.3.0",
     "lint-staged": "^10.3.0",
     "npm-run-all": "^4.1.5",
     "postcss-flexbugs-fixes": "^4.2.1",
     "postcss-import": "^12.0.1",
     "postcss-preset-env": "^6.7.0",
-    "prettier": "^2.1.1",
+    "prettier": "^2.1.2",
     "prettier-eslint": "^11.0.0",
-    "rollup": "^2.26.10",
+    "rollup": "^2.26.11",
     "rollup-plugin-hashbang": "^2.2.2",
-    "rollup-plugin-terser": "^7.0.1",
-    "stylelint": "^13.7.0",
+    "rollup-plugin-terser": "^7.0.2",
+    "stylelint": "^13.7.1",
     "stylelint-config-css-modules": "^2.2.0",
     "stylelint-config-prettier": "^8.0.1",
     "stylelint-config-recommended": "^3.0.0"
diff --git a/pages/_app.js b/pages/_app.js
index 694049d4..9aad4339 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { IntlProvider } from 'react-intl';
 import { Provider } from 'react-redux';
 import { useStore } from 'redux/store';
@@ -9,17 +9,10 @@ import 'styles/bootstrap-grid.css';
 import 'styles/index.css';
 
 const Intl = ({ children }) => {
-  const [locale, setLocale] = useLocale();
+  const [locale] = useLocale();
 
   const Wrapper = ({ children }) => <span className={locale}>{children}</span>;
 
-  useEffect(() => {
-    const saved = localStorage.getItem('locale');
-    if (saved) {
-      setLocale(saved);
-    }
-  });
-
   return (
     <IntlProvider locale={locale} messages={messages[locale]} textComponent={Wrapper}>
       {children}
diff --git a/pages/api/accounts.js b/pages/api/accounts.js
index c5a41dff..3d651601 100644
--- a/pages/api/accounts.js
+++ b/pages/api/accounts.js
@@ -5,16 +5,16 @@ import { ok, unauthorized, methodNotAllowed } from 'lib/response';
 export default async (req, res) => {
   await useAuth(req, res);
 
-  const { is_admin: current_user_is_admin } = req.auth;
+  const { is_admin } = req.auth;
+
+  if (!is_admin) {
+    return unauthorized(res);
+  }
 
   if (req.method === 'GET') {
-    if (current_user_is_admin) {
-      const accounts = await getAccounts();
+    const accounts = await getAccounts();
 
-      return ok(res, accounts);
-    }
-
-    return unauthorized(res);
+    return ok(res, accounts);
   }
 
   return methodNotAllowed(res);
diff --git a/pages/api/share/[id].js b/pages/api/share/[id].js
index edce6cfd..461e008e 100644
--- a/pages/api/share/[id].js
+++ b/pages/api/share/[id].js
@@ -1,5 +1,6 @@
 import { getWebsiteByShareId } from 'lib/queries';
 import { ok, notFound, methodNotAllowed } from 'lib/response';
+import { createToken } from 'lib/crypto';
 
 export default async (req, res) => {
   const { id } = req.query;
@@ -8,7 +9,10 @@ export default async (req, res) => {
     const website = await getWebsiteByShareId(id);
 
     if (website) {
-      return ok(res, website);
+      const websiteId = website.website_id;
+      const token = await createToken({ website_id: websiteId });
+
+      return ok(res, { websiteId, token });
     }
 
     return notFound(res);
diff --git a/pages/api/website/[id].js b/pages/api/website/[id].js
deleted file mode 100644
index 40e9995f..00000000
--- a/pages/api/website/[id].js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { deleteWebsite, getWebsiteById } from 'lib/queries';
-import { useAuth } from 'lib/middleware';
-import { methodNotAllowed, ok, unauthorized } from 'lib/response';
-
-export default async (req, res) => {
-  const { id } = req.query;
-  const website_id = +id;
-
-  if (req.method === 'GET') {
-    const website = await getWebsiteById(website_id);
-
-    return ok(res, website);
-  }
-
-  if (req.method === 'DELETE') {
-    await useAuth(req, res);
-    const { user_id, is_admin } = req.auth;
-
-    const website = await getWebsiteById(website_id);
-
-    if (website.user_id === user_id || is_admin) {
-      await deleteWebsite(website_id);
-
-      return ok(res);
-    }
-
-    return unauthorized(res);
-  }
-
-  return methodNotAllowed(res);
-};
diff --git a/pages/api/website/[id]/active.js b/pages/api/website/[id]/active.js
index 8c331c44..280bc06e 100644
--- a/pages/api/website/[id]/active.js
+++ b/pages/api/website/[id]/active.js
@@ -1,12 +1,18 @@
 import { getActiveVisitors } from 'lib/queries';
-import { methodNotAllowed, ok } from 'lib/response';
+import { methodNotAllowed, ok, unauthorized } from 'lib/response';
+import { allowQuery } from 'lib/auth';
 
 export default async (req, res) => {
   if (req.method === 'GET') {
-    const { id } = req.query;
-    const website_id = +id;
+    if (!(await allowQuery(req))) {
+      return unauthorized(res);
+    }
 
-    const result = await getActiveVisitors(website_id);
+    const { id } = req.query;
+
+    const websiteId = +id;
+
+    const result = await getActiveVisitors(websiteId);
 
     return ok(res, result);
   }
diff --git a/pages/api/website/[id]/events.js b/pages/api/website/[id]/events.js
index 9e3b6b51..4b9a656d 100644
--- a/pages/api/website/[id]/events.js
+++ b/pages/api/website/[id]/events.js
@@ -1,11 +1,16 @@
 import moment from 'moment-timezone';
 import { getEvents } from 'lib/queries';
-import { ok, badRequest, methodNotAllowed } from 'lib/response';
+import { ok, badRequest, methodNotAllowed, unauthorized } from 'lib/response';
+import { allowQuery } from 'lib/auth';
 
 const unitTypes = ['year', 'month', 'hour', 'day'];
 
 export default async (req, res) => {
   if (req.method === 'GET') {
+    if (!(await allowQuery(req))) {
+      return unauthorized(res);
+    }
+
     const { id, start_at, end_at, unit, tz } = req.query;
 
     if (!moment.tz.zone(tz) || !unitTypes.includes(unit)) {
diff --git a/pages/api/website/[id]/index.js b/pages/api/website/[id]/index.js
new file mode 100644
index 00000000..74ce0f33
--- /dev/null
+++ b/pages/api/website/[id]/index.js
@@ -0,0 +1,31 @@
+import { deleteWebsite, getWebsiteById } from 'lib/queries';
+import { methodNotAllowed, ok, unauthorized } from 'lib/response';
+import { allowQuery } from 'lib/auth';
+
+export default async (req, res) => {
+  const { id } = req.query;
+
+  const websiteId = +id;
+
+  if (req.method === 'GET') {
+    if (!(await allowQuery(req))) {
+      return unauthorized(res);
+    }
+
+    const website = await getWebsiteById(websiteId);
+
+    return ok(res, website);
+  }
+
+  if (req.method === 'DELETE') {
+    if (!(await allowQuery(req, true))) {
+      return unauthorized(res);
+    }
+
+    await deleteWebsite(websiteId);
+
+    return ok(res);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/pages/api/website/[id]/metrics.js b/pages/api/website/[id]/metrics.js
index 07496b25..bb5c977b 100644
--- a/pages/api/website/[id]/metrics.js
+++ b/pages/api/website/[id]/metrics.js
@@ -1,9 +1,15 @@
 import { getMetrics } from 'lib/queries';
-import { methodNotAllowed, ok } from 'lib/response';
+import { methodNotAllowed, ok, unauthorized } from 'lib/response';
+import { allowQuery } from 'lib/auth';
 
 export default async (req, res) => {
   if (req.method === 'GET') {
+    if (!(await allowQuery(req))) {
+      return unauthorized(res);
+    }
+
     const { id, start_at, end_at } = req.query;
+
     const websiteId = +id;
     const startDate = new Date(+start_at);
     const endDate = new Date(+end_at);
diff --git a/pages/api/website/[id]/pageviews.js b/pages/api/website/[id]/pageviews.js
index db5b6c33..016c6646 100644
--- a/pages/api/website/[id]/pageviews.js
+++ b/pages/api/website/[id]/pageviews.js
@@ -1,21 +1,26 @@
 import moment from 'moment-timezone';
 import { getPageviews } from 'lib/queries';
-import { ok, badRequest, methodNotAllowed } from 'lib/response';
+import { ok, badRequest, methodNotAllowed, unauthorized } from 'lib/response';
+import { allowQuery } from 'lib/auth';
 
 const unitTypes = ['year', 'month', 'hour', 'day'];
 
 export default async (req, res) => {
   if (req.method === 'GET') {
-    const { id, start_at, end_at, unit, tz } = req.query;
-
-    if (!moment.tz.zone(tz) || !unitTypes.includes(unit)) {
-      return badRequest(res);
+    if (!(await allowQuery(req))) {
+      return unauthorized(res);
     }
 
+    const { id, start_at, end_at, unit, tz } = req.query;
+
     const websiteId = +id;
     const startDate = new Date(+start_at);
     const endDate = new Date(+end_at);
 
+    if (!moment.tz.zone(tz) || !unitTypes.includes(unit)) {
+      return badRequest(res);
+    }
+
     const [pageviews, uniques] = await Promise.all([
       getPageviews(websiteId, startDate, endDate, tz, unit, '*'),
       getPageviews(websiteId, startDate, endDate, tz, unit, 'distinct session_id'),
diff --git a/pages/api/website/[id]/rankings.js b/pages/api/website/[id]/rankings.js
index 838aefa3..90a0cd9f 100644
--- a/pages/api/website/[id]/rankings.js
+++ b/pages/api/website/[id]/rankings.js
@@ -1,6 +1,7 @@
 import { getRankings } from 'lib/queries';
-import { ok, badRequest, methodNotAllowed } from 'lib/response';
+import { ok, badRequest, methodNotAllowed, unauthorized } from 'lib/response';
 import { DOMAIN_REGEX } from 'lib/constants';
+import { allowQuery } from 'lib/auth';
 
 const sessionColumns = ['browser', 'os', 'device', 'country'];
 const pageviewColumns = ['url', 'referrer'];
@@ -26,7 +27,12 @@ function getColumn(type) {
 
 export default async (req, res) => {
   if (req.method === 'GET') {
+    if (!(await allowQuery(req))) {
+      return unauthorized(res);
+    }
+
     const { id, type, start_at, end_at, domain } = req.query;
+
     const websiteId = +id;
     const startDate = new Date(+start_at);
     const endDate = new Date(+end_at);
diff --git a/pages/api/website/index.js b/pages/api/website/index.js
index c3db0521..dab9a94d 100644
--- a/pages/api/website/index.js
+++ b/pages/api/website/index.js
@@ -15,22 +15,21 @@ export default async (req, res) => {
     if (website_id) {
       const website = await getWebsiteById(website_id);
 
-      if (website.user_id === user_id || is_admin) {
-        let { share_id } = website;
-        console.log('exising id', share_id, website);
-
-        if (enable_share_url) {
-          share_id = share_id ? share_id : getRandomChars(8);
-        } else {
-          share_id = null;
-        }
-
-        await updateWebsite(website_id, { name, domain, share_id });
-
-        return ok(res);
+      if (website.user_id !== user_id && !is_admin) {
+        return unauthorized(res);
       }
 
-      return unauthorized(res);
+      let { share_id } = website;
+
+      if (enable_share_url) {
+        share_id = share_id ? share_id : getRandomChars(8);
+      } else {
+        share_id = null;
+      }
+
+      await updateWebsite(website_id, { name, domain, share_id });
+
+      return ok(res);
     } else {
       const website_uuid = uuid();
       const share_id = enable_share_url ? getRandomChars(8) : null;
diff --git a/pages/api/websites.js b/pages/api/websites.js
index b4633950..42b6182c 100644
--- a/pages/api/websites.js
+++ b/pages/api/websites.js
@@ -5,15 +5,16 @@ import { ok, methodNotAllowed, unauthorized } from 'lib/response';
 export default async (req, res) => {
   await useAuth(req, res);
 
-  const { user_id, is_admin } = req.auth;
-  const { userId } = req.query;
+  const { user_id: current_user_id, is_admin } = req.auth;
+  const { user_id } = req.query;
+  const userId = +user_id;
 
   if (req.method === 'GET') {
-    if (userId && !is_admin) {
+    if (userId !== current_user_id && !is_admin) {
       return unauthorized(res);
     }
 
-    const websites = await getUserWebsites(+userId || user_id);
+    const websites = await getUserWebsites(userId || current_user_id);
 
     return ok(res, websites);
   }
diff --git a/pages/settings/accounts.js b/pages/settings/accounts.js
new file mode 100644
index 00000000..3426f4b8
--- /dev/null
+++ b/pages/settings/accounts.js
@@ -0,0 +1,3 @@
+import Index from './index';
+
+export default Index;
diff --git a/pages/settings.js b/pages/settings/index.js
similarity index 100%
rename from pages/settings.js
rename to pages/settings/index.js
diff --git a/pages/settings/profile.js b/pages/settings/profile.js
new file mode 100644
index 00000000..3426f4b8
--- /dev/null
+++ b/pages/settings/profile.js
@@ -0,0 +1,3 @@
+import Index from './index';
+
+export default Index;
diff --git a/pages/share/[...id].js b/pages/share/[...id].js
index 1e0897a9..c4fa9a63 100644
--- a/pages/share/[...id].js
+++ b/pages/share/[...id].js
@@ -14,9 +14,11 @@ export default function SharePage() {
     return null;
   }
 
+  const { websiteId, token } = data;
+
   return (
     <Layout>
-      <WebsiteDetails websiteId={data.website_id} />
+      <WebsiteDetails websiteId={websiteId} token={token} />
     </Layout>
   );
 }
diff --git a/redux/actions/app.js b/redux/actions/app.js
index a74272a5..72636a74 100644
--- a/redux/actions/app.js
+++ b/redux/actions/app.js
@@ -1,8 +1,9 @@
 import { createSlice } from '@reduxjs/toolkit';
+import { getItem } from 'lib/web';
 
 const app = createSlice({
   name: 'app',
-  initialState: { locale: 'en-US' },
+  initialState: { locale: getItem('umami.locale') || 'en-US' },
   reducers: {
     updateApp(state, action) {
       state = action.payload;
diff --git a/styles/index.css b/styles/index.css
index 5435364f..c305f70f 100644
--- a/styles/index.css
+++ b/styles/index.css
@@ -36,17 +36,6 @@ h6 {
   font-weight: 400;
 }
 
-#__next {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-}
-
-#__modals {
-  z-index: 10;
-}
-
 button,
 input,
 select {
@@ -87,16 +76,28 @@ label:empty {
 
 dt {
   font-weight: 600;
+  margin: 0 0 5px 0;
 }
 
 dd {
-  margin: 0 0 10px 0;
+  margin: 0 0 30px 0;
 }
 
 main {
   flex: 1;
 }
 
+#__next {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+}
+
+#__modals {
+  z-index: 10;
+}
+
 .container {
   padding: 0;
 }
diff --git a/yarn.lock b/yarn.lock
index 7e0a5f74..9511a4fe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1064,78 +1064,78 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@formatjs/cli@^2.9.0":
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/cli/-/cli-2.9.0.tgz#52cceffb133cd1307650af26e878785aa4370a0c"
-  integrity sha512-HSpu0qrpPGaja+V7bHc61ZyzHfV+OzGVmB2DmamjZSaI0S5o7gs0skY40o4chIVNsYT/X9RD9G77pOIEHDWmUA==
+"@formatjs/cli@^2.11.2":
+  version "2.11.2"
+  resolved "https://registry.yarnpkg.com/@formatjs/cli/-/cli-2.11.2.tgz#ba3bfb84a98f2b9629a3fb03008c72564fbf7c79"
+  integrity sha512-Jf5wEgfFjrumv2OhHxddYFN6+nyjDrta4sbHwaONqgG/gP721tlvQ3UaB0lgg9Mp5xSkRcCRWYT/QeFoRgUSYQ==
   dependencies:
-    "@formatjs/ts-transformer" "^2.9.0"
+    "@formatjs/ts-transformer" "^2.10.0"
     "@types/json-stable-stringify" "^1.0.32"
     "@types/lodash" "^4.14.150"
     "@types/loud-rejection" "^2.0.0"
     "@types/node" "14"
     chalk "^4.0.0"
-    commander "5.1.0"
+    commander "^6.1.0"
     fast-glob "^3.2.4"
     fs-extra "^9.0.0"
-    intl-messageformat-parser "^6.0.5"
+    intl-messageformat-parser "^6.0.6"
     json-stable-stringify "^1.0.1"
     lodash "^4.17.15"
     loud-rejection "^2.2.0"
     typescript "^4.0"
 
-"@formatjs/ecma402-abstract@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.2.0.tgz#5b03ba4931436070ad926d1b2e89bf07edc5ea5b"
-  integrity sha512-jc1bZHhIE1YI0HnZIZcdlKpF4wle2pkgQpzXHDoyy4bUqzBSvDqktnF26hOkyA04KD4wqd61gkuTvRrHMmroAg==
+"@formatjs/ecma402-abstract@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.2.1.tgz#ad966998d7f0e96fca4bdc5de0ca28d02f371279"
+  integrity sha512-LvbwgHxprafjceDfOC7yMl4sP5al71rAWahXk3qug5bV020aCq64WjqAo+zNnkIJk8hqK2pFKnNdDsT58HZJQw==
 
-"@formatjs/intl-displaynames@^3.3.6":
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-3.3.6.tgz#2b5c938ea1cd38e859f2d716ea317feccbbd8896"
-  integrity sha512-yrTDL3U0MR10vp17noLI2JuNiHq/Fp1P8/mW/t1gCMOpw38FY4bFTOV68FWxSZwzsy/yETqXHjPUTUbpLtEO/Q==
+"@formatjs/intl-displaynames@^3.3.7":
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-3.3.7.tgz#7d8cc73d0a67a7c51b182233121eaa2c85f9f751"
+  integrity sha512-sMdV3QaFy2RMOZ6YaRYInDzThEEIiD8vZjue20/CYvxgNKw3ZIZROvpEaKHvHr197Si3RFaxhAGUWk/lI7NAeA==
   dependencies:
-    "@formatjs/ecma402-abstract" "^1.2.0"
+    "@formatjs/ecma402-abstract" "^1.2.1"
 
-"@formatjs/intl-listformat@^4.2.5":
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-4.2.5.tgz#2a39223c5fda3f865d56cea80d7459f5bd9828a8"
-  integrity sha512-mcH/CdRH58ao3caZzIdAA32vZM5woxTszIieRjhY2qHxCorVzBPXFYCGTVCO9rtKVFlkMR/pyzaqH3Y1gNiRmw==
+"@formatjs/intl-listformat@^4.2.6":
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-4.2.6.tgz#31638a6cb3e33047d81161b139c1d68fb377d3c2"
+  integrity sha512-4JGDYVwZyEMGpwhUKXIcSXjRVuSrz5ox1rQCQVzj0CzgEoojrQoaUkcuW+Vj89JlpCtRS8NS46d3CWLUSDC+2g==
   dependencies:
-    "@formatjs/ecma402-abstract" "^1.2.0"
+    "@formatjs/ecma402-abstract" "^1.2.1"
 
 "@formatjs/intl-numberformat@^5.5.2":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-numberformat/-/intl-numberformat-5.6.0.tgz#87bd1e56246fba2c7af58f73930cbe379dd0aef8"
-  integrity sha512-MfYcqX1LE2N4P9eVtQXI/L6APlXgjexCj0b7GxJfK+icrwbA0XINSPGTt96kUxO5hf/tDu0MxJXnt9gwMKm/EA==
+  version "5.6.1"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-numberformat/-/intl-numberformat-5.6.1.tgz#eaa16b68be6a8c7dddbb2495a9271046c51293c5"
+  integrity sha512-ENtX07hT/GJD/GZIvk1jf/nYHg8Hq3twZ4fOGAZIVhwd6ZqlAm6dgqqRxpNXw3ul8UCwx9tOeptF1gT42HwjKA==
   dependencies:
-    "@formatjs/ecma402-abstract" "^1.2.0"
+    "@formatjs/ecma402-abstract" "^1.2.1"
 
-"@formatjs/intl-relativetimeformat@^7.2.5":
-  version "7.2.5"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-7.2.5.tgz#3101a8262bd7fb329d7bd555135f67a36c5e58df"
-  integrity sha512-KTf0zTP7YbrVAPPJMnZNYRrNvEwuNwqOVNcfz0cQwewjE2ImxPW+03zdRHkwDt92WbRv6T0EDRBpgC2Dxaip6Q==
+"@formatjs/intl-relativetimeformat@^7.2.6":
+  version "7.2.6"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-7.2.6.tgz#7452e0feaa433f341b306e308166058e8126e934"
+  integrity sha512-SHwrzk9HuAUwl3/qfupU3ZnW4ZgVOpI2+3gwGmvoPOmAlKFlo7liSCszA5hcRpsnhjS66BqUzfx6BWOwzYvmKQ==
   dependencies:
-    "@formatjs/ecma402-abstract" "^1.2.0"
+    "@formatjs/ecma402-abstract" "^1.2.1"
 
-"@formatjs/intl@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-1.3.0.tgz#843d79ced6908c2ca25abf65ccee52bc72da6b85"
-  integrity sha512-wjzzA7CALsYDjDOdpmGGsMYUblp9LcPtxdjjdZyd8s4xQ5lZZUWrJxqzInkax89TWeGTprHGYh31qPpYbjsRRQ==
+"@formatjs/intl@^1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-1.3.1.tgz#8604b1bcef60572a2ecd22db91c0599760ceebf6"
+  integrity sha512-W1m8vLAQHjrox3ZrJRD6ArMp2AOvUCBeeID7NNhcezZ2fWXtzIKi8k9jeptkO54HZbueLcpshWb2gbUSR5Xy0Q==
   dependencies:
-    "@formatjs/ecma402-abstract" "^1.2.0"
-    "@formatjs/intl-displaynames" "^3.3.6"
-    "@formatjs/intl-listformat" "^4.2.5"
-    "@formatjs/intl-relativetimeformat" "^7.2.5"
+    "@formatjs/ecma402-abstract" "^1.2.1"
+    "@formatjs/intl-displaynames" "^3.3.7"
+    "@formatjs/intl-listformat" "^4.2.6"
+    "@formatjs/intl-relativetimeformat" "^7.2.6"
     fast-memoize "^2.5.2"
-    intl-messageformat "^9.3.6"
-    intl-messageformat-parser "^6.0.5"
+    intl-messageformat "^9.3.7"
+    intl-messageformat-parser "^6.0.6"
 
-"@formatjs/ts-transformer@^2.6.0", "@formatjs/ts-transformer@^2.9.0":
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/ts-transformer/-/ts-transformer-2.9.0.tgz#582f8c54bc5888044f3e848163411dabca130aff"
-  integrity sha512-H6skH+McG2OoUL3nc6Eas/5IunM8hk7uDU5Ak/qtNtvsehOH8g030LaFaMxw28BWq2vBipGAPlyyz/KTvO8fPw==
+"@formatjs/ts-transformer@^2.10.0", "@formatjs/ts-transformer@^2.6.0":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@formatjs/ts-transformer/-/ts-transformer-2.10.0.tgz#06f292b6cbcea661e2cecf7b8945ac59f21b7c93"
+  integrity sha512-ff+gIzsbd5WEm6mLn1x0A1gD4oJomst8pF7NEjrI0Egn+82v8PEEZeYrsGjUzRt3jyOaRguQUYJGHiw+5d84dQ==
   dependencies:
-    intl-messageformat-parser "^6.0.5"
+    intl-messageformat-parser "^6.0.6"
     typescript "^4.0"
 
 "@next/react-dev-overlay@9.5.3":
@@ -1185,15 +1185,15 @@
   resolved "https://registry.yarnpkg.com/@panva/asn1.js/-/asn1.js-1.0.0.tgz#dd55ae7b8129e02049f009408b97c61ccf9032f6"
   integrity sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw==
 
-"@prisma/cli@2.6.2":
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/@prisma/cli/-/cli-2.6.2.tgz#52fb447f702f159c9a218f720b0b809581815a0b"
-  integrity sha512-aDzA1kWwmfyt1FeTzayZ6fDc9uXRo+gt+KFsR9bNqHtdge2aZLA9N/ft9+1627HOADIQgfTFw41K0GOMBJQ48w==
+"@prisma/cli@2.7.0":
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/@prisma/cli/-/cli-2.7.0.tgz#af9fd31f24babc9828cc9ab6d8b8735729b320e7"
+  integrity sha512-OCiTV6Xs9GHUk4iJGQeJizyUyrm7pnKCjoeulN+OXAdbfkLwNlRC+/H/8aOwcXx+Nej/QgXoix9CGcs+OYrdnA==
 
-"@prisma/client@2.6.2":
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-2.6.2.tgz#842c8640a0cd5b7542522ac0645f7c8c9bd87254"
-  integrity sha512-SYbW6+Lcd/OcY6p9vjI845ERl77Z+rOcB0zh6RKQdxr8R6yZHc7aDUnjcp8fZr245HnLLRnCpfkAfqQ3lvLP8g==
+"@prisma/client@2.7.0":
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-2.7.0.tgz#fc7d4a3f7c5c8d865de74476a01cef606c02ba5e"
+  integrity sha512-9QkicjHSJwRa05eYdm4J4T3UXdF9SfRboQ8eCvrExOkvl1bhEEeACv0D4dGdmbxr2O/xAwUAW5T9XdJnzOQmGw==
   dependencies:
     pkg-up "^3.1.0"
 
@@ -1390,9 +1390,9 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*":
-  version "7.0.13"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.13.tgz#1874914be974a492e1b4cb00585cabb274e8ba18"
-  integrity sha512-i+zS7t6/s9cdQvbqKDARrcbrPvtJGlbYsMkazo03nTAK3RX9FNrLllXys22uiTGJapPOTZTQ35nHh4ISph4SLQ==
+  version "7.0.14"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.14.tgz#e99da8c075d4fb098c774ba65dabf7dc9954bd13"
+  integrity sha512-8w9szzKs14ZtBVuP6Wn7nMLRJ0D6dfB0VEBEyRgxrZ/Ln49aNMykrghM2FaNn4FJRzNppCSa0Rv9pBRM5Xc3wg==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -1461,9 +1461,9 @@
   integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
 "@types/node@*", "@types/node@14":
-  version "14.6.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.4.tgz#a145cc0bb14ef9c4777361b7bbafa5cf8e3acb5a"
-  integrity sha512-Wk7nG1JSaMfMpoMJDKUsWYugliB2Vy55pdjLpmLixeyMi7HizW2I/9QoxsPCkXl3dO+ZOVqPumKaDUv5zJu2uQ==
+  version "14.10.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.10.2.tgz#9b47a2c8e4dabd4db73b57e750b24af689600514"
+  integrity sha512-IzMhbDYCpv26pC2wboJ4MMOa9GKtjplXfcAqrMeNJpUUwpM/2ATt2w1JPUXwS6spu856TvKZL2AOmeU2rAxskw==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -1733,9 +1733,9 @@ acorn-dynamic-import@^4.0.0:
   integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
 
 acorn-jsx@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
-  integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
+  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
 
 acorn@^6.4.1:
   version "6.4.1"
@@ -1784,9 +1784,9 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
 ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.12.4:
-  version "6.12.4"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234"
-  integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==
+  version "6.12.5"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da"
+  integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -2252,14 +2252,14 @@ browserslist@4.13.0:
     node-releases "^1.1.58"
 
 browserslist@^4.12.0, browserslist@^4.6.4, browserslist@^4.8.5:
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.0.tgz#2908951abfe4ec98737b72f34c3bcedc8d43b000"
-  integrity sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ==
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.2.tgz#1b3cec458a1ba87588cc5e9be62f19b6d48813ce"
+  integrity sha512-HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==
   dependencies:
-    caniuse-lite "^1.0.30001111"
-    electron-to-chromium "^1.3.523"
+    caniuse-lite "^1.0.30001125"
+    electron-to-chromium "^1.3.564"
     escalade "^3.0.2"
-    node-releases "^1.1.60"
+    node-releases "^1.1.61"
 
 buble@^0.20.0:
   version "0.20.0"
@@ -2400,10 +2400,10 @@ camelcase@^6.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e"
   integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==
 
-caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001111, caniuse-lite@^1.0.30001113:
-  version "1.0.30001124"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001124.tgz#5d9998190258e11630d674fc50ea8e579ae0ced2"
-  integrity sha512-zQW8V3CdND7GHRH6rxm6s59Ww4g/qGWTheoboW9nfeMg7sUoopIfKCcNZUjwYRCOrvereh3kwDpZj4VLQ7zGtA==
+caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001113, caniuse-lite@^1.0.30001125:
+  version "1.0.30001131"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001131.tgz#afad8a28fc2b7a0d3ae9407e71085a0ead905d54"
+  integrity sha512-4QYi6Mal4MMfQMSqGIRPGbKIbZygeN83QsWq1ixpUwvtfgAZot5BrCKzGygvZaV+CnELdTwD0S4cqUNozq7/Cw==
 
 ccount@^1.0.0:
   version "1.0.5"
@@ -2686,12 +2686,7 @@ commander@2, commander@^2.20.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
-  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
-
-commander@^6.0.0:
+commander@^6.0.0, commander@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-6.1.0.tgz#f8d722b78103141006b66f4c7ba1e97315ba75bc"
   integrity sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==
@@ -3238,7 +3233,7 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
-define-properties@^1.1.2, define-properties@^1.1.3:
+define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
   integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
@@ -3338,7 +3333,7 @@ dom-serializer@0, dom-serializer@^0.2.1:
     domelementtype "^2.0.1"
     entities "^2.0.0"
 
-dom-serializer@1.0.1, dom-serializer@^1.0.1:
+dom-serializer@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.0.1.tgz#79695eb49af3cd8abc8d93a73da382deb1ca0795"
   integrity sha512-1Aj1Qy3YLbdslkI75QEOfdp9TkQ3o8LRISAzxOibjBs/xWwr1WxZFOQphFkZuepHFGo+kB8e5FVJSS0faAJ4Rw==
@@ -3347,6 +3342,15 @@ dom-serializer@1.0.1, dom-serializer@^1.0.1:
     domhandler "^3.0.0"
     entities "^2.0.0"
 
+dom-serializer@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.1.0.tgz#5f7c828f1bfc44887dc2a315ab5c45691d544b58"
+  integrity sha512-ox7bvGXt2n+uLWtCRLybYx60IrOlWL/aCebWJk1T0d4m3y2tzf4U3ij9wBMUb6YJZpz06HCCYuyCDveE2xXmzQ==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^3.0.0"
+    entities "^2.0.0"
+
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
@@ -3358,9 +3362,9 @@ domelementtype@1, domelementtype@^1.3.1:
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
 domelementtype@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"
-  integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz#f3b6e549201e46f588b59463dd77187131fe6971"
+  integrity sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==
 
 domhandler@3.0.0, domhandler@^3.0.0:
   version "3.0.0"
@@ -3394,18 +3398,18 @@ domutils@^1.5.1, domutils@^1.7.0:
     domelementtype "1"
 
 domutils@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.2.0.tgz#f3ce1610af5c30280bde1b71f84b018b958f32cf"
-  integrity sha512-0haAxVr1PR0SqYwCH7mxMpHZUwjih9oPPedqpR/KufsnxPyZ9dyVw1R5093qnJF3WXSbjBkdzRWLw/knJV/fAg==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.3.0.tgz#6469c63a3da2de0c3016f3a59e6a969e10705bce"
+  integrity sha512-xWC75PM3QF6MjE5e58OzwTX0B/rPQnlqH0YyXB/c056RtVJA+eu60da2I/bdnEHzEYC00g8QaZUlAbqOZVbOsw==
   dependencies:
     dom-serializer "^1.0.1"
     domelementtype "^2.0.1"
     domhandler "^3.0.0"
 
-dotenv-cli@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/dotenv-cli/-/dotenv-cli-3.2.0.tgz#002367c30992acb0b218b20fc01a8e18f13f85cf"
-  integrity sha512-zg/dfXISo7ntL3JKC+oj7eXEMg8LbOsARWTeypfVsmYtazDYOptmKLqA9u3LTee9x/sIPiLqmI6wskRP+89ohQ==
+dotenv-cli@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv-cli/-/dotenv-cli-4.0.0.tgz#3cdd68b87ccd63c78dbfa72aab2f639bbeba5f4b"
+  integrity sha512-ByKEec+ashePEXthZaA1fif9XDtcaRnkN7eGdBDx3HHRjwZ/rA1go83Cbs4yRrx3JshsCf96FjAyIA2M672+CQ==
   dependencies:
     cross-spawn "^7.0.1"
     dotenv "^8.1.0"
@@ -3432,10 +3436,10 @@ duplexify@^3.4.2, duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
-electron-to-chromium@^1.3.488, electron-to-chromium@^1.3.523:
-  version "1.3.562"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.562.tgz#79c20277ee1c8d0173a22af00e38433b752bc70f"
-  integrity sha512-WhRe6liQ2q/w1MZc8mD8INkenHivuHdrr4r5EQHNomy3NJux+incP6M6lDMd0paShP3MD0WGe5R1TWmEClf+Bg==
+electron-to-chromium@^1.3.488, electron-to-chromium@^1.3.564:
+  version "1.3.568"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.568.tgz#0fa28cd3e5cbd9e8c66f72309eef0646f65a5b66"
+  integrity sha512-j9MlEwgTHVW/lq93Hw8yhzA886oLjDm3Hz7eDkWP2v4fzLVuqOWhpNluziSnmR/tBqgoYldagbLknrdg+B7Tlw==
 
 elliptic@^6.5.3:
   version "6.5.3"
@@ -3588,9 +3592,9 @@ es6-symbol@^3.1.1, es6-symbol@~3.1.3:
     ext "^1.1.2"
 
 escalade@^3.0.1, escalade@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz#6a580d70edb87880f22b4c91d0d56078df6962c4"
-  integrity sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz#e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e"
+  integrity sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
@@ -3611,10 +3615,10 @@ eslint-plugin-prettier@^3.1.3:
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-react-hooks@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.1.0.tgz#6323fbd5e650e84b2987ba76370523a60f4e7925"
-  integrity sha512-36zilUcDwDReiORXmcmTc6rRumu9JIM3WjSvV0nclHoUQ0CNrX866EwONvLR/UqaeqFutbAnVu8PEmctdo2SRQ==
+eslint-plugin-react-hooks@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.1.2.tgz#2eb53731d11c95826ef7a7272303eabb5c9a271e"
+  integrity sha512-ykUeqkGyUGgwTtk78C0o8UG2fzwmgJ0qxBGPp2WqRKsTwcLuVf01kTDRAtOsd4u6whX2XOC8749n2vPydP82fg==
 
 eslint-plugin-react@^7.20.6:
   version "7.20.6"
@@ -3642,11 +3646,11 @@ eslint-scope@^4.0.3:
     estraverse "^4.1.1"
 
 eslint-scope@^5.0.0, eslint-scope@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5"
-  integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
   dependencies:
-    esrecurse "^4.1.0"
+    esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
 eslint-utils@^1.4.3:
@@ -3711,10 +3715,10 @@ eslint@^6.8.0:
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-eslint@^7.8.1:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.8.1.tgz#e59de3573fb6a5be8ff526c791571646d124a8fa"
-  integrity sha512-/2rX2pfhyUG0y+A123d0ccXtMm7DV7sH1m3lk9nk2DZ2LReq39FXHueR9xZwshE5MdfSf0xunSaMWRqyIA6M1w==
+eslint@^7.9.0:
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.9.0.tgz#522aeccc5c3a19017cf0cb46ebfd660a79acf337"
+  integrity sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@eslint/eslintrc" "^0.1.3"
@@ -3784,7 +3788,7 @@ esquery@^1.0.1, esquery@^1.2.0:
   dependencies:
     estraverse "^5.1.0"
 
-esrecurse@^4.1.0:
+esrecurse@^4.1.0, esrecurse@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
   integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
@@ -4370,7 +4374,7 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.0, has-symbols@^1.0.1:
+has-symbols@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
@@ -4506,15 +4510,15 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-husky@^4.2.5:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-4.2.5.tgz#2b4f7622673a71579f901d9885ed448394b5fa36"
-  integrity sha512-SYZ95AjKcX7goYVZtVZF2i6XiZcHknw50iXvY7b0MiGoj5RwdgRQNEHdb+gPDPCXKlzwrybjFjkL6FOj8uRhZQ==
+husky@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.0.tgz#0b2ec1d66424e9219d359e26a51c58ec5278f0de"
+  integrity sha512-tTMeLCLqSBqnflBZnlVDhpaIMucSGaYyX6855jM4AguGeWCeSzNdb1mfyWduTZ3pe3SJVvVWGL0jO1iKZVPfTA==
   dependencies:
     chalk "^4.0.0"
     ci-info "^2.0.0"
     compare-versions "^3.6.0"
-    cosmiconfig "^6.0.0"
+    cosmiconfig "^7.0.0"
     find-versions "^3.2.0"
     opencollective-postinstall "^2.0.2"
     pkg-dir "^4.2.0"
@@ -4563,10 +4567,10 @@ ignore@^5.1.4, ignore@^5.1.8:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
-immer@^7.0.3, immer@^7.0.8:
-  version "7.0.8"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-7.0.8.tgz#41dcbc5669a76500d017bef3ad0d03ce0a1d7c1e"
-  integrity sha512-XnpIN8PXBBaOD43U8Z17qg6RQiKQYGDGGCIbz1ixmLGwBkSWwmrmx5X7d+hTtXDM8ur7m5OdLE0PiO+y5RB3pw==
+immer@^7.0.3, immer@^7.0.9:
+  version "7.0.9"
+  resolved "https://registry.yarnpkg.com/immer/-/immer-7.0.9.tgz#28e7552c21d39dd76feccd2b800b7bc86ee4a62e"
+  integrity sha512-Vs/gxoM4DqNAYR7pugIxi0Xc8XAun/uy7AQu4fLLqaTBHxjOP9pJ266Q9MWA/ly4z6rAFZbvViOtihxUZ7O28A==
 
 import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
   version "3.2.1"
@@ -4664,20 +4668,20 @@ intl-messageformat-parser@^5.3.7:
   dependencies:
     "@formatjs/intl-numberformat" "^5.5.2"
 
-intl-messageformat-parser@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-6.0.5.tgz#098b052ac2714101b4da06fd45d68199d3abd131"
-  integrity sha512-4aO/RTUtzWiV/naqif4ubwz8P7THOxhraN6XmQpgXj4mdGjtPNO2j3vKlEDgAvv4BEi12R/JCHfLf7SUyfPKog==
+intl-messageformat-parser@^6.0.6:
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-6.0.6.tgz#c06c79c534612808e1f3c39288a3c009fb1ff7cd"
+  integrity sha512-XPAgYvCTSwgr92zzy5sfaglUu4uKjIWXHNTenEQRTo5t3o2TGxuPYPruxZqnvSLgnlAegiT/hBemmPcnFPNjAg==
   dependencies:
-    "@formatjs/ecma402-abstract" "^1.2.0"
+    "@formatjs/ecma402-abstract" "^1.2.1"
 
-intl-messageformat@^9.3.6:
-  version "9.3.6"
-  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.3.6.tgz#6b15bca5ebbd81808cf703423c34fb789cf1da8e"
-  integrity sha512-ZmaPVtB1i0Ao64sI+kCl+uAqlHGn1KyHHPYw2W/cd4q00ACDBpdeqeD3y4tQnMXMGZriwbSn90dJ+bvSkQr1dA==
+intl-messageformat@^9.3.7:
+  version "9.3.7"
+  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.3.7.tgz#d40e61dc20ded8952fef00d97237880ff380550a"
+  integrity sha512-DUc+BJ6QN/IyT05gyKTuSJuauuYheV/5IhP+KEwmLhaJzONu0U/nnL5P6L5Ck9DXAx8iy7HM0CwFUctD7CmqZw==
   dependencies:
     fast-memoize "^2.5.2"
-    intl-messageformat-parser "^6.0.5"
+    intl-messageformat-parser "^6.0.6"
 
 invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
@@ -4748,9 +4752,9 @@ is-buffer@^2.0.0:
   integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
 
 is-callable@^1.1.4, is-callable@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb"
-  integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.1.tgz#4d1e21a4f437509d25ce55f8184350771421c96d"
+  integrity sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg==
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
@@ -5004,10 +5008,10 @@ jest-worker@^26.2.1:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jose@^1.28.0:
-  version "1.28.0"
-  resolved "https://registry.yarnpkg.com/jose/-/jose-1.28.0.tgz#0803f8c71f43cd293a9d931c555c30531f5ca5dc"
-  integrity sha512-JmfDRzt/HSj8ipd9TsDtEHoLUnLYavG+7e8F6s1mx2jfVSfXOTaFQsJUydbjJpTnTDHP1+yKL9Ke7ktS/a0Eiw==
+jose@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/jose/-/jose-2.0.2.tgz#fb22385b80c658cc7a0cae05b7086c04c6be49f4"
+  integrity sha512-yD93lsiMA1go/qxSY/vXWBodmIZJIxeB7QhFi8z1yQ3KUwKENqI9UA8VCHlQ5h3x1zWuWZjoY87ByQzkQbIrQg==
   dependencies:
     "@panva/asn1.js" "^1.0.0"
 
@@ -5758,9 +5762,9 @@ moment-timezone@^0.5.31:
     moment ">= 2.9.0"
 
 "moment@>= 2.9.0", moment@^2.10.2:
-  version "2.27.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
-  integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==
+  version "2.28.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.28.0.tgz#cdfe73ce01327cee6537b0fafac2e0f21a237d75"
+  integrity sha512-Z5KOjYmnHyd/ukynmFd/WwyXHd7L4J9vTI/nn5Ap9AVUgaAE15VvQ9MOGmJJygEUklupqIrFnor/tjTwRU+tQw==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
@@ -5979,10 +5983,10 @@ node-pre-gyp@0.15.0:
     semver "^5.3.0"
     tar "^4.4.2"
 
-node-releases@^1.1.58, node-releases@^1.1.60:
-  version "1.1.60"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.60.tgz#6948bdfce8286f0b5d0e5a88e8384e954dfe7084"
-  integrity sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==
+node-releases@^1.1.58, node-releases@^1.1.61:
+  version "1.1.61"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz#707b0fca9ce4e11783612ba4a2fcba09047af16e"
+  integrity sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==
 
 nopt@^4.0.1:
   version "4.0.3"
@@ -6118,7 +6122,7 @@ object-inspect@^1.7.0, object-inspect@^1.8.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
   integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
 
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -6136,14 +6140,14 @@ object-visit@^1.0.0:
     isobject "^3.0.0"
 
 object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd"
+  integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==
   dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.0"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
 
 object.entries@^1.1.2:
   version "1.1.2"
@@ -6963,10 +6967,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^2.0.0, prettier@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.1.tgz#d9485dd5e499daa6cb547023b87a6cf51bee37d6"
-  integrity sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw==
+prettier@^2.0.0, prettier@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5"
+  integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==
 
 pretty-format@^23.0.1:
   version "23.6.0"
@@ -7127,21 +7131,21 @@ react-fast-compare@^2.0.1:
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
   integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
 
-react-intl@^5.8.0:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-5.8.0.tgz#4d365ee992b35cdb81576abd2fb06e4d78a8e461"
-  integrity sha512-03FHg9u9gW+fc9zyVQS0WwZc3AkIzwRVE73O6FJx10ZCJ5XDDHWzgNCK6H65rX0Hq9+Hw9m7IJiU6YIvV3xLFw==
+react-intl@^5.8.1:
+  version "5.8.1"
+  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-5.8.1.tgz#2974499d438bcde58437100b0c19043ca0ffcc3b"
+  integrity sha512-NGwtadXCoPUYHqQFNYR0Rbwv08QkCLECeBPUUFndhJIudvgmVqNrX3x6A3LMEYY76vLOovmoy+xiTAx7yWGkBg==
   dependencies:
-    "@formatjs/ecma402-abstract" "^1.2.0"
-    "@formatjs/intl" "^1.3.0"
-    "@formatjs/intl-displaynames" "^3.3.6"
-    "@formatjs/intl-listformat" "^4.2.5"
-    "@formatjs/intl-relativetimeformat" "^7.2.5"
+    "@formatjs/ecma402-abstract" "^1.2.1"
+    "@formatjs/intl" "^1.3.1"
+    "@formatjs/intl-displaynames" "^3.3.7"
+    "@formatjs/intl-listformat" "^4.2.6"
+    "@formatjs/intl-relativetimeformat" "^7.2.6"
     "@types/hoist-non-react-statics" "^3.3.1"
     fast-memoize "^2.5.2"
     hoist-non-react-statics "^3.3.2"
-    intl-messageformat "^9.3.6"
-    intl-messageformat-parser "^6.0.5"
+    intl-messageformat "^9.3.7"
+    intl-messageformat-parser "^6.0.6"
     shallow-equal "^1.2.1"
 
 react-is@16.13.1, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.9.0:
@@ -7183,10 +7187,10 @@ react-spring@^8.0.27:
     "@babel/runtime" "^7.3.1"
     prop-types "^15.5.8"
 
-react-tooltip@^4.2.9:
-  version "4.2.9"
-  resolved "https://registry.yarnpkg.com/react-tooltip/-/react-tooltip-4.2.9.tgz#0dd08d14191f5d0e56b51c822fa20c2d81a24272"
-  integrity sha512-DgZyg5oxk9/orgePDLLeuDtlwwYv7CalJRahk9nNsoEJDzIO58GC6zSAet4bKTm6c01hg1z3EocP9H0nmMHTMA==
+react-tooltip@^4.2.10:
+  version "4.2.10"
+  resolved "https://registry.yarnpkg.com/react-tooltip/-/react-tooltip-4.2.10.tgz#ed1a1acd388940c96f4b6309f4fd4dcce5e01bdc"
+  integrity sha512-D7ZLx6/QwpUl0SZRek3IZy/HWpsEEp0v3562tcT8IwZgu8IgV7hY5ZzniTkHyRcuL+IQnljpjj7A7zCgl2+T3w==
   dependencies:
     prop-types "^15.7.2"
     uuid "^7.0.3"
@@ -7594,20 +7598,20 @@ rollup-plugin-hashbang@^2.2.2:
   dependencies:
     magic-string "^0.22.4"
 
-rollup-plugin-terser@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.1.tgz#df72d8272e03fcb504a76f414b9509c63c5eaf54"
-  integrity sha512-HL0dgzSxBYG/Ly9i/E5Sc+PuKKZ0zBzk11VmLCfdUtpqH4yYqkLclPkTqRy85FU9246yetImOClaQ/ufnj08vg==
+rollup-plugin-terser@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d"
+  integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     jest-worker "^26.2.1"
     serialize-javascript "^4.0.0"
     terser "^5.0.0"
 
-rollup@^2.26.10:
-  version "2.26.10"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.26.10.tgz#0ffe0390d35f07af850382f22f1b8525c7f57f07"
-  integrity sha512-dUnjCWOA0h9qNX6qtcHidyatz8FAFZxVxt1dbcGtKdlJkpSxGK3G9+DLCYvtZr9v94D129ij9zUhG+xbRoqepw==
+rollup@^2.26.11:
+  version "2.26.11"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.26.11.tgz#4fc31de9c7b83d50916fc8395f8c3d24730cdaae"
+  integrity sha512-xyfxxhsE6hW57xhfL1I+ixH8l2bdoIMaAecdQiWF3N7IgJEMu99JG+daBiSZQjnBpzFxa0/xZm+3pbCdAQehHw==
   optionalDependencies:
     fsevents "~2.1.2"
 
@@ -7629,9 +7633,9 @@ run-queue@^1.0.0, run-queue@^1.0.3:
     aproba "^1.1.1"
 
 rxjs@^6.6.0, rxjs@^6.6.2:
-  version "6.6.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.2.tgz#8096a7ac03f2cc4fe5860ef6e572810d9e01c0d2"
-  integrity sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==
+  version "6.6.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
+  integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -8309,10 +8313,10 @@ stylelint-config-recommended@^3.0.0:
   resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz#e0e547434016c5539fe2650afd58049a2fd1d657"
   integrity sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==
 
-stylelint@^13.7.0:
-  version "13.7.0"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.7.0.tgz#8d7a4233063b2f06e9f28b3405ff189e334547b5"
-  integrity sha512-1wStd4zVetnlHO98VjcHQbjSDmvcA39smkZQMct2cf+hom40H0xlQNdzzbswoG/jGBh61/Ue9m7Lu99PY51O6A==
+stylelint@^13.7.1:
+  version "13.7.1"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.7.1.tgz#bee97ee78d778a3f1dbe3f7397b76414973e263e"
+  integrity sha512-qzqazcyRxrSRdmFuO0/SZOJ+LyCxYy0pwcvaOBBnl8/2VfHSMrtNIE+AnyJoyq6uKb+mt+hlgmVrvVi6G6XHfQ==
   dependencies:
     "@stylelint/postcss-css-in-js" "^0.37.2"
     "@stylelint/postcss-markdown" "^0.36.1"
@@ -8515,9 +8519,9 @@ terser@4.8.0, terser@^4.1.2:
     source-map-support "~0.5.12"
 
 terser@^5.0.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.0.tgz#c481f4afecdcc182d5e2bdd2ff2dc61555161e81"
-  integrity sha512-XTT3D3AwxC54KywJijmY2mxZ8nJiEjBHVYzq8l9OaYuRFWeQNBwvipuzzYEP4e+/AVcd1hqG/CqgsdIRyT45Fg==
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.1.tgz#f50fe20ab48b15234fe9bdd86b10148ad5fca787"
+  integrity sha512-yD80f4hdwCWTH5mojzxe1q8bN1oJbsK/vfJGLcPZM/fl+/jItIVNKhFIHqqR71OipFWMLgj3Kc+GIp6CeIqfnA==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"