diff --git a/public/app/core/components/manage_dashboards/manage_dashboards.html b/public/app/core/components/manage_dashboards/manage_dashboards.html
index 4ef2d7c9a66..5ec38555503 100644
--- a/public/app/core/components/manage_dashboards/manage_dashboards.html
+++ b/public/app/core/components/manage_dashboards/manage_dashboards.html
@@ -114,14 +114,14 @@
 </div>
 
 <div ng-if="ctrl.canSave && ctrl.folderId && !ctrl.hasFilters && ctrl.sections.length === 0">
-  <empty-list-cta model="{
-    title: 'This folder doesn\'t have any dashboards yet',
-    buttonIcon: 'gicon gicon-dashboard-new',
-    buttonLink: 'dashboard/new?folderId={{ctrl.folderId}}',
-    buttonTitle: 'Create Dashboard',
-    proTip: 'Add/move dashboards to your folder at ->',
-    proTipLink: 'dashboards',
-    proTipLinkTitle: 'Manage dashboards',
-    proTipTarget: ''
-  }" />
+  <empty-list-cta 
+    title="'This folder doesn\'t have any dashboards yet'"
+    buttonIcon="'gicon gicon-dashboard-new'" 
+    buttonLink="'dashboard/new?folderId={{ctrl.folderId}}'"
+    buttonTitle="'Create Dashboard'"  
+    proTip="'Add/move dashboards to your folder at ->'" 
+    proTipLink="'dashboards'" 
+    proTipLinkTitle="'Manage dashboards'" 
+    proTipTarget=""
+  />
 </div>
diff --git a/public/app/features/alerting/partials/notifications_list.html b/public/app/features/alerting/partials/notifications_list.html
index 81810606123..075d83ef085 100644
--- a/public/app/features/alerting/partials/notifications_list.html
+++ b/public/app/features/alerting/partials/notifications_list.html
@@ -45,15 +45,15 @@
     </table>
   </div>
   <div ng-if="ctrl.notifications.length === 0">
-    <empty-list-cta model="{
-      title: 'There are no notification channels defined yet',
-      buttonIcon: 'gicon gicon-alert-notification-channel',
-      buttonLink: 'alerting/notification/new',
-      buttonTitle: 'Add channel',
-      proTip: 'You can include images in your alert notifications.',
-      proTipLink: 'http://docs.grafana.org/alerting/notifications/',
-      proTipLinkTitle: 'Learn more',
-      proTipTarget: '_blank'
-    }" />
+    <empty-list-cta
+    title= "'There are no notification channels defined yet'"
+    buttonIcon= "'gicon gicon-alert-notification-channel'"
+    buttonLink= "'alerting/notification/new'"
+    buttonTitle= "'Add channel'"
+    proTip= "'You can include images in your alert notifications.'"
+    proTipLink= "'http://docs.grafana.org/alerting/notifications/'"
+    proTipLinkTitle= "'Learn more'"
+    proTipTarget= "'_blank'"
+    />
   </div>
 </div>
diff --git a/public/app/features/playlist/partials/playlists.html b/public/app/features/playlist/partials/playlists.html
index 64b26e86e5b..f3d546b8ec1 100644
--- a/public/app/features/playlist/partials/playlists.html
+++ b/public/app/features/playlist/partials/playlists.html
@@ -53,15 +53,14 @@
     </table>
   </div>
   <div ng-if="ctrl.playlists.length === 0">
-    <empty-list-cta model="{
-      title: 'There are no playlists created yet',
-      buttonIcon: 'fa fa-plus',
-      buttonLink: 'playlists/create',
-      buttonTitle: ' Create Playlist',
-      proTip: 'You can use playlists to cycle dashboards on TVs without user control',
-      proTipLink: 'http://docs.grafana.org/reference/playlist/',
-      proTipLinkTitle: 'Learn more',
-      proTipTarget: '_blank'
-    }" />
+    <empty-list-cta
+      title="'There are no playlists created yet'"
+      buttonIcon="'fa fa-plus'"
+      buttonLink="'playlists/create'"
+      buttonTitle="'Create Playlist'" 
+      proTip="'You can use playlists to cycle dashboards on TVs without user control'"
+      proTipLink="'http://docs.grafana.org/reference/playlist/'" 
+      proTipLinkTitle="'Learn more'"
+      proTipTarget="'_blank'" />
   </div>
 </div>