diff --git a/src/app/controllers/dash.js b/src/app/controllers/dash.js
index 11bd9c66cf0..44e5d47c339 100644
--- a/src/app/controllers/dash.js
+++ b/src/app/controllers/dash.js
@@ -14,6 +14,7 @@ function (angular, $, config, _) {
     $scope, $rootScope, dashboardKeybindings, filterSrv, dashboard, panelMoveSrv, timer) {
 
     $scope.editor = { index: 0 };
+    $scope.panelNames = config.panels;
 
     $scope.init = function() {
       $scope.availablePanels = config.panels;
diff --git a/src/app/panels/text/module.html b/src/app/panels/text/module.html
index 69582b72881..5fd3733cb50 100644
--- a/src/app/panels/text/module.html
+++ b/src/app/panels/text/module.html
@@ -1,4 +1,4 @@
-<div ng-controller='text' ng-init="init()" style="min-height:{{panel.height || row.height}}" ng-dblclick="openEditor()">
+<div ng-controller='text' ng-init="init()" style="min-height:{{panel.height || row.height}}">
   <p ng-bind-html="content">
   </p>
 </div>
diff --git a/src/app/panels/timepicker/editor.html b/src/app/panels/timepicker/editor.html
index 8d87cb48e5c..c72fc023261 100644
--- a/src/app/panels/timepicker/editor.html
+++ b/src/app/panels/timepicker/editor.html
@@ -8,5 +8,11 @@
         <label class="small">Auto-refresh options <small>comma seperated</small></label>
         <input type="text" array-join class="input-xlarge" ng-model="panel.refresh_intervals">
       </div>
+
+      <p>
+        <br>
+        <i class="icon-info-sign"></i>
+        For these changes to fully take effect save and reload the dashboard.
+      </i>
     </div>
   </div>
diff --git a/src/app/panels/timepicker/module.html b/src/app/panels/timepicker/module.html
index 5c6513bf666..10b4fdc7408 100644
--- a/src/app/panels/timepicker/module.html
+++ b/src/app/panels/timepicker/module.html
@@ -31,16 +31,20 @@
 
         <ul class="dropdown-menu">
           <!-- Relative time options -->
-          <li ng-repeat='timespan in panel.time_options track by $index'>
-            <a ng-click="setRelativeFilter(timespan)">Last {{timespan}}</a>
+          <li bindonce ng-repeat='timespan in panel.time_options track by $index'>
+            <a ng-click="setRelativeFilter(timespan)" bo-text="'Last ' + timespan"></a>
           </li>
 
           <!-- Auto refresh submenu -->
           <li class="dropdown-submenu">
             <a href="#">Auto-Refresh</a>
             <ul class="dropdown-menu">
-              <li><a ng-click="dashboard.set_interval(false)">Off</a></li>
-              <li ng-repeat="interval in panel.refresh_intervals track by $index"><a ng-click="dashboard.set_interval(interval)">Every {{interval}}</a></li>
+              <li>
+                <a ng-click="dashboard.set_interval(false)">Off</a>
+              </li>
+              <li bindonce ng-repeat="interval in panel.refresh_intervals track by $index">
+                <a ng-click="dashboard.set_interval(interval)" bo-text="'Every ' + interval"></a>
+              </li>
             </ul>
           </li>
           <li><a ng-click="customTime()">Custom</a></li>
diff --git a/src/app/partials/dashboard.html b/src/app/partials/dashboard.html
index 2fbf6ac4d08..a42a1c67e19 100644
--- a/src/app/partials/dashboard.html
+++ b/src/app/partials/dashboard.html
@@ -53,8 +53,9 @@
                     <li class="dropdown-submenu">
                     <a href="javascript:void(0);">Add Panel</a>
                       <ul class="dropdown-menu">
-                      <li><a ng-click="add_panel_default('graph')">Graph</a></li>
-                      <li><a ng-click="add_panel_default('text')">Text</a></li>
+												<li bindonce ng-repeat="name in panelNames">
+													<a ng-click="add_panel_default(name)" bo-text="name"></a>
+												</li>
                       </ul>
                     </li>
                     <li class="dropdown-submenu">