diff --git a/pkg/ui/src/index.tsx b/pkg/ui/src/index.tsx
index 8ece84c0a458..5e7eba399aff 100644
--- a/pkg/ui/src/index.tsx
+++ b/pkg/ui/src/index.tsx
@@ -17,7 +17,7 @@ protobuf.configure();
 import React from "react";
 import * as ReactDOM from "react-dom";
 import { Provider } from "react-redux";
-import { Router, Route, IndexRoute, IndexRedirect } from "react-router";
+import { Router, Route, IndexRoute, IndexRedirect, Redirect } from "react-router";
 
 import {
   tableNameAttr, databaseNameAttr, nodeIDAttr, dashboardNameAttr, rangeIDAttr,
@@ -71,36 +71,70 @@ ReactDOM.render(
     <Router history={history}>
       <Route path="/" component={Layout}>
         <IndexRedirect to="overview" />
+
+        { /* overview page */ }
         <Route path="overview">
-          <IndexRoute component={ClusterOverview} />
+          <IndexRoute component={ ClusterOverview } />
         </Route>
-        <Route path="cluster">
-          <IndexRedirect to="all/overview" />
-          <Route path={`all/:${dashboardNameAttr}`} component={NodeGraphs} />
-          <Route path={ `node/:${nodeIDAttr}/:${dashboardNameAttr}` } component={NodeGraphs} />
-          <Route path="nodes">
-            <IndexRoute component={NodesOverview} />
-            <Route path={`:${nodeIDAttr}`}>
-              <IndexRoute component={NodeOverview} />
-              <Route path="logs" component={ NodeLogs } />
+
+        { /* time series metrics */ }
+        <Route path="metrics">
+          <IndexRedirect to="overview/cluster" />
+          <Route path={ `:${dashboardNameAttr}` }>
+            <IndexRedirect to="cluster" />
+            <Route path="cluster" component={ NodeGraphs } />
+            <Route path="node">
+              <IndexRedirect to={ `/metrics/:${dashboardNameAttr}/cluster` } />
+              <Route path={ `:${nodeIDAttr}` } component={ NodeGraphs } />
             </Route>
           </Route>
-          <Route path="events" component={ EventPage } />
         </Route>
+
+        { /* node details */ }
+        <Route path="nodes">
+          <IndexRoute component={ NodesOverview } />
+        </Route>
+        <Route path="node">
+          <IndexRedirect to="/nodes" />
+          <Route path={ `:${nodeIDAttr}` }>
+            <IndexRoute component={ NodeOverview } />
+            <Route path="logs" component={ NodeLogs } />
+          </Route>
+        </Route>
+
+        { /* events & jobs */ }
+        <Route path="events" component={ EventPage } />
+        <Route path="jobs" component={ JobsPage } />
+
+        { /* databases */ }
         <Route path="databases">
           <IndexRedirect to="tables" />
           <Route path="tables" component={ DatabaseTablesList } />
           <Route path="grants" component={ DatabaseGrantsList } />
-          <Route path={ `database/:${databaseNameAttr}/table/:${tableNameAttr}` } component={ TableDetails } />
+          <Redirect
+            from={ `database/:${databaseNameAttr}/table/:${tableNameAttr}` }
+            to={ `/database/:${databaseNameAttr}/table/:${tableNameAttr}` }
+          />
         </Route>
-        <Route path="jobs" component={ JobsPage } />
+        <Route path="database">
+          <IndexRedirect to="/databases" />
+          <Route path={ `:${databaseNameAttr}` }>
+            <IndexRedirect to="/databases" />
+            <Route path="table">
+              <IndexRedirect to="/databases" />
+              <Route path={ `:${tableNameAttr}` } component={ TableDetails } />
+            </Route>
+          </Route>
+        </Route>
+
+        { /* debug pages */ }
+        <Route path="debug" component={ Debug } />
         <Route path="raft" component={ Raft }>
           <IndexRedirect to="ranges" />
           <Route path="ranges" component={ RaftRanges } />
           <Route path="messages/all" component={ RaftMessages } />
           <Route path={`messages/node/:${nodeIDAttr}`} component={ RaftMessages } />
         </Route>
-        <Route path="debug" component={ Debug } />
         <Route path="reports">
           <Route path="problemranges" component={ ProblemRanges }>
             <Route path={`:${nodeIDAttr}`} component={ ProblemRanges }/>
@@ -112,7 +146,32 @@ ReactDOM.render(
           <Route path={`range/:${rangeIDAttr}`} component={ Range } />
           <Route path={`range/:${rangeIDAttr}/cmdqueue`} component={ CommandQueue } />
         </Route>
+
+        { /* old route redirects */ }
+        <Route path="cluster">
+          <IndexRedirect to="/metrics/overview/cluster" />
+          <Redirect
+            from={`all/:${dashboardNameAttr}`}
+            to={ `/metrics/:${dashboardNameAttr}/cluster` }
+          />
+          <Redirect
+            from={ `node/:${nodeIDAttr}/:${dashboardNameAttr}` }
+            to={ `/metrics/:${dashboardNameAttr}/node/:${nodeIDAttr}` }
+          />
+          <Route path="nodes">
+            <IndexRedirect to="/nodes" />
+            <Route path={`:${nodeIDAttr}`}>
+              <IndexRedirect to={ `/node/:${nodeIDAttr}` } />
+              <Redirect from="logs" to={ `/node/:${nodeIDAttr}/logs` } />
+            </Route>
+          </Route>
+          <Redirect from="events" to="/events" />
+        </Route>
+
+        { /* temporary clusterviz location */ }
         { visualizationRoutes() }
+
+        { /* 404 */ }
         <Route path="*" component={ NotFound } />
       </Route>
     </Router>
diff --git a/pkg/ui/src/redux/analytics.ts b/pkg/ui/src/redux/analytics.ts
index f3ae538f7e2f..50fff10b4c70 100644
--- a/pkg/ui/src/redux/analytics.ts
+++ b/pkg/ui/src/redux/analytics.ts
@@ -21,6 +21,11 @@ const defaultRedactions = [
         match: new RegExp("/databases/database/.*/table/.*"),
         replace: "/databases/database/[db]/table/[tbl]",
     },
+    // The new URL for a database page.
+    {
+        match: new RegExp("/database/.*/table/.*"),
+        replace: "/database/[db]/table/[tbl]",
+    },
 ];
 
 /**
diff --git a/pkg/ui/src/views/app/components/layoutSidebar/index.tsx b/pkg/ui/src/views/app/components/layoutSidebar/index.tsx
index 35d92da9a2fe..defcaa6860af 100644
--- a/pkg/ui/src/views/app/components/layoutSidebar/index.tsx
+++ b/pkg/ui/src/views/app/components/layoutSidebar/index.tsx
@@ -50,7 +50,7 @@ export default class extends React.Component<{}, {}> {
     return <nav className="navigation-bar">
       <ul className="navigation-bar__list">
         <IconLink to="/overview" icon={homeIcon} title="Overview" />
-        <IconLink to="/cluster" icon={metricsIcon} title="Cluster" />
+        <IconLink to="/metrics" icon={metricsIcon} title="Metrics" />
         <IconLink to="/databases" icon={databasesIcon} title="Databases"/>
         <IconLink to="/jobs" icon={jobsIcon} title="Jobs"/>
       </ul>
diff --git a/pkg/ui/src/views/cluster/containers/events/index.tsx b/pkg/ui/src/views/cluster/containers/events/index.tsx
index 0ff99a59c4fa..ef1b4c725264 100644
--- a/pkg/ui/src/views/cluster/containers/events/index.tsx
+++ b/pkg/ui/src/views/cluster/containers/events/index.tsx
@@ -95,7 +95,7 @@ export class EventBoxUnconnected extends React.Component<EventBoxProps, {}> {
             return <EventRow event={e} key={i} />;
           })}
           <tr>
-            <td className="events__more-link" colSpan={2}><Link to="/cluster/events">View all events</Link></td>
+            <td className="events__more-link" colSpan={2}><Link to="/events">View all events</Link></td>
           </tr>
         </tbody>
       </table>
@@ -135,7 +135,7 @@ export class EventPageUnconnected extends React.Component<EventPageProps, {}> {
         // page, when it should link back to the dashboard previously visible.
       }
       <section className="section parent-link">
-        <Link to="/cluster">&lt; Back to Cluster</Link>
+        <Link to="/">&lt; Back to Cluster</Link>
       </section>
       <section className="section section--heading">
         <h2>Events</h2>
diff --git a/pkg/ui/src/views/cluster/containers/nodeGraphs/index.tsx b/pkg/ui/src/views/cluster/containers/nodeGraphs/index.tsx
index d5026f7d1cc1..adc22a45113d 100644
--- a/pkg/ui/src/views/cluster/containers/nodeGraphs/index.tsx
+++ b/pkg/ui/src/views/cluster/containers/nodeGraphs/index.tsx
@@ -119,9 +119,9 @@ class NodeGraphs extends React.Component<NodeGraphsProps, {}> {
 
   setClusterPath(nodeID: string, dashboardName: string) {
     if (!_.isString(nodeID) || nodeID === "") {
-      this.context.router.push(`/cluster/all/${dashboardName}`);
+      this.context.router.push(`/metrics/${dashboardName}/cluster`);
     } else {
-      this.context.router.push(`/cluster/node/${nodeID}/${dashboardName}`);
+      this.context.router.push(`/metrics/${dashboardName}/node/${nodeID}`);
     }
   }
 
diff --git a/pkg/ui/src/views/cluster/containers/nodeGraphs/summaryBar.tsx b/pkg/ui/src/views/cluster/containers/nodeGraphs/summaryBar.tsx
index bc6875353cdc..c0dabb0c68b3 100644
--- a/pkg/ui/src/views/cluster/containers/nodeGraphs/summaryBar.tsx
+++ b/pkg/ui/src/views/cluster/containers/nodeGraphs/summaryBar.tsx
@@ -39,7 +39,7 @@ function ClusterNodeTotals (props: ClusterSummaryProps) {
   return (
     <SummaryStat
       title={
-        <span>Total Nodes <Link to="/cluster/nodes">View nodes list</Link></span>
+        <span>Total Nodes <Link to="/nodes">View nodes list</Link></span>
       }
       value={nodeCounts.total}
     >
diff --git a/pkg/ui/src/views/cluster/containers/nodeLogs/index.tsx b/pkg/ui/src/views/cluster/containers/nodeLogs/index.tsx
index bec7140294c4..9baf244e5c1c 100644
--- a/pkg/ui/src/views/cluster/containers/nodeLogs/index.tsx
+++ b/pkg/ui/src/views/cluster/containers/nodeLogs/index.tsx
@@ -65,7 +65,7 @@ class Logs extends React.Component<LogProps & RouterState, {}> {
     return (
       <div>
         <section className="section parent-link">
-          <Link to="/cluster/nodes">&lt; Back to Node List</Link>
+          <Link to="/nodes">&lt; Back to Node List</Link>
         </section>
         <div className="section section--heading">
           <h2>Logs Node { this.props.params[nodeIDAttr] } / { nodeAddress }</h2>
diff --git a/pkg/ui/src/views/cluster/containers/nodeOverview/index.tsx b/pkg/ui/src/views/cluster/containers/nodeOverview/index.tsx
index 88c608b21ac9..7c5517173ad8 100644
--- a/pkg/ui/src/views/cluster/containers/nodeOverview/index.tsx
+++ b/pkg/ui/src/views/cluster/containers/nodeOverview/index.tsx
@@ -56,7 +56,7 @@ class NodeOverview extends React.Component<NodeOverviewProps, {}> {
     return (
       <div>
         <section className="section parent-link">
-          <Link to="/cluster/nodes">&lt; Back to Node List</Link>
+          <Link to="/nodes">&lt; Back to Node List</Link>
         </section>
         <div className="section section--heading">
           <h2>{`Node ${node.desc.node_id} / ${node.desc.address.address_field}`}</h2>
@@ -135,7 +135,7 @@ class NodeOverview extends React.Component<NodeOverviewProps, {}> {
               <SummaryValue title="Build" value={node.build_info.tag} />
               <SummaryValue
                 title="Logs"
-                value={<Link to={`/cluster/nodes/${node.desc.node_id}/logs`}>View Logs</Link>}
+                value={<Link to={`/node/${node.desc.node_id}/logs`}>View Logs</Link>}
                 classModifier="link"
               />
             </SummaryBar>
diff --git a/pkg/ui/src/views/cluster/containers/nodesOverview/index.tsx b/pkg/ui/src/views/cluster/containers/nodesOverview/index.tsx
index cabcef3ca373..58b819dcbdb3 100644
--- a/pkg/ui/src/views/cluster/containers/nodesOverview/index.tsx
+++ b/pkg/ui/src/views/cluster/containers/nodesOverview/index.tsx
@@ -98,7 +98,7 @@ class LiveNodeList extends React.Component<NodeCategoryListProps, {}> {
                 return (
                   <div className="sort-table__unbounded-column">
                     <div className={"icon-circle-filled node-status-icon node-status-icon--" + s} title={tooltip} />
-                    <Link to={`/cluster/nodes/${ns.desc.node_id}`}>{ns.desc.address.address_field}</Link>
+                    <Link to={`/node/${ns.desc.node_id}`}>{ns.desc.address.address_field}</Link>
                   </div>
                 );
               },
@@ -145,7 +145,7 @@ class LiveNodeList extends React.Component<NodeCategoryListProps, {}> {
             // Logs - a link to the logs data for this node.
             {
               title: "Logs",
-              cell: (ns) => <Link to={`/cluster/nodes/${ns.desc.node_id}/logs`}>Logs</Link>,
+              cell: (ns) => <Link to={`/node/${ns.desc.node_id}/logs`}>Logs</Link>,
               className: "expand-link",
             },
           ]} />
@@ -205,7 +205,7 @@ class NotLiveNodeList extends React.Component<NotLiveNodeListProps, {}> {
                         "'server.time_until_store_dead'"
                       }
                     />
-                    <Link to={`/cluster/nodes/${ns.desc.node_id}`}>{ns.desc.address.address_field}</Link>
+                    <Link to={`/node/${ns.desc.node_id}`}>{ns.desc.address.address_field}</Link>
                   </div>
                 );
               },
@@ -390,7 +390,7 @@ function NodesPage() {
   return (
     <div>
       <section className="section parent-link">
-        <Link to="/cluster">&lt; Back to Cluster</Link>
+        <Link to="/">&lt; Back to Cluster</Link>
       </section>
       <NodesMainConnected />
     </div>
diff --git a/pkg/ui/src/views/databases/containers/databaseTables/index.tsx b/pkg/ui/src/views/databases/containers/databaseTables/index.tsx
index 6119334e8d7d..83133d634b48 100644
--- a/pkg/ui/src/views/databases/containers/databaseTables/index.tsx
+++ b/pkg/ui/src/views/databases/containers/databaseTables/index.tsx
@@ -72,7 +72,7 @@ class DatabaseSummaryTables extends DatabaseSummaryBase {
                         cell: (tableInfo) => {
                           return (
                             <div className="sort-table__unbounded-column">
-                              <Link to={`/databases/database/${dbID}/table/${tableInfo.name}`}>{tableInfo.name}</Link>
+                              <Link to={`/database/${dbID}/table/${tableInfo.name}`}>{tableInfo.name}</Link>
                             </div>
                           );
                         },
diff --git a/pkg/ui/src/views/devtools/containers/raftRanges/index.tsx b/pkg/ui/src/views/devtools/containers/raftRanges/index.tsx
index be7a3743b312..700780e8b0c9 100644
--- a/pkg/ui/src/views/devtools/containers/raftRanges/index.tsx
+++ b/pkg/ui/src/views/devtools/containers/raftRanges/index.tsx
@@ -148,7 +148,7 @@ class RangesMain extends React.Component<RangesMainProps, RangesMainState> {
         nodeIDIndex[id] = i + 1;
         columns.push((
           <th key={i}>
-            <Link className="debug-link" to={"/cluster/nodes/" + id}>Node {id}</Link>
+            <Link className="debug-link" to={"/nodes/" + id}>Node {id}</Link>
           </th>
         ));
       });