diff --git a/frontend/app/components/Dashboard/components/Alerts/AlertListItem.tsx b/frontend/app/components/Dashboard/components/Alerts/AlertListItem.tsx
index 1aaf422d7..c1038586b 100644
--- a/frontend/app/components/Dashboard/components/Alerts/AlertListItem.tsx
+++ b/frontend/app/components/Dashboard/components/Alerts/AlertListItem.tsx
@@ -78,7 +78,7 @@ function AlertListItem(props: Props) {
       onClick={onItemClick}
     >
       <div className="grid grid-cols-12 py-4 select-none">
-        <div className="col-span-5 flex items-start">
+        <div className="col-span-8 flex items-start">
           <div className="flex items-center capitalize-first">
             <div className="w-9 h-9 rounded-full bg-tealx-lightest flex items-center justify-center mr-2">
               <Icon name="bell" size="16" color="tealx" />
@@ -91,7 +91,7 @@ function AlertListItem(props: Props) {
             <span>{alert.detectionMethod}</span>
           </div>
         </div>
-        <div className="col-span-5 text-right">
+        <div className="col-span-2 text-right">
           {demo
             ? DateTime.fromMillis(+new Date()).toFormat('LLL dd, yyyy, hh:mm a')
             : checkForRecent(
diff --git a/frontend/app/components/Dashboard/components/Alerts/AlertsList.tsx b/frontend/app/components/Dashboard/components/Alerts/AlertsList.tsx
index 8ac612b2c..54cdf0a4f 100644
--- a/frontend/app/components/Dashboard/components/Alerts/AlertsList.tsx
+++ b/frontend/app/components/Dashboard/components/Alerts/AlertsList.tsx
@@ -44,9 +44,9 @@ function AlertsList({ fetchList, list: alertsList, alertsSearch, siteId, init, f
     >
       <div className="mt-3 border-b">
         <div className="grid grid-cols-12 py-2 font-medium px-6">
-          <div className="col-span-5">Title</div>
+          <div className="col-span-8">Title</div>
           <div className="col-span-2">Type</div>
-          <div className="col-span-5 text-right">Modified</div>
+          <div className="col-span-2 text-right">Modified</div>
         </div>
 
         {sliceListPerPage(list, page - 1, pageSize).map((alert: any) => (
diff --git a/frontend/app/components/Dashboard/components/Alerts/AlertsView.tsx b/frontend/app/components/Dashboard/components/Alerts/AlertsView.tsx
index ed5fa1769..5574cb985 100644
--- a/frontend/app/components/Dashboard/components/Alerts/AlertsView.tsx
+++ b/frontend/app/components/Dashboard/components/Alerts/AlertsView.tsx
@@ -17,10 +17,10 @@ function AlertsView({ siteId, init }: IAlertsView) {
     return (
         <div style={{ maxWidth: '1300px', margin: 'auto'}} className="bg-white rounded py-4 border">
             <div className="flex items-center mb-4 justify-between px-6">
-                <div className="flex items-baseline mr-3">
+                <Link to={withSiteId(alertCreate(), siteId)}><Button variant="primary" onClick={null}>Create</Button></Link>
+                <div className="flex items-baseline ml-3">
                     <PageTitle title="Alerts" />
                 </div>
-                <Link to={withSiteId(alertCreate(), siteId)}><Button variant="primary" onClick={null}>Create</Button></Link>
                 <div className="ml-auto w-1/4" style={{ minWidth: 300 }}>
                     <AlertsSearch />
                 </div>
diff --git a/frontend/app/components/Dashboard/components/DashboardList/DashboardsView.tsx b/frontend/app/components/Dashboard/components/DashboardList/DashboardsView.tsx
index 9acd0bc20..ea30ab345 100644
--- a/frontend/app/components/Dashboard/components/DashboardList/DashboardsView.tsx
+++ b/frontend/app/components/Dashboard/components/DashboardList/DashboardsView.tsx
@@ -23,10 +23,10 @@ function DashboardsView({ history, siteId }: { history: any, siteId: string }) {
     return (
         <div style={{ maxWidth: '1300px', margin: 'auto'}} className="bg-white rounded py-4 border">
             <div className="flex items-center mb-4 justify-between px-6">
-                <div className="flex items-baseline mr-3">
+                <Button variant="primary" onClick={onAddDashboardClick}>Create</Button>
+                <div className="flex items-baseline ml-3">
                     <PageTitle title="Dashboards" />
                 </div>
-                <Button variant="primary" onClick={onAddDashboardClick}>Create Dashboard</Button>
                 <div className="ml-auto w-1/4" style={{ minWidth: 300 }}>
                     <DashboardSearch />
                 </div>
diff --git a/frontend/app/components/Dashboard/components/MetricListItem/MetricListItem.tsx b/frontend/app/components/Dashboard/components/MetricListItem/MetricListItem.tsx
index 72080aa3e..7c8e228c3 100644
--- a/frontend/app/components/Dashboard/components/MetricListItem/MetricListItem.tsx
+++ b/frontend/app/components/Dashboard/components/MetricListItem/MetricListItem.tsx
@@ -46,7 +46,7 @@ function MetricListItem(props: Props) {
     };
     return (
         <div className="grid grid-cols-12 py-4 border-t select-none hover:bg-active-blue cursor-pointer px-6" onClick={onItemClick}>
-            <div className="col-span-3 flex items-start">
+            <div className="col-span-4 flex items-start">
                 <div className="flex items-center">
                     <MetricTypeIcon type={metric.metricType} />
                     <div className="link capitalize-first">
@@ -54,8 +54,8 @@ function MetricListItem(props: Props) {
                     </div>
                 </div>
             </div>
-            <div className="col-span-3">{metric.owner}</div>
-            <div className="col-span-4">
+            <div className="col-span-4">{metric.owner}</div>
+            <div className="col-span-2">
                 <div className="flex items-center">
                     <Icon name={metric.isPublic ? "user-friends" : "person-fill"} className="mr-2" />
                     <span>{metric.isPublic ? 'Team' : 'Private'}</span>
diff --git a/frontend/app/components/Dashboard/components/MetricsList/MetricsList.tsx b/frontend/app/components/Dashboard/components/MetricsList/MetricsList.tsx
index ecf3d4c2c..e6eb66b97 100644
--- a/frontend/app/components/Dashboard/components/MetricsList/MetricsList.tsx
+++ b/frontend/app/components/Dashboard/components/MetricsList/MetricsList.tsx
@@ -40,9 +40,9 @@ function MetricsList({ siteId }: { siteId: string }) {
     >
       <div className="mt-3 border-b rounded bg-white">
         <div className="grid grid-cols-12 py-2 font-medium px-6">
-          <div className="col-span-3">Title</div>
-          <div className="col-span-3">Owner</div>
-          <div className="col-span-4">Visibility</div>
+          <div className="col-span-4">Title</div>
+          <div className="col-span-4">Owner</div>
+          <div className="col-span-2">Visibility</div>
           <div className="col-span-2 text-right">Last Modified</div>
         </div>
 
diff --git a/frontend/app/components/Dashboard/components/MetricsView/MetricsView.tsx b/frontend/app/components/Dashboard/components/MetricsView/MetricsView.tsx
index 64d9ab0cb..216896ee4 100644
--- a/frontend/app/components/Dashboard/components/MetricsView/MetricsView.tsx
+++ b/frontend/app/components/Dashboard/components/MetricsView/MetricsView.tsx
@@ -18,10 +18,10 @@ function MetricsView({ siteId }: Props) {
     return useObserver(() => (
         <div style={{ maxWidth: '1300px', margin: 'auto'}} className="bg-white rounded py-4 border">
             <div className="flex items-center mb-4 justify-between px-6">
-                <div className="flex items-baseline mr-3">
+                <Link to={'/metrics/create'}><Button variant="primary">Create</Button></Link>
+                <div className="flex items-baseline ml-3">
                     <PageTitle title="Metrics" className="" />
                 </div>
-                <Link to={'/metrics/create'}><Button variant="primary">Create Metric</Button></Link>
                 <div className="ml-auto w-1/4" style={{ minWidth: 300 }}>
                     <MetricsSearch />
                 </div>