--- a/integration/template.html	Tue May 21 17:41:57 2013 +0200
+++ b/integration/template.html	Wed May 22 17:09:59 2013 +0200
@@ -185,10 +185,10 @@
 <script id="tpl-chapter-row" type="text/html">
 <tr id="row-list-chapter-{{id}}" style="background-color : {{color}};">
 	<td class="list-chapter-title">{{title}}</td>
-	<td class="list-chapter-tags">{{tags}}</td>
-	<td>{{beginString}}</td>
-	<td>{{durationString}}</td>
-	<td>{{endString}}</td>
+	<td class="list-chapter-tags">{{keywords}}</td>
+	<td class="begin">{{begin}}</td>
+	<td class="duration">{{getDuration}}</td>
+	<td class="end">{{end}}</td>
 	<td>
 		<table>
 			<tr>
@@ -209,14 +209,9 @@
 	<div class="row">
 		<div class="span3 text-right">
 			<input name="title" type="text" value="{{title}}">
-			<input name="tags" type="text" class="tag-it" value="{{tags}}">
+			<input name="keywords" type="text" class="tag-it" value="{{keywords}}">
 		</div>
 		<div class="span3">
-		<!--
-			<input type="hidden" name="begin" value="{{begin}}">
-			<input type="hidden" name="duration" value="{{duration}}">
-			<input type="hidden" name="end" value="{{end}}">
-		-->
 			<table class="table text-right">
 				<thead>
 					<tr>
@@ -227,9 +222,9 @@
 				</thead>
 				<tbody>
 					<tr>
-						<td class="span1 begin time-tangle">{{beginString}}</td>
-						<td class="span1 duration">{{durationString}}</td>
-						<td class="span1 end">{{endString}}</td>
+						<td class="span1"><span {{#beginTangle}}class="time-tangle tangle-start begin" data-milliseconds="{{begin.milliseconds}}"{{/beginTangle}}>{{begin}}</span></td>
+						<td class="span1"><span>{{getDuration}}</span></td>
+						<td class="span1"><span {{#endTangle}}class="time-tangle tangle-end end" data-milliseconds="{{end.milliseconds}}"{{/endTangle}}>{{end}}</span></td>
 					</tr>
 				</tbody>
 			</table>