diff --git a/src/html/index.html b/src/html/index.html
index 016a7de..d1a0140 100644
--- a/src/html/index.html
+++ b/src/html/index.html
@@ -148,7 +148,24 @@
         </td>
       </tr>
     </script>
-      
+       
+    <script id="newTmpl" type="text/html">
+      <tr>
+        <td><div class="date"><input type="text" class="input-small" data-bind="value: value_date" data-date-format="yyyy-mm-dd" id="new_value_date"></input></div></td>
+        <td><div class="input-append date"><input type="text" class="input-small" data-bind="value: operation_date" data-date-format="yyyy-mm-dd" id="new_operation_date"></input><button class="btn" type="button" data-bind="click: function(item) { item.operation_date(null)}"><i class="icon-remove"></i></button></div></td>
+        <td><input type="text" class="input-xxlarge" data-bind="value: label"/></td>
+        <td><input type="text" class="input-mini" data-bind="value: value"/></td>
+        <td></td>
+        <td></td>
+        <td><input type="text" class="input-small" data-bind="value: category"/></td>
+        <td class="buttons">
+            <a class="btn btn-mini btn-success" data-bind="click: $root.save" href="#" title="save"><i class="icon-plus"></i></a>
+            <a class="btn btn-mini" data-bind="click: $root.cancel" href="#" title="cancel"><i class="icon-remove"></i></a>
+        </td>
+      </tr>
+    </script>
+
+     
     <script id="editTmpl" type="text/html">
       <tr data-bind="css: { 'error': sold() < 0 }">
         <td><div class="date"><input type="text" class="input-small" data-bind="value: value_date" data-date-format="yyyy-mm-dd" id="value_date"></input></div></td>
@@ -159,8 +176,8 @@
         <td data-bind="text: pointedsold"></td>
         <td><input type="text" class="input-small" data-bind="value: category"/></td>
         <td class="buttons">
-            <a class="btn btn-mini btn-success" data-bind="click: $root.save" href="#" title="save"><i data-bind="css: {'icon-plus': $root.newEntry() === $data, 'icon-ok': $root.newEntry() != $data }"></i></a>
-            <a class="btn btn-mini" data-bind="click: $root.cancel" href="#" title="cancel"><i data-bind="css: {'icon-remove': $root.newEntry() === $data, 'icon-ban-circle': $root.newEntry() != $data }"></i></a>
+            <a class="btn btn-mini btn-success" data-bind="click: $root.save" href="#" title="save"><i class="icon-ok"></i></a>
+            <a class="btn btn-mini" data-bind="click: $root.cancel" href="#" title="cancel"><i class="icon-ban-circle"></i></a>
         </td>
       </tr>
     </script>
diff --git a/src/html/js/entries.js b/src/html/js/entries.js
index e6022f5..5510ff0 100644
--- a/src/html/js/entries.js
+++ b/src/html/js/entries.js
@@ -214,6 +214,16 @@ var ListViewModel = function() {
           var entries = [self.newEntry()].concat(ko.utils.arrayMap($.parseJSON(data), ko.mapping.fromJS));
 
           self.entries(entries);
+
+          // Initialize date picker for value date column.
+          $("#new_value_date").datepicker().on('changeDate', function(ev){
+            self.newEntry().value_date(ev.date.format(ev.currentTarget.dataset.dateFormat));
+          });
+
+          // Initialize date picker for operation date column.
+          $("#new_operation_date").datepicker().on('changeDate', function(ev){
+            self.newEntry().operation_date(ev.date.format(ev.currentTarget.dataset.dateFormat));
+          });
         });
       } else {
         // If no month, just remove all entries.
@@ -293,7 +303,7 @@ var ListViewModel = function() {
 
     // Function to select template in function of selected item.
     self.templateToUse = function (item) {
-      return self.selectedItem() === item || self.newEntry() === item ? 'editTmpl' : 'itemsTmpl';
+      return  self.newEntry() === item ? 'newTmpl' : self.selectedItem() === item ? 'editTmpl' : 'itemsTmpl';
     };
 
     // Function to edit an item