diff --git a/components/messages.js b/components/messages.js
index 9a72ff75..c29432b1 100644
--- a/components/messages.js
+++ b/components/messages.js
@@ -83,6 +83,7 @@ export const labels = defineMessages({
   filterRaw: { id: 'label.filter-raw', defaultMessage: 'Raw' },
   views: { id: 'label.views', defaultMessage: 'View' },
   none: { id: 'label.none', defaultMessage: 'None' },
+  clearAll: { id: 'label.clear-all', defaultMessage: 'Clear all' },
 });
 
 export const messages = defineMessages({
diff --git a/components/metrics/FilterTags.js b/components/metrics/FilterTags.js
index 75d38371..0e68504b 100644
--- a/components/metrics/FilterTags.js
+++ b/components/metrics/FilterTags.js
@@ -1,22 +1,29 @@
+import { useIntl } from 'react-intl';
 import classNames from 'classnames';
 import { safeDecodeURI } from 'next-basics';
-import { Button, Icon, Icons } from 'react-basics';
+import { Button, Icon, Icons, Text } from 'react-basics';
+import { labels } from 'components/messages';
 import styles from './FilterTags.module.css';
 
 export default function FilterTags({ className, params, onClick }) {
+  const { formatMessage } = useIntl();
+
   if (Object.keys(params).filter(key => params[key]).length === 0) {
     return null;
   }
+
   return (
-    <div className={classNames(styles.filters, 'col-12', className)}>
+    <div className={classNames(styles.filters, className)}>
       {Object.keys(params).map(key => {
         if (!params[key]) {
           return null;
         }
         return (
           <div key={key} className={styles.tag}>
-            <Button onClick={() => onClick(key)} variant="action" iconRight>
-              {`${key}: ${safeDecodeURI(params[key])}`}
+            <Button onClick={() => onClick(key)} variant="primary" size="sm">
+              <Text>
+                <b>{`${key}`}</b> — {`${safeDecodeURI(params[key])}`}
+              </Text>
               <Icon>
                 <Icons.Close />
               </Icon>
@@ -24,6 +31,12 @@ export default function FilterTags({ className, params, onClick }) {
           </div>
         );
       })}
+      <Button size="sm" variant="quiet" onClick={() => onClick(null)}>
+        <Icon>
+          <Icons.Close />
+        </Icon>
+        <Text>{formatMessage(labels.clearAll)}</Text>
+      </Button>
     </div>
   );
 }
diff --git a/components/metrics/WebsiteChart.js b/components/metrics/WebsiteChart.js
index 1d23df7a..73b9b6da 100644
--- a/components/metrics/WebsiteChart.js
+++ b/components/metrics/WebsiteChart.js
@@ -34,7 +34,7 @@ export default function WebsiteChart({
   const {
     router,
     resolve,
-    query: { url, referrer, os, browser, device, country },
+    query: { view, url, referrer, os, browser, device, country },
   } = usePageQuery();
   const { get, useQuery } = useApi();
 
@@ -67,7 +67,11 @@ export default function WebsiteChart({
   }, [data, startDate, endDate, unit]);
 
   function handleCloseFilter(param) {
-    router.push(resolve({ [param]: undefined }));
+    if (param === null) {
+      router.push(`/websites/${websiteId}/?view=${view}`);
+    } else {
+      router.push(resolve({ [param]: undefined }));
+    }
   }
 
   async function handleDateChange(value) {
@@ -97,11 +101,11 @@ export default function WebsiteChart({
             </a>
           </Link>
         )}
-        <FilterTags
-          params={{ url, referrer, os, browser, device, country }}
-          onClick={handleCloseFilter}
-        />
       </WebsiteHeader>
+      <FilterTags
+        params={{ url, referrer, os, browser, device, country }}
+        onClick={handleCloseFilter}
+      />
       <StickyHeader stickyClassName={styles.sticky} enabled={stickyHeader}>
         <Row className={styles.header}>
           <Column xs={12} sm={12} md={12} defaultSize={10}>
diff --git a/components/pages/realtime/RealtimeDashboard.js b/components/pages/realtime/RealtimeDashboard.js
index 941d0f0c..552c726a 100644
--- a/components/pages/realtime/RealtimeDashboard.js
+++ b/components/pages/realtime/RealtimeDashboard.js
@@ -1,9 +1,9 @@
 import { useState, useEffect, useMemo, useCallback } from 'react';
+import { Row, Column } from 'react-basics';
 import { FormattedMessage } from 'react-intl';
 import { subMinutes, startOfMinute } from 'date-fns';
 import firstBy from 'thenby';
 import Page from 'components/layout/Page';
-import GridLayout, { GridRow, GridColumn } from 'components/layout/GridLayout';
 import RealtimeChart from 'components/metrics/RealtimeChart';
 import RealtimeLog from 'components/metrics/RealtimeLog';
 import RealtimeHeader from 'components/metrics/RealtimeHeader';
@@ -129,29 +129,27 @@ export default function RealtimeDashboard() {
       <div className={styles.chart}>
         <RealtimeChart data={realtimeData} unit="minute" records={REALTIME_RANGE} />
       </div>
-      <GridLayout>
-        <GridRow>
-          <GridColumn xs={12} lg={4}>
-            <RealtimeViews websiteId={websiteId} data={realtimeData} websites={websites} />
-          </GridColumn>
-          <GridColumn xs={12} lg={8}>
-            <RealtimeLog websiteId={websiteId} data={realtimeData} websites={websites} />
-          </GridColumn>
-        </GridRow>
-        <GridRow>
-          <GridColumn xs={12} lg={4}>
-            <DataTable
-              title={<FormattedMessage id="metrics.countries" defaultMessage="Countries" />}
-              metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
-              data={countries}
-              renderLabel={renderCountryName}
-            />
-          </GridColumn>
-          <GridColumn xs={12} lg={8}>
-            <WorldMap data={countries} />
-          </GridColumn>
-        </GridRow>
-      </GridLayout>
+      <Row>
+        <Column xs={12} lg={4}>
+          <RealtimeViews websiteId={websiteId} data={realtimeData} websites={websites} />
+        </Column>
+        <Column xs={12} lg={8}>
+          <RealtimeLog websiteId={websiteId} data={realtimeData} websites={websites} />
+        </Column>
+      </Row>
+      <Row>
+        <Column xs={12} lg={4}>
+          <DataTable
+            title={<FormattedMessage id="metrics.countries" defaultMessage="Countries" />}
+            metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
+            data={countries}
+            renderLabel={renderCountryName}
+          />
+        </Column>
+        <Column xs={12} lg={8}>
+          <WorldMap data={countries} />
+        </Column>
+      </Row>
     </Page>
   );
 }