diff --git a/frontend/app/components/Dashboard/Widgets/SlowestImages/SlowestImages.js b/frontend/app/components/Dashboard/Widgets/SlowestImages/SlowestImages.js
index 670cbf524..fe48ceb81 100644
--- a/frontend/app/components/Dashboard/Widgets/SlowestImages/SlowestImages.js
+++ b/frontend/app/components/Dashboard/Widgets/SlowestImages/SlowestImages.js
@@ -35,7 +35,7 @@ const cols = [
 @widgetHOC('slowestImages', { fitContent: true })
 export default class SlowestImages extends React.PureComponent {
   render() {
-    const { data: images, loading, isTemplate } = this.props;
+    const { data: images, loading } = this.props;
     return (
       <Loader loading={ loading } size="small">
         <NoContent
@@ -45,7 +45,6 @@ export default class SlowestImages extends React.PureComponent {
           <Table
             cols={ cols }
             rows={ images }
-            isTemplate={isTemplate}
           />
         </NoContent>
       </Loader>
diff --git a/frontend/app/components/Dashboard/components/DashboardView/DashboardView.tsx b/frontend/app/components/Dashboard/components/DashboardView/DashboardView.tsx
index 17571d57c..c03eac211 100644
--- a/frontend/app/components/Dashboard/components/DashboardView/DashboardView.tsx
+++ b/frontend/app/components/Dashboard/components/DashboardView/DashboardView.tsx
@@ -91,11 +91,10 @@ function DashboardView(props: Props) {
                         focusTitle={focusTitle}
                     />
                     <div className="flex items-center mb-4 justify-between">
-                        <div className="flex items-center" style={{ flex: 4 }}>
+                        <div className="flex items-center" style={{ flex: 3 }}>
                             <PageTitle
                                 title={dashboard?.name}
                                 className="mr-3"
-                                subTitle={dashboard?.description}
                                 actionButton={
                                     <Button primary size="small" onClick={onAddWidgets}>Add Metric</Button>
                                 }
@@ -125,6 +124,9 @@ function DashboardView(props: Props) {
                             </div>
                         </div>
                     </div>
+                    <div>
+                        <h2 className="my-4 font-normal color-gray-dark">{dashboard?.description}</h2>
+                    </div>
                     <DashboardWidgetGrid
                         siteId={siteId}
                         dashboardId={dashboardId}
diff --git a/frontend/app/components/Dashboard/components/WidgetWrapper/TemplateOverlay.tsx b/frontend/app/components/Dashboard/components/WidgetWrapper/TemplateOverlay.tsx
index f1b6b6c70..0c965454a 100644
--- a/frontend/app/components/Dashboard/components/WidgetWrapper/TemplateOverlay.tsx
+++ b/frontend/app/components/Dashboard/components/WidgetWrapper/TemplateOverlay.tsx
@@ -4,10 +4,11 @@ import stl from './widgetWrapper.css';
 
 interface IProps {
     isTemplate?: boolean;
+    onClick: () => void;
 }
 function TemplateOverlay(props: IProps) {
     return (
-        <div className={cn('absolute cursor-pointer z-10', stl.overlay, { [stl.overlayDashboard]: !props.isTemplate } )} />
+        <div onClick={props.onClick} className={cn('absolute cursor-pointer z-10', stl.overlay, { [stl.overlayDashboard]: !props.isTemplate } )} />
     );
 }
 
diff --git a/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapper.tsx b/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapper.tsx
index 26c4019d3..2afd8320a 100644
--- a/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapper.tsx
+++ b/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapper.tsx
@@ -73,8 +73,6 @@ function WidgetWrapper(props: Props) {
 
     const addOverlay = isTemplate || !isPredefined
 
-    console.log(widget, isTemplate, addOverlay)
-
     return useObserver(() => (
             <div
                 className={
@@ -108,7 +106,7 @@ function WidgetWrapper(props: Props) {
                     flip={["top"]}
                     html={<span>Click to select</span>}
                 >
-                    {addOverlay && <TemplateOverlay isTemplate={isTemplate} />}
+                    {addOverlay && <TemplateOverlay onClick={onChartClick} isTemplate={isTemplate} />}
                     <div
                         className={cn("p-3 flex items-center justify-between", { "cursor-move" : !isTemplate })}
                     >