diff --git a/browser/common.py b/browser/common.py
index 6e4534e..4c78a7c 100644
--- a/browser/common.py
+++ b/browser/common.py
@@ -567,6 +567,11 @@ class BaseView(GenericView, I18NView):
         jsCall = 'dojo.require("dijit.form.SimpleTextarea");'
         self.controller.macros.register('js-execute', jsCall, jsCall=jsCall)
 
+    def registerDojoNumberWidget(self):
+        self.registerDojo()
+        jsCall = 'dojo.require("dijit.form.NumberTextBox");'
+        self.controller.macros.register('js-execute', jsCall, jsCall=jsCall)
+
     def registerDojoEditor(self):
         self.registerDojo()
         jsCall = 'dojo.require("dijit.Editor");'
diff --git a/organize/work/browser.py b/organize/work/browser.py
index aa22319..d0df6c3 100644
--- a/organize/work/browser.py
+++ b/organize/work/browser.py
@@ -22,6 +22,7 @@ View class(es) for change tracks.
 $Id$
 """
 
+import time
 from zope import component
 from zope.app.security.interfaces import IAuthentication, PrincipalLookupError
 from zope.cachedescriptors.property import Lazy
@@ -53,6 +54,14 @@ class CreateWorkItemForm(ObjectForm):
     def macro(self):
         return self.template.macros['create_workitem']
 
+    @Lazy
+    def defaultDate(self):
+        return time.strftime('%Y-%m-%d')
+
+    @Lazy
+    def defaultTime(self):
+        return time.strftime('%Y-%m-%dT%H:%M')
+
 
 # actions
 
@@ -61,4 +70,5 @@ actions.register('createWorkitem', 'portlet', DialogAction,
         description=_(u'Create a work item for this object.'),
         viewName='create_workitem.html',
         dialogName='createWorkitem',
+        prerequisites=['registerDojoDateWidget', 'registerDojoNumberWidget'],
 )
diff --git a/organize/work/work_macros.pt b/organize/work/work_macros.pt
index 91c647e..0fb78e5 100644
--- a/organize/work/work_macros.pt
+++ b/organize/work/work_macros.pt
@@ -12,10 +12,48 @@
         <label i18n:translate=""
                for="description">Description</label>
         <div>
-          <textarea name="description" cols="80" rows="6" id="description"
+          <textarea name="description" cols="80" rows="4" id="description"
                     dojoType="dijit.form.SimpleTextarea"
-                    style="width: 60em"></textarea><div>
+                    style="width: 60em"></textarea></div>
       </div>
+      <div>
+        <label i18n:translate=""
+               for="start-end">Start - End</label>
+        <div id="start-end">
+          <input type="text" name="field" style="width: 8em"
+                 dojoType="dijit.form.DateTextBox"
+                 name="start_date" required="true"
+                 tal:attributes="value view/defaultDate" />
+          <input type="text" name="field" style="width: 6em"
+                 dojoType="dijit.form.TimeTextBox"
+                 name="start_time" required="true"
+                 tal:attributes="value view/defaultTime" /> -
+          <input type="text" name="field" style="width: 6em"
+                 dojoType="dijit.form.TimeTextBox"
+                 name="end_time" required="true"
+                 tal:attributes="value view/defaultTime" />
+        </div>
+        <label i18n:translate=""
+               for="duration-effort">Duration / Effort (hh:mm)</label>
+        <div id="duration-effort">
+          <input type="text" style="width: 5em"
+                 dojoType="dijit.form.ValidationTextBox"
+                 regexp="[0-9]{1,2}(:[0-5][0-9]){0,1}"
+                 name="duration" /> /
+          <input type="text" style="width: 5em"
+                 dojoType="dijit.form.ValidationTextBox"
+                 regexp="[0-9]{1,2}(:[0-5][0-9]){0,1}"
+                 name="effort" />
+        </div>
+      <div>
+        <label i18n:translate=""
+               for="comment">Comment</label>
+        <div>
+          <textarea name="comment" cols="80" rows="4" id="comment"
+                    dojoType="dijit.form.SimpleTextarea"
+                    style="width: 60em"></textarea></div>
+      </div>
+      <div>
       <div class="buttons">
         <input value="Save" type="submit"
                onClick="return closeDialog(true)"