diff --git a/components/helpers/StickyHeader.js b/components/common/StickyHeader.js
similarity index 64%
rename from components/helpers/StickyHeader.js
rename to components/common/StickyHeader.js
index 62dcb74a..639709f9 100644
--- a/components/helpers/StickyHeader.js
+++ b/components/common/StickyHeader.js
@@ -12,17 +12,18 @@ export default function StickyHeader({
 }) {
   const { ref: scrollRef, isSticky } = useSticky({ scrollElement });
   const { ref: measureRef, dimensions } = useMeasure();
+  const active = enabled && isSticky;
 
   return (
     <div
       ref={measureRef}
-      data-sticky={enabled && isSticky}
-      style={enabled && isSticky ? { height: dimensions.height } : null}
+      data-sticky={active}
+      style={active ? { height: dimensions.height } : null}
     >
       <div
         ref={scrollRef}
-        className={classNames(className, { [stickyClassName]: enabled && isSticky })}
-        style={enabled && isSticky ? { ...stickyStyle, width: dimensions.width } : null}
+        className={classNames(className, { [stickyClassName]: active })}
+        style={active ? { ...stickyStyle, width: dimensions.width } : null}
       >
         {children}
       </div>
diff --git a/components/helpers/CheckVisible.js b/components/helpers/CheckVisible.js
deleted file mode 100644
index a150f725..00000000
--- a/components/helpers/CheckVisible.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { useState, useRef, useEffect } from 'react';
-
-function isInViewport(element) {
-  const rect = element.getBoundingClientRect();
-  return !(
-    rect.bottom < 0 ||
-    rect.right < 0 ||
-    rect.left > window.innerWidth ||
-    rect.top > window.innerHeight
-  );
-}
-
-export default function CheckVisible({ className, children }) {
-  const [visible, setVisible] = useState(false);
-  const ref = useRef();
-
-  useEffect(() => {
-    const checkPosition = () => {
-      if (ref.current) {
-        const state = isInViewport(ref.current);
-        if (state !== visible) {
-          setVisible(state);
-        }
-      }
-    };
-
-    checkPosition();
-
-    window.addEventListener('scroll', checkPosition);
-
-    return () => {
-      window.removeEventListener('scroll', checkPosition);
-    };
-  }, [visible]);
-
-  return (
-    <div ref={ref} className={className} data-visible={visible}>
-      {typeof children === 'function' ? children(visible) : children}
-    </div>
-  );
-}
diff --git a/components/input/DateFilter.js b/components/input/DateFilter.js
index a340fe48..b10388e7 100644
--- a/components/input/DateFilter.js
+++ b/components/input/DateFilter.js
@@ -18,7 +18,7 @@ function DateFilter({ websiteId, value, className }) {
   const [showPicker, setShowPicker] = useState(false);
 
   async function handleDateChange(value) {
-    if (value === 'all') {
+    if (value === 'all' && websiteId) {
       const data = await get(`/websites/${websiteId}`);
 
       if (data) {
diff --git a/components/input/RefreshButton.js b/components/input/RefreshButton.js
index 031e4ee6..a5c8493b 100644
--- a/components/input/RefreshButton.js
+++ b/components/input/RefreshButton.js
@@ -1,6 +1,6 @@
 import { useIntl } from 'react-intl';
 import { LoadingButton, Icon, Tooltip } from 'react-basics';
-import { setDateRange } from 'store/websites';
+import { setWebsiteDateRange } from 'store/websites';
 import useDateRange from 'hooks/useDateRange';
 import Icons from 'components/icons';
 import { labels } from 'components/messages';
@@ -12,9 +12,9 @@ function RefreshButton({ websiteId, isLoading }) {
   function handleClick() {
     if (!isLoading && dateRange) {
       if (/^\d+/.test(dateRange.value)) {
-        setDateRange(websiteId, dateRange.value);
+        setWebsiteDateRange(websiteId, dateRange.value);
       } else {
-        setDateRange(websiteId, dateRange);
+        setWebsiteDateRange(websiteId, dateRange);
       }
     }
   }
diff --git a/components/input/SettingsButton.js b/components/input/SettingsButton.js
index 46a01e13..3a6068e3 100644
--- a/components/input/SettingsButton.js
+++ b/components/input/SettingsButton.js
@@ -18,7 +18,12 @@ export default function SettingsButton() {
           </Icon>
         </Button>
       </Tooltip>
-      <Popup className={styles.popup} position="bottom" alignment="end">
+      <Popup
+        className={styles.popup}
+        position="bottom"
+        alignment="end"
+        onClick={e => e.stopPropagation()}
+      >
         <Form>
           <FormRow label={formatMessage(labels.timezone)}>
             <TimezoneSetting />
diff --git a/components/input/UserButton.js b/components/input/UserButton.js
deleted file mode 100644
index f6b42d62..00000000
--- a/components/input/UserButton.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import useConfig from 'hooks/useConfig';
-import useUser from 'hooks/useUser';
-import { AUTH_TOKEN } from 'lib/constants';
-import { removeItem } from 'next-basics';
-import { useRouter } from 'next/router';
-import { useRef, useState } from 'react';
-import { Button, Icon, Item, Menu, Popup, Text } from 'react-basics';
-import { FormattedMessage } from 'react-intl';
-import useDocumentClick from 'hooks/useDocumentClick';
-import Profile from 'assets/profile.svg';
-import styles from './UserButton.module.css';
-
-export default function UserButton() {
-  const [show, setShow] = useState(false);
-  const ref = useRef();
-  const { user } = useUser();
-  const router = useRouter();
-  const { adminDisabled } = useConfig();
-
-  const menuOptions = [
-    {
-      label: (
-        <FormattedMessage
-          id="label.logged-in-as"
-          defaultMessage="Logged in as {username}"
-          values={{ username: <b>{user.username}</b> }}
-        />
-      ),
-      value: 'username',
-      className: styles.username,
-    },
-    {
-      label: <FormattedMessage id="label.profile" defaultMessage="Profile" />,
-      value: 'profile',
-      hidden: adminDisabled,
-      divider: true,
-    },
-    { label: <FormattedMessage id="label.logout" defaultMessage="Logout" />, value: 'logout' },
-  ];
-
-  function handleClick() {
-    setShow(state => !state);
-  }
-
-  function handleSelect(value) {
-    if (value === 'logout') {
-      removeItem(AUTH_TOKEN);
-      router.push('/login');
-    } else if (value === 'profile') {
-      router.push('/profile');
-    }
-  }
-
-  useDocumentClick(e => {
-    if (!ref.current?.contains(e.target)) {
-      setShow(false);
-    }
-  });
-
-  return (
-    <div className={styles.button} ref={ref}>
-      <Button variant="light" onClick={handleClick}>
-        <Icon className={styles.icon} size="large">
-          <Profile />
-        </Icon>
-      </Button>
-      {show && (
-        <Popup className={styles.menu} position="bottom" gap={5}>
-          <Menu items={menuOptions} onSelect={handleSelect}>
-            {({ label, value }) => (
-              <Item key={value}>
-                <Text>{label}</Text>
-              </Item>
-            )}
-          </Menu>
-        </Popup>
-      )}
-    </div>
-  );
-}
diff --git a/components/input/UserButton.module.css b/components/input/UserButton.module.css
deleted file mode 100644
index 6c4dfdd0..00000000
--- a/components/input/UserButton.module.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.button {
-  position: relative;
-}
-
-.username {
-  border-bottom: 1px solid var(--base500);
-}
-
-.username:hover {
-  background: var(--base50);
-}
-
-.icon svg {
-  height: 16px;
-  width: 16px;
-}
-
-.menu {
-  left: -50%;
-  background: var(--base50);
-  border: 1px solid var(--base500);
-  border-radius: 4px;
-  overflow: hidden;
-  z-index: 100;
-}
diff --git a/components/layout/Footer.js b/components/layout/Footer.js
index 7d202256..64812b8e 100644
--- a/components/layout/Footer.js
+++ b/components/layout/Footer.js
@@ -8,7 +8,7 @@ export default function Footer() {
   return (
     <footer className={styles.footer}>
       <Row>
-        <Column defaultSize={11} xs={12} sm={12}>
+        <Column defaultSize={12} lg={11} xl={11}>
           <div>
             <FormattedMessage
               {...labels.poweredBy}
@@ -22,7 +22,7 @@ export default function Footer() {
             />
           </div>
         </Column>
-        <Column className={styles.version} defaultSize={1} xs={12} sm={12}>
+        <Column className={styles.version} defaultSize={12} lg={1} xl={1}>
           <a href={REPO_URL}>{`v${CURRENT_VERSION}`}</a>
         </Column>
       </Row>
diff --git a/components/layout/Footer.module.css b/components/layout/Footer.module.css
index 98e8b9ea..a23f496d 100644
--- a/components/layout/Footer.module.css
+++ b/components/layout/Footer.module.css
@@ -1,6 +1,7 @@
 .footer {
   font-size: var(--font-size-sm);
   text-align: center;
+  line-height: 30px;
   margin: 60px 0;
 }
 
@@ -11,10 +12,5 @@
 .version {
   text-align: right;
   padding-right: 10px;
-}
-
-@media only screen and (max-width: 768px) {
-  .footer .version {
-    text-align: center;
-  }
+  white-space: nowrap;
 }
diff --git a/components/messages.js b/components/messages.js
index 77a26d27..6cd93be9 100644
--- a/components/messages.js
+++ b/components/messages.js
@@ -100,6 +100,8 @@ export const labels = defineMessages({
   logs: { id: 'label.activity-log', defaultMessage: 'Activity log' },
   dismiss: { id: 'label.dismiss', defaultMessage: 'Dismiss' },
   poweredBy: { id: 'label.powered-by', defaultMessage: 'Powered by {name}' },
+  pageViews: { id: 'label.page-views', defaultMessage: 'Page views' },
+  uniqueVisitors: { id: 'label.unique-visitors', defaultMessage: 'Unique visitors' },
 });
 
 export const messages = defineMessages({
diff --git a/components/metrics/PageviewsChart.js b/components/metrics/PageviewsChart.js
index e7998c39..f040f2eb 100644
--- a/components/metrics/PageviewsChart.js
+++ b/components/metrics/PageviewsChart.js
@@ -1,9 +1,11 @@
+import { useVisible } from 'react-basics';
 import { useIntl } from 'react-intl';
 import { colord } from 'colord';
-import CheckVisible from 'components/helpers/CheckVisible';
 import BarChart from './BarChart';
 import useTheme from 'hooks/useTheme';
 import { THEME_COLORS, DEFAULT_ANIMATION_DURATION } from 'lib/constants';
+import { labels } from 'components/messages';
+import { useMemo } from 'react';
 
 export default function PageviewsChart({
   websiteId,
@@ -15,19 +17,23 @@ export default function PageviewsChart({
   animationDuration = DEFAULT_ANIMATION_DURATION,
   ...props
 }) {
-  const intl = useIntl();
+  const { formatMessage } = useIntl();
   const [theme] = useTheme();
-  const primaryColor = colord(THEME_COLORS[theme].primary);
-  const colors = {
-    views: {
-      background: primaryColor.alpha(0.4).toRgbString(),
-      border: primaryColor.alpha(0.5).toRgbString(),
-    },
-    visitors: {
-      background: primaryColor.alpha(0.6).toRgbString(),
-      border: primaryColor.alpha(0.7).toRgbString(),
-    },
-  };
+  const { ref, visible } = useVisible();
+
+  const colors = useMemo(() => {
+    const primaryColor = colord(THEME_COLORS[theme].primary);
+    return {
+      views: {
+        background: primaryColor.alpha(0.4).toRgbString(),
+        border: primaryColor.alpha(0.5).toRgbString(),
+      },
+      visitors: {
+        background: primaryColor.alpha(0.6).toRgbString(),
+        border: primaryColor.alpha(0.7).toRgbString(),
+      },
+    };
+  }, [theme]);
 
   const handleUpdate = chart => {
     const {
@@ -35,15 +41,9 @@ export default function PageviewsChart({
     } = chart;
 
     datasets[0].data = data.sessions;
-    datasets[0].label = intl.formatMessage({
-      id: 'metrics.unique-visitors',
-      defaultMessage: 'Unique visitors',
-    });
+    datasets[0].label = formatMessage(labels.uniqueVisitors);
     datasets[1].data = data.pageviews;
-    datasets[1].label = intl.formatMessage({
-      id: 'metrics.page-views',
-      defaultMessage: 'Page views',
-    });
+    datasets[1].label = formatMessage(labels.pageViews);
   };
 
   if (!data) {
@@ -51,43 +51,35 @@ export default function PageviewsChart({
   }
 
   return (
-    <CheckVisible>
-      {visible => (
-        <BarChart
-          {...props}
-          className={className}
-          chartId={websiteId}
-          datasets={[
-            {
-              label: intl.formatMessage({
-                id: 'metrics.unique-visitors',
-                defaultMessage: 'Unique visitors',
-              }),
-              data: data.sessions,
-              lineTension: 0,
-              backgroundColor: colors.visitors.background,
-              borderColor: colors.visitors.border,
-              borderWidth: 1,
-            },
-            {
-              label: intl.formatMessage({
-                id: 'metrics.page-views',
-                defaultMessage: 'Page views',
-              }),
-              data: data.pageviews,
-              lineTension: 0,
-              backgroundColor: colors.views.background,
-              borderColor: colors.views.border,
-              borderWidth: 1,
-            },
-          ]}
-          unit={unit}
-          records={records}
-          animationDuration={visible ? animationDuration : 0}
-          onUpdate={handleUpdate}
-          loading={loading}
-        />
-      )}
-    </CheckVisible>
+    <div ref={ref}>
+      <BarChart
+        {...props}
+        className={className}
+        chartId={websiteId}
+        datasets={[
+          {
+            label: formatMessage(labels.uniqueVisitors),
+            data: data.sessions,
+            lineTension: 0,
+            backgroundColor: colors.visitors.background,
+            borderColor: colors.visitors.border,
+            borderWidth: 1,
+          },
+          {
+            label: formatMessage(labels.pageViews),
+            data: data.pageviews,
+            lineTension: 0,
+            backgroundColor: colors.views.background,
+            borderColor: colors.views.border,
+            borderWidth: 1,
+          },
+        ]}
+        unit={unit}
+        records={records}
+        animationDuration={visible ? animationDuration : 0}
+        onUpdate={handleUpdate}
+        loading={loading}
+      />
+    </div>
   );
 }
diff --git a/components/metrics/WebsiteChart.js b/components/metrics/WebsiteChart.js
index 001399db..0d8bc322 100644
--- a/components/metrics/WebsiteChart.js
+++ b/components/metrics/WebsiteChart.js
@@ -6,7 +6,7 @@ import PageviewsChart from './PageviewsChart';
 import MetricsBar from './MetricsBar';
 import WebsiteHeader from './WebsiteHeader';
 import DateFilter from 'components/input/DateFilter';
-import StickyHeader from 'components/helpers/StickyHeader';
+import StickyHeader from 'components/common/StickyHeader';
 import ErrorMessage from 'components/common/ErrorMessage';
 import FilterTags from 'components/metrics/FilterTags';
 import RefreshButton from 'components/input/RefreshButton';
diff --git a/components/pages/realtime/RealtimeDashboard.js b/components/pages/realtime/RealtimeDashboard.js
index 9e6c2d1b..9c33d2ac 100644
--- a/components/pages/realtime/RealtimeDashboard.js
+++ b/components/pages/realtime/RealtimeDashboard.js
@@ -6,7 +6,7 @@ import firstBy from 'thenby';
 import { GridRow, GridColumn } from 'components/layout/Grid';
 import Page from 'components/layout/Page';
 import RealtimeChart from 'components/metrics/RealtimeChart';
-import StickyHeader from 'components/helpers/StickyHeader';
+import StickyHeader from 'components/common/StickyHeader';
 import PageHeader from 'components/layout/PageHeader';
 import WorldMap from 'components/common/WorldMap';
 import RealtimeLog from 'components/pages/realtime/RealtimeLog';
diff --git a/components/pages/settings/profile/DateRangeSetting.js b/components/pages/settings/profile/DateRangeSetting.js
index 5eca8cc5..15a3c010 100644
--- a/components/pages/settings/profile/DateRangeSetting.js
+++ b/components/pages/settings/profile/DateRangeSetting.js
@@ -14,7 +14,7 @@ export default function DateRangeSetting() {
 
   return (
     <Flexbox width={400} gap={10}>
-      <DateFilter value={value} startDate={startDate} endDate={endDate} onChange={setDateRange} />
+      <DateFilter value={value} startDate={startDate} endDate={endDate} />
       <Button onClick={handleReset}>{formatMessage(labels.reset)}</Button>
     </Flexbox>
   );
diff --git a/hooks/useDateRange.js b/hooks/useDateRange.js
index be42f7d3..b16aad34 100644
--- a/hooks/useDateRange.js
+++ b/hooks/useDateRange.js
@@ -1,42 +1,38 @@
-import { useCallback, useMemo } from 'react';
 import { parseISO } from 'date-fns';
-import { getDateRange } from 'lib/date';
-import { getItem, setItem } from 'next-basics';
+import { parseDateRange } from 'lib/date';
+import { setItem } from 'next-basics';
 import { DATE_RANGE_CONFIG, DEFAULT_DATE_RANGE } from 'lib/constants';
-import useForceUpdate from './useForceUpdate';
 import useLocale from './useLocale';
-import useStore, { setDateRange } from 'store/websites';
+import { getWebsiteDateRange, setWebsiteDateRange } from 'store/websites';
+import useStore, { setDateRange } from 'store/app';
+
+function parseValue(value, locale) {
+  if (typeof value === 'string') {
+    return parseDateRange(value, locale);
+  } else if (typeof value === 'object') {
+    return {
+      ...value,
+      startDate: parseISO(value.startDate),
+      endDate: parseISO(value.endDate),
+    };
+  }
+}
 
 export default function useDateRange(websiteId) {
   const { locale } = useLocale();
-  const forceUpdate = useForceUpdate();
-  const selector = useCallback(state => state?.[websiteId]?.dateRange, [websiteId]);
-  const websiteDateRange = useStore(selector);
-  const defaultDateRange = useMemo(() => getDateRange(DEFAULT_DATE_RANGE, locale), [locale]);
+  const websiteConfig = getWebsiteDateRange(websiteId);
+  const defaultConfig = DEFAULT_DATE_RANGE;
+  const globalConfig = useStore(state => state.dateRange);
+  const dateRange = parseValue(websiteConfig || globalConfig || defaultConfig, locale);
 
-  const globalDefault = getItem(DATE_RANGE_CONFIG);
-  let globalDateRange;
-
-  if (globalDefault) {
-    if (typeof globalDefault === 'string') {
-      globalDateRange = getDateRange(globalDefault, locale);
-    } else if (typeof globalDefault === 'object') {
-      globalDateRange = {
-        ...globalDefault,
-        startDate: parseISO(globalDefault.startDate),
-        endDate: parseISO(globalDefault.endDate),
-      };
-    }
-  }
-
-  function saveDateRange(dateRange) {
+  function saveDateRange(value) {
     if (websiteId) {
-      setDateRange(websiteId, dateRange);
+      setWebsiteDateRange(websiteId, value);
     } else {
-      setItem(DATE_RANGE_CONFIG, dateRange);
-      forceUpdate();
+      setItem(DATE_RANGE_CONFIG, value);
+      setDateRange(value);
     }
   }
 
-  return [websiteDateRange || globalDateRange || defaultDateRange, saveDateRange];
+  return [dateRange, saveDateRange];
 }
diff --git a/lib/date.js b/lib/date.js
index cae39ce4..3817fb71 100644
--- a/lib/date.js
+++ b/lib/date.js
@@ -37,7 +37,7 @@ export function getLocalTime(t) {
   return addMinutes(new Date(t), new Date().getTimezoneOffset());
 }
 
-export function getDateRange(value, locale = 'en-US') {
+export function parseDateRange(value, locale = 'en-US') {
   const now = new Date();
   const dateLocale = getDateLocale(locale);
 
diff --git a/lib/middleware.ts b/lib/middleware.ts
index 5cd469c3..431efbdd 100644
--- a/lib/middleware.ts
+++ b/lib/middleware.ts
@@ -44,7 +44,9 @@ export const useAuth = createMiddleware(async (req, res, next) => {
     user = await redis.get(authKey);
   }
 
-  log({ token, payload, user, shareToken });
+  if (process.env.NODE_ENV === 'development') {
+    log({ token, shareToken, payload, user });
+  }
 
   if (!user?.id && !shareToken) {
     log('useAuth: User not authorized');
diff --git a/next.config.js b/next.config.js
index c654b086..f72f8543 100644
--- a/next.config.js
+++ b/next.config.js
@@ -2,6 +2,8 @@
 require('dotenv').config();
 const pkg = require('./package.json');
 
+const CLOUD_URL = 'https://cloud.umami.is';
+
 const contentSecurityPolicy = `
   default-src 'self';
   img-src *;
@@ -33,11 +35,29 @@ if (process.env.FORCE_SSL) {
   });
 }
 
-module.exports = {
+const rewrites = [];
+
+if (process.env.COLLECT_API_ENDPOINT) {
+  rewrites.push({
+    source: 'process.env.COLLECT_API_ENDPOINT',
+    destination: '/api/in',
+  });
+}
+
+const redirects = [];
+
+if (process.env.CLOUD_MODE) {
+  redirects.push({
+    source: '/login',
+    destination: CLOUD_URL,
+    permanent: false,
+  });
+}
+
+const config = {
   env: {
     currentVersion: pkg.version,
     isProduction: process.env.NODE_ENV === 'production',
-    uiDisabled: !!process.env.DISABLE_UI,
   },
   basePath: process.env.BASE_PATH,
   output: 'standalone',
@@ -66,10 +86,16 @@ module.exports = {
   },
   async rewrites() {
     return [
+      ...rewrites,
       {
         source: '/telemetry.js',
         destination: '/api/scripts/telemetry',
       },
     ];
   },
+  async redirects() {
+    return [...redirects];
+  },
 };
+
+module.exports = config;
diff --git a/package.json b/package.json
index 26cb8eae..2ee34a96 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "url": "https://github.com/umami-software/umami.git"
   },
   "scripts": {
-    "dev": "next dev",
+    "dev": "next dev -p 3000",
     "build": "npm-run-all build-db check-db build-tracker build-geo build-app",
     "start": "next start",
     "build-docker": "npm-run-all build-db build-tracker build-geo build-app",
@@ -93,7 +93,7 @@
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
     "react": "^18.2.0",
-    "react-basics": "^0.68.0",
+    "react-basics": "^0.69.0",
     "react-beautiful-dnd": "^13.1.0",
     "react-dom": "^18.2.0",
     "react-intl": "^5.24.7",
diff --git a/pages/_app.js b/pages/_app.js
index 8886119a..ec14d084 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -9,7 +9,7 @@ import 'styles/variables.css';
 import 'styles/locale.css';
 import 'styles/index.css';
 import '@fontsource/inter/400.css';
-import '@fontsource/inter/600.css';
+import '@fontsource/inter/700.css';
 import Script from 'next/script';
 
 const client = new QueryClient({
@@ -24,11 +24,11 @@ const client = new QueryClient({
 export default function App({ Component, pageProps }) {
   const { locale, messages } = useLocale();
   const { basePath, pathname } = useRouter();
-  useConfig();
+  const config = useConfig();
 
   const Wrapper = ({ children }) => <span className={locale}>{children}</span>;
 
-  if (process.env.uiDisabled) {
+  if (!config || config.uiDisabled) {
     return null;
   }
 
diff --git a/pages/api/config.ts b/pages/api/config.ts
index 54498eda..bccfd048 100644
--- a/pages/api/config.ts
+++ b/pages/api/config.ts
@@ -6,7 +6,6 @@ export interface ConfigResponse {
   trackerScriptName: string;
   updatesDisabled: boolean;
   telemetryDisabled: boolean;
-  adminDisabled: boolean;
   cloudMode: boolean;
 }
 
@@ -17,8 +16,7 @@ export default async (req: NextApiRequest, res: NextApiResponse<ConfigResponse>)
       trackerScriptName: process.env.TRACKER_SCRIPT_NAME,
       updatesDisabled: !!process.env.DISABLE_UPDATES,
       telemetryDisabled: !!process.env.DISABLE_TELEMETRY,
-      adminDisabled: !!process.env.DISABLE_ADMIN,
-      cloudMode: process.env.CLOUD_MODE,
+      cloudMode: !!process.env.CLOUD_MODE,
     });
   }
 
diff --git a/pages/api/collect.ts b/pages/api/send.ts
similarity index 100%
rename from pages/api/collect.ts
rename to pages/api/send.ts
diff --git a/pages/login.js b/pages/login.js
index 88c19121..9a1f3c45 100644
--- a/pages/login.js
+++ b/pages/login.js
@@ -16,7 +16,7 @@ export default function LoginPage({ disabled }) {
 export async function getServerSideProps() {
   return {
     props: {
-      disabled: !!(process.env.DISABLE_LOGIN || process.env.CLOUD_MODE),
+      disabled: !!process.env.DISABLE_LOGIN,
     },
   };
 }
diff --git a/pages/settings/index.js b/pages/settings/index.js
index 0c213fe6..70e8d249 100644
--- a/pages/settings/index.js
+++ b/pages/settings/index.js
@@ -1,11 +1,9 @@
 export default () => null;
 
 export async function getServerSideProps() {
-  const destination = process.env.CLOUD_MODE ? 'https://cloud.umami.is' : '/settings/websites';
-
   return {
     redirect: {
-      destination,
+      destination: '/settings/websites',
       permanent: true,
     },
   };
diff --git a/store/app.js b/store/app.js
index f03eb57c..594bc169 100644
--- a/store/app.js
+++ b/store/app.js
@@ -1,10 +1,18 @@
 import create from 'zustand';
-import { DEFAULT_LOCALE, DEFAULT_THEME, LOCALE_CONFIG, THEME_CONFIG } from 'lib/constants';
+import {
+  DATE_RANGE_CONFIG,
+  DEFAULT_DATE_RANGE,
+  DEFAULT_LOCALE,
+  DEFAULT_THEME,
+  LOCALE_CONFIG,
+  THEME_CONFIG,
+} from 'lib/constants';
 import { getItem } from 'next-basics';
 
 const initialState = {
   locale: getItem(LOCALE_CONFIG) || DEFAULT_LOCALE,
   theme: getItem(THEME_CONFIG) || DEFAULT_THEME,
+  dateRange: getItem(DATE_RANGE_CONFIG) || DEFAULT_DATE_RANGE,
   shareToken: null,
   user: null,
   config: null,
@@ -32,4 +40,8 @@ export function setConfig(config) {
   store.setState({ config });
 }
 
+export function setDateRange(dateRange) {
+  store.setState({ dateRange });
+}
+
 export default store;
diff --git a/store/websites.js b/store/websites.js
index 0b30cc1f..e174cbac 100644
--- a/store/websites.js
+++ b/store/websites.js
@@ -1,11 +1,15 @@
 import create from 'zustand';
 import produce from 'immer';
 import app from './app';
-import { getDateRange } from 'lib/date';
+import { parseDateRange } from 'lib/date';
 
 const store = create(() => ({}));
 
-export function setDateRange(websiteId, value) {
+export function getWebsiteDateRange(websiteId) {
+  return store.getState()?.[websiteId];
+}
+
+export function setWebsiteDateRange(websiteId, value) {
   store.setState(
     produce(state => {
       if (!state[websiteId]) {
@@ -16,7 +20,7 @@ export function setDateRange(websiteId, value) {
 
       if (typeof value === 'string') {
         const { locale } = app.getState();
-        dateRange = getDateRange(value, locale);
+        dateRange = parseDateRange(value, locale);
       }
 
       state[websiteId].dateRange = { ...dateRange, modified: Date.now() };
diff --git a/tracker/index.js b/tracker/index.js
index f5765dc7..baff16ec 100644
--- a/tracker/index.js
+++ b/tracker/index.js
@@ -47,7 +47,7 @@
     (dnt && doNotTrack()) ||
     (domain && !domains.includes(hostname));
 
-  const tracker_delay_duration = 300;
+  const delayDuration = 300;
   const _data = 'data-';
   const _false = 'false';
   const attr = currentScript.getAttribute.bind(currentScript);
@@ -192,7 +192,7 @@
     }
 
     if (currentUrl !== currentRef) {
-      setTimeout(() => trackView(), tracker_delay_duration);
+      setTimeout(() => trackView(), delayDuration);
     }
   };
 
diff --git a/yarn.lock b/yarn.lock
index 37e3674e..7927fdd1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6635,10 +6635,10 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-basics@^0.68.0:
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.68.0.tgz#aa65061de838811f00396c26c72ded2bc7f413ae"
-  integrity sha512-3C7HyHXOPNetu75r2soEPLlIAKxIqbNt51gim9SN33HJowDdDw+ZQ6V1kzob3DbFgWvuy0bm4bn7XiXcMJSA2w==
+react-basics@^0.69.0:
+  version "0.69.0"
+  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.69.0.tgz#7399c37cf383551af90a5cbb4cac57ac21e7a40b"
+  integrity sha512-5PGQiKMHOGhpYni6x8QaZO1mnKKZr2h/ka11oGjrNt8VPUopLhGp4euTUpFjP1NSDAczxH6qQzKV/tDagZmTjw==
   dependencies:
     classnames "^2.3.1"
     date-fns "^2.29.3"