diff --git a/src/app/controllers/loginCtrl.js b/src/app/controllers/loginCtrl.js
index 4feb2125404..1afa133235d 100644
--- a/src/app/controllers/loginCtrl.js
+++ b/src/app/controllers/loginCtrl.js
@@ -89,7 +89,6 @@ function (angular, config) {
 
       backendSrv.post('/login', $scope.formModel).then(function(result) {
         if (result.redirectUrl) {
-          console.log(result);
           window.location.href = result.redirectUrl;
         } else {
           window.location.href = config.appSubUrl + '/';
diff --git a/src/app/features/dashboard/all.js b/src/app/features/dashboard/all.js
index 37fe5c10bc4..8433ecc54ce 100644
--- a/src/app/features/dashboard/all.js
+++ b/src/app/features/dashboard/all.js
@@ -9,7 +9,6 @@ define([
   './keybindings',
   './viewStateSrv',
   './playlistSrv',
-  './soloPanelCtrl',
   './timeSrv',
   './unsavedChangesSrv',
 ], function () {});
diff --git a/src/app/features/panel/all.js b/src/app/features/panel/all.js
index 74b7badfbcc..31a91294964 100644
--- a/src/app/features/panel/all.js
+++ b/src/app/features/panel/all.js
@@ -2,4 +2,5 @@ define([
   './panelMenu',
   './panelDirective',
   './panelSrv',
+  './soloPanelCtrl',
 ], function () {});
diff --git a/src/app/features/dashboard/partials/panelTime.html b/src/app/features/panel/partials/panelTime.html
similarity index 100%
rename from src/app/features/dashboard/partials/panelTime.html
rename to src/app/features/panel/partials/panelTime.html
diff --git a/src/app/partials/solo-panel.html b/src/app/features/panel/partials/soloPanel.html
similarity index 73%
rename from src/app/partials/solo-panel.html
rename to src/app/features/panel/partials/soloPanel.html
index 64ea59e6c26..b040bf8dc72 100644
--- a/src/app/partials/solo-panel.html
+++ b/src/app/features/panel/partials/soloPanel.html
@@ -2,7 +2,7 @@
 	<div class="row-fluid">
 		<div class="span12">
 			<div class="panel nospace" ng-if="panel" style="width: 100%">
-				<grafana-panel type="panel.type" ng-cloak></kibana-panel>
+				<panel-loader type="panel.type" ng-cloak></panel-loader>
 			</div>
 		</div>
 </div>
diff --git a/src/app/features/dashboard/soloPanelCtrl.js b/src/app/features/panel/soloPanelCtrl.js
similarity index 88%
rename from src/app/features/dashboard/soloPanelCtrl.js
rename to src/app/features/panel/soloPanelCtrl.js
index 3e7efa5e28c..a9c95af56c6 100644
--- a/src/app/features/dashboard/soloPanelCtrl.js
+++ b/src/app/features/panel/soloPanelCtrl.js
@@ -16,15 +16,15 @@ function (angular, $) {
       panelId = parseInt(params.panelId);
 
       db.getDashboard($routeParams.id, false)
-        .then(function(dashboardData) {
-          $scope.initPanelScope(dashboardData);
+        .then(function(dashboard) {
+          $scope.initPanelScope(dashboard);
         }).then(null, function(error) {
           $scope.appEvent('alert-error', ['Load panel error', error]);
         });
     };
 
-    $scope.initPanelScope = function(dashboardData) {
-      $scope.dashboard = dashboardSrv.create(dashboardData);
+    $scope.initPanelScope = function(dashboard) {
+      $scope.dashboard = dashboardSrv.create(dashboard.model);
       $scope.grafana.style = $scope.dashboard.style;
       $scope.row = {
         height: $(window).height() + 'px',
diff --git a/src/app/panels/graph/module.js b/src/app/panels/graph/module.js
index 2c8f78f6f3b..0361633a9f7 100644
--- a/src/app/panels/graph/module.js
+++ b/src/app/panels/graph/module.js
@@ -34,7 +34,7 @@ function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) {
 
     $scope.panelMeta.addEditorTab('Axes & Grid', 'app/panels/graph/axisEditor.html');
     $scope.panelMeta.addEditorTab('Display Styles', 'app/panels/graph/styleEditor.html');
-    $scope.panelMeta.addEditorTab('Time range', 'app/features/dashboard/partials/panelTime.html');
+    $scope.panelMeta.addEditorTab('Time range', 'app/features/panel/partials/panelTime.html');
 
     $scope.panelMeta.addExtendedMenuItem('Export CSV', '', 'exportCsv()');
     $scope.panelMeta.addExtendedMenuItem('Toggle legend', '', 'toggleLegend()');
diff --git a/src/app/routes/backend/all.js b/src/app/routes/backend/all.js
index 863be089243..e3e347f63d8 100644
--- a/src/app/routes/backend/all.js
+++ b/src/app/routes/backend/all.js
@@ -67,7 +67,7 @@ define([
         controller : 'LoginCtrl',
       })
       .when('/dashboard/solo/:id/', {
-        templateUrl: 'app/partials/solo-panel.html',
+        templateUrl: 'app/features/panel/partials/soloPanel.html',
         controller : 'SoloPanelCtrl',
       })
       .otherwise({