diff --git a/src/app/components/settings.js b/src/app/components/settings.js
index f21c0826058..bf5f3adcb9f 100644
--- a/src/app/components/settings.js
+++ b/src/app/components/settings.js
@@ -16,9 +16,10 @@ function (_, crypto) {
       datasources                   : {},
       window_title_prefix           : 'Grafana - ',
       panels                        : {
-        'graph': { path: 'panels/graph' },
+        'graph':      { path: 'panels/graph' },
         'singlestat': { path: 'panels/singlestat' },
-        'text': { path: 'panels/text' },
+        'text':       { path: 'panels/text' },
+        'starred':    { path: 'panels/starred', hide: true },
       },
       plugins                       : {},
       default_route                 : '/dashboard/file/default.json',
diff --git a/src/app/panels/starred/module.html b/src/app/panels/starred/module.html
new file mode 100644
index 00000000000..afc74b1e840
--- /dev/null
+++ b/src/app/panels/starred/module.html
@@ -0,0 +1,3 @@
+<grafana-panel>
+	<h2>Starred</h2>
+</grafana-panel>
diff --git a/src/app/panels/starred/module.js b/src/app/panels/starred/module.js
new file mode 100644
index 00000000000..de012a32bcf
--- /dev/null
+++ b/src/app/panels/starred/module.js
@@ -0,0 +1,33 @@
+define([
+  'angular',
+  'app',
+  'components/panelmeta',
+],
+function (angular, app, PanelMeta) {
+  'use strict';
+
+  var module = angular.module('grafana.panels.starred', []);
+  app.useModule(module);
+
+  module.directive('grafanaPanelStarred', function() {
+    return {
+      controller: 'StarredPanelCtrl',
+      templateUrl: 'app/panels/starred/module.html',
+    };
+  });
+
+  module.controller('StarredPanelCtrl', function($scope, panelSrv) {
+
+    $scope.panelMeta = new PanelMeta({
+      panelName: 'Starred',
+      editIcon:  "fa fa-star",
+      fullscreen: true,
+    });
+
+    $scope.init = function() {
+      panelSrv.init($scope);
+    };
+
+    $scope.init();
+  });
+});
diff --git a/src/config.sample.js b/src/config.sample.js
index b1c901c5790..0c11e4007b2 100644
--- a/src/config.sample.js
+++ b/src/config.sample.js
@@ -77,7 +77,7 @@ define(['settings'], function(Settings) {
       },
 
       // default home dashboard
-      default_route: '/dashboard/file/default.json',
+      default_route: 'dashboard/file/default.json',
 
       // set to false to disable unsaved changes warning
       unsaved_changes_warning: true,
diff --git a/src/app/dashboards/default.json b/src/dashboards/default.json
similarity index 100%
rename from src/app/dashboards/default.json
rename to src/dashboards/default.json
diff --git a/src/app/dashboards/empty.json b/src/dashboards/empty.json
similarity index 100%
rename from src/app/dashboards/empty.json
rename to src/dashboards/empty.json
diff --git a/src/dashboards/home.json b/src/dashboards/home.json
new file mode 100644
index 00000000000..c600d1b0f75
--- /dev/null
+++ b/src/dashboards/home.json
@@ -0,0 +1,78 @@
+{
+  "title": "Grafana Home",
+  "tags": [],
+  "style": "dark",
+  "timezone": "browser",
+  "editable": true,
+  "rows": [
+    {
+      "title": "New row",
+      "height": "150px",
+      "collapse": false,
+      "editable": true,
+      "panels": [
+        {
+          "id": 1,
+          "span": 12,
+          "editable": true,
+          "type": "text",
+          "mode": "html",
+          "content": "<div class=\"text-center\" style=\"padding-top: 15px\">\n<img src=\"img/logo_transparent_200x.png\"> \n</div>",
+          "style": {},
+          "title": "Welcome to"
+        }
+      ]
+    },
+    {
+      "height": "210px",
+      "panels": [
+        {
+          "id": 2,
+          "span": 6,
+          "type": "starred",
+          "title": "Starred dashboards"
+        }
+      ]
+    }
+  ],
+  "nav": [
+    {
+      "type": "timepicker",
+      "collapse": false,
+      "enable": true,
+      "status": "Stable",
+      "time_options": [
+        "5m",
+        "15m",
+        "1h",
+        "6h",
+        "12h",
+        "24h",
+        "2d",
+        "7d",
+        "30d"
+      ],
+      "refresh_intervals": [
+        "5s",
+        "10s",
+        "30s",
+        "1m",
+        "5m",
+        "15m",
+        "30m",
+        "1h",
+        "2h",
+        "1d"
+      ],
+      "now": true
+    }
+  ],
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "templating": {
+    "list": []
+  },
+  "version": 5
+}
diff --git a/src/app/dashboards/scripted.js b/src/dashboards/scripted.js
similarity index 100%
rename from src/app/dashboards/scripted.js
rename to src/dashboards/scripted.js
diff --git a/src/app/dashboards/scripted_async.js b/src/dashboards/scripted_async.js
similarity index 100%
rename from src/app/dashboards/scripted_async.js
rename to src/dashboards/scripted_async.js
diff --git a/src/app/dashboards/scripted_gen_and_save.js b/src/dashboards/scripted_gen_and_save.js
similarity index 100%
rename from src/app/dashboards/scripted_gen_and_save.js
rename to src/dashboards/scripted_gen_and_save.js
diff --git a/src/app/dashboards/scripted_templated.js b/src/dashboards/scripted_templated.js
similarity index 100%
rename from src/app/dashboards/scripted_templated.js
rename to src/dashboards/scripted_templated.js
diff --git a/src/app/dashboards/template_vars.json b/src/dashboards/template_vars.json
similarity index 100%
rename from src/app/dashboards/template_vars.json
rename to src/dashboards/template_vars.json