Index: trunk/grails-app/views/appCore/manager.gsp
===================================================================
--- trunk/grails-app/views/appCore/manager.gsp	(revision 145)
+++ trunk/grails-app/views/appCore/manager.gsp	(revision 147)
@@ -14,16 +14,35 @@
                 <div class="message">${flash.message}</div>
             </g:if>
-            <br />
-            <br />
-            <a href="${createLink(controller:'person', action:'list')}">Manage application users</a>
-            <br />
-            <br />
-<!--            View Entity Relationship Diagram:
-            <a href="${createLink(controller:'classDiagram', action:'model', params:[outputFormat: 'pdf', skin: 'classicSpacey', showMethods: 'false', autoUpdate: 'false'])}">pdf</a>
-            and
-            <a href="${createLink(controller:'classDiagram', action:'legend', target:'_blank')}">legend</a>
-            or
-            <a href="${createLink(controller:'classDiagram', action:'show')}">interactive.</a>-->
-        </div>
+            <div class="dialog">
+                <table>
+                    <tbody>
+
+                        <tr class="prop">
+                            <td valign="top" class="name">
+                                <label>Manage:</label>
+                            </td>
+                            <td valign="top" class="value">
+                                <a href="${createLink(controller:'person', action:'list')}">Application users</a>
+                            </td>
+                        </tr>
+
+                        <tr class="prop">
+                            <td valign="top" class="name">
+                                <label>Entity Relationship Diagram:</label>
+                            </td>
+                            <td valign="top" class="value">
+
+                                <a href="${createLink(controller:'classDiagram', action:'model', params:[outputFormat: 'pdf', skin: 'classicSpaced', showMethods: 'false', autoUpdate: 'false'])}">PDF</a>
+                                <br />
+                                <a href="${createLink(controller:'classDiagram', action:'legend', target:'_blank')}">Legend</a>
+                                <br />
+                                <a href="${createLink(controller:'classDiagram', action:'show')}">Interactive.</a>
+                            </td>
+                        </tr>
+
+                    </tbody>
+                </table>
+            </div> <!--End dialog-->
+        </div> <!--End body-->
     </body>
 </html>
Index: trunk/grails-app/views/appCore/start.gsp
===================================================================
--- trunk/grails-app/views/appCore/start.gsp	(revision 145)
+++ trunk/grails-app/views/appCore/start.gsp	(revision 147)
@@ -89,5 +89,22 @@
                         <br />
                         <br />
-                        Static reports
+                        <div class="dialog">
+                            <table>
+                                <tbody>
+
+                                    <tr class="prop">
+                                        <td valign="top" class="name">
+                                            <label>Static reports:</label>
+                                        </td>
+<!--                                        <td valign="top" class="value">
+                                            <a href="${createLink(action:'changePassword')}"> Password</a>
+                                            <br />
+                                            <a href="${createLink(action:'changeSessionTimeout')}">Session Timeout</a>
+                                        </td>-->
+                                    </tr>
+
+                                </tbody>
+                            </table>
+                        </div> <!--End dialog-->
                     </richui:tabContent>
 <!-- End Reports tab  -->
@@ -97,8 +114,22 @@
                         <br />
                         <br />
-                        <a href="${createLink(action:'changePassword')}">Change Password</a>
-                        <br />
-                        <br />
-                        <a href="${createLink(action:'changeSessionTimeout')}">Change Session Timeout</a>
+                        <div class="dialog">
+                            <table>
+                                <tbody>
+
+                                    <tr class="prop">
+                                        <td valign="top" class="name">
+                                            <label>Change:</label>
+                                        </td>
+                                        <td valign="top" class="value">
+                                            <a href="${createLink(action:'changePassword')}"> Password</a>
+                                            <br />
+                                            <a href="${createLink(action:'changeSessionTimeout')}">Session Timeout</a>
+                                        </td>
+                                    </tr>
+
+                                </tbody>
+                            </table>
+                        </div> <!--End dialog-->
                     </richui:tabContent>
 <!-- End Options tab -->
Index: trunk/grails-app/views/assignedPersonDetailed/create.gsp
===================================================================
--- trunk/grails-app/views/assignedPersonDetailed/create.gsp	(revision 145)
+++ trunk/grails-app/views/assignedPersonDetailed/create.gsp	(revision 147)
@@ -9,9 +9,7 @@
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="list">AssignedPerson List</g:link></span>
+            <h1>Create Assigned Person</h1>
         </div>
         <div class="body">
-            <h1>Create AssignedPerson</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
@@ -48,19 +46,18 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="estimatedHour">Estimated Hour:</label>
+                                    <label for="durationHour">Estimated Duration:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:assignedPersonInstance,field:'estimatedHour','errors')}">
-                                    <input type="text" id="estimatedHour" name="estimatedHour" value="${fieldValue(bean:assignedPersonInstance,field:'estimatedHour')}" />
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="estimatedMinute">Estimated Minute:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assignedPersonInstance,field:'estimatedMinute','errors')}">
-                                    <input type="text" id="estimatedMinute" name="estimatedMinute" value="${fieldValue(bean:assignedPersonInstance,field:'estimatedMinute')}" />
-                                </td>
-                            </tr> 
+
+                                <td valign="top" class="value">
+                                    <input class="time ${hasErrors(bean:assignedPersonInstance,field:'estimatedHour','errors')}" 
+                                        type="text" id="estimatedHour" name="estimatedHour" 
+                                        value="${fieldValue(bean:assignedPersonInstance,field:'estimatedHour')}" />
+                                    :
+                                    <input class="time ${hasErrors(bean:assignedPersonInstance,field:'estimatedMinute','errors')}" 
+                                        type="text" id="estimatedMinute" name="estimatedMinute" 
+                                        value="${fieldValue(bean:assignedPersonInstance,field:'estimatedMinute')}" />
+                                    <g:helpBalloon code="assignedPerson.estimatedDuration" />
+                                </td> 
+                            </tr>
                         
                         </tbody>
Index: trunk/grails-app/views/assignedPersonDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/assignedPersonDetailed/edit.gsp	(revision 145)
+++ trunk/grails-app/views/assignedPersonDetailed/edit.gsp	(revision 147)
@@ -9,10 +9,7 @@
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="list">AssignedPerson List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New AssignedPerson</g:link></span>
+            <h1>Edit Assigned Person</h1>
         </div>
         <div class="body">
-            <h1>Edit AssignedPerson</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
@@ -46,24 +43,22 @@
                                     <g:select optionKey="id" from="${Person.list()}" name="person.id" value="${assignedPersonInstance?.person?.id}" ></g:select>
                                 </td>
-                            </tr> 
-                        
+                            </tr>
+
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="estimatedHour">Estimated Hour:</label>
+                                    <label for="durationHour">Estimated Duration:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:assignedPersonInstance,field:'estimatedHour','errors')}">
-                                    <input type="text" id="estimatedHour" name="estimatedHour" value="${fieldValue(bean:assignedPersonInstance,field:'estimatedHour')}" />
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="estimatedMinute">Estimated Minute:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assignedPersonInstance,field:'estimatedMinute','errors')}">
-                                    <input type="text" id="estimatedMinute" name="estimatedMinute" value="${fieldValue(bean:assignedPersonInstance,field:'estimatedMinute')}" />
-                                </td>
-                            </tr> 
-                        
+                                <td valign="top" class="value">
+                                    <input class="time ${hasErrors(bean:assignedPersonInstance,field:'estimatedHour','errors')}" 
+                                        type="text" id="estimatedHour" name="estimatedHour" 
+                                        value="${fieldValue(bean:assignedPersonInstance,field:'estimatedHour')}" />
+                                    :
+                                    <input class="time ${hasErrors(bean:assignedPersonInstance,field:'estimatedMinute','errors')}" 
+                                        type="text" id="estimatedMinute" name="estimatedMinute" 
+                                        value="${fieldValue(bean:assignedPersonInstance,field:'estimatedMinute')}" />
+                                    <g:helpBalloon code="assignedPerson.estimatedDuration" />
+                                </td> 
+                            </tr>
+
                         </tbody>
                     </table>
Index: trunk/grails-app/views/assignedPersonDetailed/list.gsp
===================================================================
--- trunk/grails-app/views/assignedPersonDetailed/list.gsp	(revision 145)
+++ trunk/grails-app/views/assignedPersonDetailed/list.gsp	(revision 147)
@@ -9,9 +9,7 @@
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="create" action="create">New AssignedPerson</g:link></span>
+            <h1>Assigned Person List</h1>
         </div>
         <div class="body">
-            <h1>AssignedPerson List</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
Index: trunk/grails-app/views/assignedPersonDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/assignedPersonDetailed/show.gsp	(revision 145)
+++ trunk/grails-app/views/assignedPersonDetailed/show.gsp	(revision 147)
@@ -9,10 +9,7 @@
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="list">AssignedPerson List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New AssignedPerson</g:link></span>
+            <h1>Show Assigned Person</h1>
         </div>
         <div class="body">
-            <h1>Show AssignedPerson</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
@@ -45,17 +42,8 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Estimated Hour:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:assignedPersonInstance, field:'estimatedHour')}</td>
-                            
+                            <td valign="top" class="name">Estimated Duration:</td>
+                            <td valign="top" class="value">${assignedPersonInstance.estimatedHour}h : ${assignedPersonInstance.estimatedMinute}min</td>
                         </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Estimated Minute:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:assignedPersonInstance, field:'estimatedMinute')}</td>
-                            
-                        </tr>
-                    
+
                     </tbody>
                 </table>
Index: trunk/grails-app/views/entryDetailed/create.gsp
===================================================================
--- trunk/grails-app/views/entryDetailed/create.gsp	(revision 145)
+++ trunk/grails-app/views/entryDetailed/create.gsp	(revision 147)
@@ -5,13 +5,13 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Create Entry</title>         
+        <title>Create Entry</title>
+        <nav:resources override="true"/>
+        <resource:dateChooser />
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="list">Entry List</g:link></span>
+            <h1>Create Entry</h1>
         </div>
         <div class="body">
-            <h1>Create Entry</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
@@ -51,5 +51,5 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'dateDone','errors')}">
-                                    <g:datePicker name="dateDone" value="${entryInstance?.dateDone}" precision="day"></g:datePicker>
+                                    <richui:dateChooser name="dateDone" format="dd-MM-yyyy" value="${new Date()}" />
                                 </td>
                             </tr> 
Index: trunk/grails-app/views/entryDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/entryDetailed/edit.gsp	(revision 145)
+++ trunk/grails-app/views/entryDetailed/edit.gsp	(revision 147)
@@ -6,13 +6,11 @@
         <meta name="layout" content="main" />
         <title>Edit Entry</title>
+        <resource:dateChooser />
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="list">Entry List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New Entry</g:link></span>
+            <h1>Edit Entry</h1>
         </div>
         <div class="body">
-            <h1>Edit Entry</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
@@ -52,5 +50,5 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:entryInstance,field:'dateDone','errors')}">
-                                    <g:datePicker name="dateDone" value="${entryInstance?.dateDone}" precision="day"></g:datePicker>
+                                    <richui:dateChooser name="dateDone" format="dd-MM-yyyy" value="${entryInstance?.dateDone}" />
                                 </td>
                             </tr> 
Index: trunk/grails-app/views/entryDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/entryDetailed/show.gsp	(revision 145)
+++ trunk/grails-app/views/entryDetailed/show.gsp	(revision 147)
@@ -9,10 +9,7 @@
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="list">Entry List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New Entry</g:link></span>
+            <h1>Show Entry</h1>
         </div>
         <div class="body">
-            <h1>Show Entry</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
@@ -47,20 +44,13 @@
                             <td valign="top" class="name">Date Done:</td>
                             
-                            <td valign="top" class="value">${fieldValue(bean:entryInstance, field:'dateDone')}</td>
+                            <td valign="top" class="value">
+                                <g:formatDate date="${entryInstance.dateDone}" format="EEE, dd-MMM-yyyy"/>
+                            </td>
                             
                         </tr>
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Duration Hour:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:entryInstance, field:'durationHour')}</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Duration Minute:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:entryInstance, field:'durationMinute')}</td>
-                            
+                            <td valign="top" class="name">Duration:</td>
+                            <td valign="top" class="value">${entryInstance.durationHour}h : ${entryInstance.durationMinute}min</td>
                         </tr>
                     
@@ -68,5 +58,7 @@
                             <td valign="top" class="name">Date Entered:</td>
                             
-                            <td valign="top" class="value">${fieldValue(bean:entryInstance, field:'dateEntered')}</td>
+                            <td valign="top" class="value">
+                                <g:formatDate date="${entryInstance.dateEntered}" format="EEE, dd-MMM-yyyy @ HH:mm"/>
+                            </td>
                             
                         </tr>
Index: trunk/grails-app/views/person/create.gsp
===================================================================
--- trunk/grails-app/views/person/create.gsp	(revision 145)
+++ trunk/grails-app/views/person/create.gsp	(revision 147)
@@ -2,4 +2,5 @@
 	<meta name="layout" content="main" />
 	<title>Create Person</title>
+    <nav:resources override="true"/>
 </head>
 
@@ -7,10 +8,8 @@
 
 	<div class="nav">
-		<span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-		<span class="menuButton"><g:link class="list" action="list">Person List</g:link></span>
+        <nav:renderSubItems group="navAlt"/>
 	</div>
 
 	<div class="body">
-		<h1>Create Person</h1>
 		<g:if test="${flash.message}">
 		<div class="message">${flash.message}</div>
Index: trunk/grails-app/views/person/edit.gsp
===================================================================
--- trunk/grails-app/views/person/edit.gsp	(revision 145)
+++ trunk/grails-app/views/person/edit.gsp	(revision 147)
@@ -2,4 +2,5 @@
 	<meta name="layout" content="main" />
 	<title>Edit Person</title>
+    <nav:resources override="true"/>
 </head>
 
@@ -7,11 +8,8 @@
 
 	<div class="nav">
-		<span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-		<span class="menuButton"><g:link class="list" action="list">Person List</g:link></span>
-		<span class="menuButton"><g:link class="create" action="create">New Person</g:link></span>
+        <nav:renderSubItems group="navAlt"/>
 	</div>
 
 	<div class="body">
-		<h1>Edit Person</h1>
 		<g:if test="${flash.message}">
 		<div class="message">${flash.message}</div>
@@ -23,7 +21,7 @@
 		</g:hasErrors>
 
-		<div class="prop">
+<!--		<div class="prop">
 			<span class="name">ID: ${person.id}</span>
-		</div>
+		</div>-->
 
 		<g:form>
Index: trunk/grails-app/views/person/list.gsp
===================================================================
--- trunk/grails-app/views/person/list.gsp	(revision 145)
+++ trunk/grails-app/views/person/list.gsp	(revision 147)
@@ -1,60 +1,72 @@
 <head>
-	<meta name="layout" content="main" />
-	<title>Person List</title>
+    <meta name="layout" content="main" />
+    <title>Person List</title>
+    <filterpane:includes />
+    <nav:resources override="true"/>
 </head>
 
 <body>
 
-	<div class="nav">
-		<span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-		<span class="menuButton"><g:link class="create" action="create">New Person</g:link></span>
-	</div>
+    <div class="nav">
+        <nav:renderSubItems group="navAlt"/>
+    </div>
 
-	<div class="body">
-		<h1>Person List</h1>
-		<g:if test="${flash.message}">
-		<div class="message">${flash.message}</div>
-		</g:if>
-		<div class="list">
-			<table>
-			<thead>
-				<tr>
-					<g:sortableColumn property="id" title="Id" />
-					<g:sortableColumn property="loginName" title="Login Name" />
-					<g:sortableColumn property="firstName" title="First Name" />
-                    <g:sortableColumn property="lastName" title="Last Name" />
-                    <g:sortableColumn property="isActive " title="isActive" />
-					<th>&nbsp;</th>
-                    <th>&nbsp;</th>
-				</tr>
-			</thead>
-			<tbody>
-			<g:each in="${personList}" status="i" var="person">
-				<tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
-					<td>${person.id}</td>
-					<td>${person.loginName?.encodeAsHTML()}</td>
-					<td>${person.firstName?.encodeAsHTML()}</td>
+    <div class="body">
+        <g:if test="${flash.message}">
+        <div class="message">${flash.message}</div>
+        </g:if>
+        <filterpane:currentCriteria domainBean="Person"
+                                action="list"
+                                dateFormat="${'EEE, dd-MMM-yyyy'}"
+                                removeImgDir="images" 
+                                removeImgFile="bullet_delete.png"
+                                title="Search"/>
+        <div class="list">
+            <table>
+            <thead>
+                <tr>
+                    <g:sortableColumn property="id" title="Id" params="${filterParams}" />
+                    <g:sortableColumn property="loginName" title="Login Name" params="${filterParams}" />
+                    <g:sortableColumn property="firstName" title="First Name" params="${filterParams}" />
+                    <g:sortableColumn property="lastName" title="Last Name" params="${filterParams}" />
+                    <g:sortableColumn property="isActive " title="isActive" params="${filterParams}" />
+                    <th></th>
+                </tr>
+            </thead>
+            <tbody>
+            <g:each in="${personList}" status="i" var="person">
+                <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/person/show/${person.id}"'/>
+
+                    <td>${person.id}</td>
+                    <td>${person.loginName?.encodeAsHTML()}</td>
+                    <td>${person.firstName?.encodeAsHTML()}</td>
                     <td>${person.lastName?.encodeAsHTML()}</td>
-					<td>${person.isActive?.encodeAsHTML()}</td>
-					<td class="actionButtons">
-						<span class="actionButton">
-							<g:link action="show" id="${person.id}">Show</g:link>
-						</span>
-					</td>
-                    <td class="actionButtons">
-                        <span class="actionButton">
-                            <g:link action="edit" id="${person.id}">Edit</g:link>
-                        </span>
+                    <td>${person.isActive?.encodeAsHTML()}</td>
+                    <td>
+                        <g:link action="show" id="${person.id}">
+                            <img  src="${createLinkTo(dir:'images/skin',file:'database_go.png')}" alt="Show" />
+                        </g:link>
                     </td>
-				</tr>
-			</g:each>
-			</tbody>
-			</table>
-		</div>
+                </tr>
+            </g:each>
+            </tbody>
+            </table>
+        </div>
 
-		<div class="paginateButtons">
-			<g:paginate total="${Person.count()}" />
-		</div>
+        <div class="paginateButtons">
+            <g:paginate total="${personTotal}" params="${filterParams}" />
+            <filterpane:filterButton text="Search" appliedText="Change Search" />
+            Results:${personTotal}
+        </div>
 
-	</div>
+        <filterpane:filterPane domainBean="Person"
+                                title="Search"
+                                action="list"
+                                excludeProperties="password, sessionTimeout, emailShow"
+                                associatedProperties="authorities.authority, personGroups.name"
+                                    filterPropertyValues="${['personGroups.name':[values:PersonGroup.list()],
+                                                                                'authorities.authority':[values:Authority.list()]]}" />
+
+
+    </div><!-- end body div -->
 </body>
Index: trunk/grails-app/views/person/show.gsp
===================================================================
--- trunk/grails-app/views/person/show.gsp	(revision 145)
+++ trunk/grails-app/views/person/show.gsp	(revision 147)
@@ -2,4 +2,5 @@
 	<meta name="layout" content="main" />
 	<title>Show Person</title>
+    <nav:resources override="true"/>
 </head>
 
@@ -7,11 +8,8 @@
 
 	<div class="nav">
-		<span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-		<span class="menuButton"><g:link class="list" action="list">Person List</g:link></span>
-		<span class="menuButton"><g:link class="create" action="create">New Person</g:link></span>
+        <nav:renderSubItems group="navAlt"/>
 	</div>
 
 	<div class="body">
-		<h1>Show Person</h1>
 		<g:if test="${flash.message}">
 		<div class="message">${flash.message}</div>
Index: trunk/grails-app/views/taskDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/edit.gsp	(revision 145)
+++ trunk/grails-app/views/taskDetailed/edit.gsp	(revision 147)
@@ -7,4 +7,5 @@
         <title>Edit Task</title>
         <nav:resources override="true"/>
+        <resource:dateChooser />
     </head>
     <body>
@@ -57,5 +58,5 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'targetStartDate','errors')}">
-                                    <g:datePicker name="targetStartDate" value="${taskInstance?.targetStartDate}" precision="day"></g:datePicker>
+                                    <richui:dateChooser name="targetStartDate" format="dd-MM-yyyy" value="${taskInstance?.targetStartDate}" />
                                 </td>
                             </tr>
@@ -66,5 +67,5 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'targetCompletionDate','errors')}">
-                                    <g:datePicker name="targetCompletionDate" value="${taskInstance?.targetCompletionDate}" precision="day"></g:datePicker>
+                                    <richui:dateChooser name="targetCompletionDate" format="dd-MM-yyyy" value="${taskInstance?.targetCompletionDate}" />
                                 </td>
                             </tr> 
Index: trunk/grails-app/views/taskDetailed/search.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/search.gsp	(revision 145)
+++ trunk/grails-app/views/taskDetailed/search.gsp	(revision 147)
@@ -30,6 +30,6 @@
                                     removeImgFile="bullet_delete.png"
                                     title="Quick Search"/>
-            
-            <div class="list">                
+
+            <div class="list">
                 <table>
                     <thead>
@@ -85,5 +85,5 @@
                 <g:link action="advancedSearch">Goto: Advanced Search</g:link>
             </div>
-            
+
             <filterpane:filterPane domainBean="Task"
                                     title="Quick Search"
Index: trunk/grails-app/views/taskProcedureDetailed/create.gsp
===================================================================
--- trunk/grails-app/views/taskProcedureDetailed/create.gsp	(revision 145)
+++ trunk/grails-app/views/taskProcedureDetailed/create.gsp	(revision 147)
@@ -5,13 +5,12 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Create TaskProcedure</title>         
+        <title>Create TaskProcedure</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="list">TaskProcedure List</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Create TaskProcedure</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
Index: trunk/grails-app/views/taskProcedureDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/taskProcedureDetailed/edit.gsp	(revision 145)
+++ trunk/grails-app/views/taskProcedureDetailed/edit.gsp	(revision 147)
@@ -6,13 +6,11 @@
         <meta name="layout" content="main" />
         <title>Edit TaskProcedure</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="list">TaskProcedure List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New TaskProcedure</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Edit TaskProcedure</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
Index: trunk/grails-app/views/taskProcedureDetailed/list.gsp
===================================================================
--- trunk/grails-app/views/taskProcedureDetailed/list.gsp	(revision 145)
+++ trunk/grails-app/views/taskProcedureDetailed/list.gsp	(revision 147)
@@ -6,15 +6,21 @@
         <meta name="layout" content="main" />
         <title>TaskProcedure List</title>
+        <filterpane:includes />
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="create" action="create">New TaskProcedure</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>TaskProcedure List</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
             </g:if>
+            <filterpane:currentCriteria domainBean="TaskProcedureDetailed"
+                                    action="list"
+                                    dateFormat="${'EEE, dd-MMM-yyyy'}"
+                                    removeImgDir="images" 
+                                    removeImgFile="bullet_delete.png"
+                                    title="Search"/>
             <div class="list">
                 <table>
@@ -22,11 +28,13 @@
                         <tr>
                         
-                   	        <g:sortableColumn property="id" title="Id" />
+                   	        <g:sortableColumn property="id" title="Id"  params="${filterParams}" />
                         
-                   	        <g:sortableColumn property="name" title="Name" />
+                   	        <g:sortableColumn property="name" title="Name"  params="${filterParams}" />
                         
-                   	        <g:sortableColumn property="description" title="Description" />
+                   	        <g:sortableColumn property="description" title="Description"  params="${filterParams}" />
                         
-                   	        <g:sortableColumn property="isActive" title="Is Active" />
+                   	        <g:sortableColumn property="isActive" title="Is Active"  params="${filterParams}" />
+
+                            <th></th>
                         
                         </tr>
@@ -34,7 +42,7 @@
                     <tbody>
                     <g:each in="${taskProcedureInstanceList}" status="i" var="taskProcedureInstance">
-                        <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                        <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/taskProcedureDetailed/show/${taskProcedureInstance.id}"'/>
                         
-                            <td><g:link action="show" id="${taskProcedureInstance.id}">${fieldValue(bean:taskProcedureInstance, field:'id')}</g:link></td>
+                            <td>${fieldValue(bean:taskProcedureInstance, field:'id')}</td>
                         
                             <td>${fieldValue(bean:taskProcedureInstance, field:'name')}</td>
@@ -43,4 +51,10 @@
                         
                             <td>${fieldValue(bean:taskProcedureInstance, field:'isActive')}</td>
+                            
+                            <td>
+                                <g:link action="show" id="${taskProcedureInstance.id}">
+                                    <img  src="${createLinkTo(dir:'images/skin',file:'database_go.png')}" alt="Show" />
+                                </g:link>
+                            </td>
                         
                         </tr>
@@ -49,7 +63,15 @@
                 </table>
             </div>
+
             <div class="paginateButtons">
-                <g:paginate total="${taskProcedureInstanceTotal}" />
+                <g:paginate total="${taskProcedureInstanceTotal}" params="${filterParams}" />
+                <filterpane:filterButton text="Search" appliedText="Change Search" />
+                Results:${askProcedureInstanceTotal}
             </div>
+
+            <filterpane:filterPane domainBean="TaskProcedure"
+                                    title="Search"
+                                    action="list"
+                                    excludeProperties="" />
         </div>
     </body>
Index: trunk/grails-app/views/taskProcedureDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/taskProcedureDetailed/show.gsp	(revision 145)
+++ trunk/grails-app/views/taskProcedureDetailed/show.gsp	(revision 147)
@@ -6,13 +6,11 @@
         <meta name="layout" content="main" />
         <title>Show TaskProcedure</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="list">TaskProcedure List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New TaskProcedure</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Show TaskProcedure</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>