diff --git a/src/html/index.html b/src/html/index.html
index f109b89..1909a66 100644
--- a/src/html/index.html
+++ b/src/html/index.html
@@ -178,17 +178,26 @@
 
     <!-- Displayed item template -->
     <script id="itemsTmpl" type="text/html">
-      <tr class="form-inline" data-bind="css: { 'warning': sold() < 0 && sold() >= $root.account().authorized_overdraft(), 'error': sold() < $root.account().authorized_overdraft() }">
+      <tr data-bind="css: { 'warning': sold() < 0 && sold() >= $root.account().authorized_overdraft(), 'error': sold() < $root.account().authorized_overdraft() }">
         <td data-bind="text: value_date"></td>
+
         <td data-bind="text: operation_date"></td>
+
         <td data-bind="text: label"></td>
+
         <td data-bind="text: value, css: {'text-error': value() < 0 }"></td>
+
         <td data-bind="text: sold, css: {'text-warning': sold() < 0 && sold() >= $root.account().authorized_overdraft(), 'text-error': sold() < $root.account().authorized_overdraft() }"></td>
+
         <td data-bind="text: operation_date() ? pointedsold : '', css: {'text-warning': pointedsold() < 0 && pointedsold() >= $root.account().authorized_overdraft(), 'text-error': pointedsold() < $root.account().authorized_overdraft() }"></td>
+
         <td data-bind="text: category"></td>
-        <td class="buttons">
-          <a class="btn btn-mini" data-bind="click: $root.edit" href="#" title="edit"><i class="icon-edit"></i></a>
-          <a class="btn btn-mini" data-bind="click: $root.remove" href="#" title="remove"><i class="icon-trash"></i></a>
+
+        <td>
+          <div class="btn-group">
+            <a class="btn btn-mini" data-bind="click: $root.edit" href="#" title="edit"><i class="icon-edit"></i></a>
+            <a class="btn btn-mini" data-bind="click: $root.remove" href="#" title="remove"><i class="icon-trash"></i></a>
+          </div>
         </td>
       </tr>
     </script>
@@ -196,16 +205,30 @@
     <!-- New item template -->
     <script id="newTmpl" type="text/html">
       <tr class="form-inline">
-        <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="date" class="input-small" data-bind="value: value_date" data-date-format="yyyy-mm-dd" id="new_value_date"></input></td>
+
+        <td>
+          <div class="input-append">
+            <input type="date" 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><input type="number" class="input-mini" data-bind="value: value"/></td>
+
         <td></td>
+
         <td></td>
+
         <td><input type="text" class="input-small" data-bind="value: category, typeahead: {source: $root.categories }"/></td>
-        <td class="buttons">
+
+        <td>
+          <div class="btn-group">
             <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>
+          </div>
         </td>
       </tr>
     </script>
@@ -213,16 +236,25 @@
     <!-- Edit item template -->
     <script id="editTmpl" type="text/html">
       <tr class="form-inline" data-bind="css: { 'warning': sold() < 0 && sold() >= $root.account().authorized_overdraft(), 'error': sold() < $root.account().authorized_overdraft() }">
-        <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>
-        <td><div class="input-append date"><input type="text" class="input-small" data-bind="value: operation_date" data-date-format="yyyy-mm-dd" id="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="date" class="input-small" data-bind="value: value_date" data-date-format="yyyy-mm-dd" id="value_date"></input></td>
+
+        <td class="input-append"><input type="date" class="input-small" data-bind="value: operation_date" data-date-format="yyyy-mm-dd" id="operation_date"></input><button class="btn" type="button" data-bind="click: function(item) { item.operation_date(null)}"><i class="icon-remove"></i></button></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><input type="number" class="input-mini" data-bind="value: value"/></td>
+
         <td data-bind="text: sold, css: {'text-warning': sold() < 0 && sold() >= $root.account().authorized_overdraft(), 'text-error': sold() < $root.account().authorized_overdraft() }"></td>
+
         <td data-bind="text: operation_date() ? pointedsold : '', css: {'text-warning': pointedsold() < 0 && pointedsold() >= $root.account().authorized_overdraft(), 'text-error': pointedsold() < $root.account().authorized_overdraft() }"></td>
+
         <td><input type="text" class="input-small" data-bind="value: category, typeahead: {source: $root.categories }" /></td>
-        <td class="buttons">
+
+        <td class="btn-group">
+          <div class="btn-group">
             <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>
+          </div>
         </td>
       </tr>
     </script>