diff --git a/panels/timepicker/editor.html b/panels/timepicker/editor.html
new file mode 100644
index 00000000000..c66b1dda710
--- /dev/null
+++ b/panels/timepicker/editor.html
@@ -0,0 +1,38 @@
+  <div class="row-fluid" ng-controller="timepicker">    
+    <div class="span3">
+      <h6>Default Mode</h6>
+      <select style="width:85%" ng-model="panel.mode" ng-options="f for f in ['relative','absolute','since']"></select>
+    </div>
+    <div class="span3">
+      <h6>Time Field</h6>
+      <input type="text" class="input-small" ng-model="panel.timefield" ng-change="get_data()">
+    </div>
+    <div class="span6">
+      <h6>Index pattern <small>Absolutes in double quotes</small></h6>
+      <input type="text" class="input-large" ng-model="panel.index" ng-change="get_data()">
+    </div>
+  </div>
+  <div class="row-fluid">
+    <h5>Relative mode <small>settings</small></h5>  
+    <div class="span8">
+      <h6>Relative time options <small>comma seperated</small></h6>
+      <input type="text" array-join class="input-large" ng-model="panel.time_options" ng-change="get_data()">
+    </div>
+    <div class="span3">
+      <h6>Default timespan</h6>
+      <select class="input-mini" ng-model="panel.timespan" ng-options="f for f in panel.time_options"></select>
+    </div>
+  <div class="row-fluid">
+    <h5>Auto-refresh <small>settings</small></h5>  
+    <div class="span1">
+      <label class="small"> Enable </label><input type="checkbox" ng-model="panel.refresh.enable" ng-checked="panel.refresh.enable">
+    </div>
+    <div class="span2">
+      <label class="small"> Interval (seconds) </label>
+      <input type="number" array-join class="input-mini" ng-model="panel.refresh.interval">
+    </div>
+    <div class="span3">
+      <label class="small"> Minimum Interval (seconds) </label>
+      <input type="number" array-join class="input-mini" ng-model="panel.refresh.min">
+    </div>
+  </div>
\ No newline at end of file
diff --git a/panels/timepicker/module.js b/panels/timepicker/module.js
index 5013cf50c15..2ea10aebaa7 100644
--- a/panels/timepicker/module.js
+++ b/panels/timepicker/module.js
@@ -33,6 +33,7 @@ angular.module('kibana.timepicker', [])
     mode          : "relative",
     time_options  : ['5m','15m','1h','6h','12h','24h','2d','7d','30d'],
     timespan      : '15m',
+    timefield     : '@timestamp',
     index         : '"logstash-"yyyy.mm.dd',
     group         : "default",
     refresh       : {