Index: /trunk/grails-app/domain/Task.groovy
===================================================================
--- /trunk/grails-app/domain/Task.groovy	(revision 727)
+++ /trunk/grails-app/domain/Task.groovy	(revision 728)
@@ -23,5 +23,6 @@
     boolean attentionFlag = false
     boolean safetyRequirement = false
-    boolean mandatoryRegulatory = false
+    boolean regulatoryRequirement = false
+    boolean mandatoryRequirement = false
     boolean positiveFault = false
 
Index: /trunk/grails-app/i18n/messages.properties
===================================================================
--- /trunk/grails-app/i18n/messages.properties	(revision 727)
+++ /trunk/grails-app/i18n/messages.properties	(revision 728)
@@ -181,9 +181,12 @@
 task.leadPerson=Lead Person
 task.leadPerson.help=The primay contact person.
-task.safetyRequirement=Safety Requirment
+task.safetyRequirement=Safety
 task.safetyRequirement.help=Completion of this task is a safety requirement. \
     This task must be completed and is not allowed to be missed.
-task.mandatoryRegulatory=Mandatory/Regulatory
-task.mandatoryRegulatory.help=Completion of this task is a mandatory or regulatory requirement. \
+task.regulatoryRequirement=Regulatory
+task.regulatoryRequirement.help=Completion of this task is a regulatory requirement. \
+    This task must be completed and is not allowed to be missed.
+task.mandatoryRequirement=Mandatory
+task.mandatoryRequirement.help=Completion of this task is mandatory, due to company policy or operational requirement. \
     This task must be completed and is not allowed to be missed.
 task.positiveFault=Positive Fault
Index: /trunk/grails-app/services/AssetReportService.groovy
===================================================================
--- /trunk/grails-app/services/AssetReportService.groovy	(revision 727)
+++ /trunk/grails-app/services/AssetReportService.groovy	(revision 728)
@@ -192,5 +192,5 @@
             from 'Task as task',
                     'left join task.associatedAssets as associatedAsset'
-            where 'task.mandatoryRegulatory = true'
+            where 'task.regulatoryRequirement = true'
                 and 'task.targetStartDate < :endDate'
                 and 'task.targetCompletionDate >= :startDate'
Index: /trunk/grails-app/services/TaskService.groovy
===================================================================
--- /trunk/grails-app/services/TaskService.groovy	(revision 727)
+++ /trunk/grails-app/services/TaskService.groovy	(revision 728)
@@ -196,5 +196,6 @@
 
         p.safetyRequirement = params.safetyRequirement ?: parentTask.safetyRequirement
-        p.mandatoryRegulatory = params.mandatoryRegulatory ?: parentTask.mandatoryRegulatory
+        p.regulatoryRequirement = params.regulatoryRequirement ?: parentTask.regulatoryRequirement
+        p.mandatoryRequirement = params.mandatoryRequirement ?: parentTask.mandatoryRequirement
 
         p.taskGroup = params.taskGroup ?: parentTask.taskGroup
Index: /trunk/grails-app/views/taskDetailed/create.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/create.gsp	(revision 727)
+++ /trunk/grails-app/views/taskDetailed/create.gsp	(revision 728)
@@ -151,5 +151,5 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="isActive">Safety Requirement:</label>
+                                    <label for="safetyRequirement">Safety:</label>
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'safetyRequirement','errors')}">
@@ -161,15 +161,25 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="isActive">Mandatory/Regulatory:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'mandatoryRegulatory','errors')}">
-                                    <g:checkBox name="mandatoryRegulatory" value="${taskInstance?.mandatoryRegulatory}" ></g:checkBox>
-                                    <g:helpBalloon code="task.mandatoryRegulatory" />
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="isActive">Positive Fault:</label>
+                                    <label for="regulatoryRequirement">Regulatory:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'regulatoryRequirement','errors')}">
+                                    <g:checkBox name="regulatoryRequirement" value="${taskInstance?.regulatoryRequirement}" ></g:checkBox>
+                                    <g:helpBalloon code="task.regulatoryRequirement" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="mandatoryRequirement">Mandatory:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'mandatoryRequirement','errors')}">
+                                    <g:checkBox name="mandatoryRequirement" value="${taskInstance?.mandatoryRequirement}" ></g:checkBox>
+                                    <g:helpBalloon code="task.mandatoryRequirement" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="positiveFault">Positive Fault:</label>
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'positiveFault','errors')}">
Index: /trunk/grails-app/views/taskDetailed/createUnscheduled.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/createUnscheduled.gsp	(revision 727)
+++ /trunk/grails-app/views/taskDetailed/createUnscheduled.gsp	(revision 728)
@@ -133,5 +133,5 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="isActive">Safety Requirement:</label>
+                                    <label for="safetyRequirement">Safety Requirement:</label>
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'safetyRequirement','errors')}">
@@ -143,9 +143,19 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="isActive">Mandatory/Regulatory:</label>
+                                    <label for="regulatoryRequirement">Regulatory Requirement:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'mandatoryRegulatory','errors')}">
-                                    <g:checkBox name="mandatoryRegulatory" value="${taskInstance?.mandatoryRegulatory}" ></g:checkBox>
-                                    <g:helpBalloon code="task.mandatoryRegulatory" />
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'regulatoryRequirement','errors')}">
+                                    <g:checkBox name="regulatoryRequirement" value="${taskInstance?.regulatoryRequirement}" ></g:checkBox>
+                                    <g:helpBalloon code="task.regulatoryRequirement" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="mandatoryRequirement">Mandatory Requirement:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'mandatoryRequirement','errors')}">
+                                    <g:checkBox name="mandatoryRequirement" value="${taskInstance?.mandatoryRequirement}" ></g:checkBox>
+                                    <g:helpBalloon code="task.mandatoryRequirement" />
                                 </td>
                             </tr> 
Index: /trunk/grails-app/views/taskDetailed/edit.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/edit.gsp	(revision 727)
+++ /trunk/grails-app/views/taskDetailed/edit.gsp	(revision 728)
@@ -179,5 +179,5 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="isActive">Safety Requirement:</label>
+                                    <label for="safetyRequirement">Safety Requirement:</label>
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'safetyRequirement','errors')}">
@@ -189,15 +189,25 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="isActive">Mandatory/Regulatory:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'mandatoryRegulatory','errors')}">
-                                    <g:checkBox name="mandatoryRegulatory" value="${taskInstance?.mandatoryRegulatory}" ></g:checkBox>
-                                    <g:helpBalloon code="task.mandatoryRegulatory" />
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="isActive">Positive Fault:</label>
+                                    <label for="regulatoryRequirement">Regulatory Requirement:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'regulatoryRequirement','errors')}">
+                                    <g:checkBox name="regulatoryRequirement" value="${taskInstance?.regulatoryRequirement}" ></g:checkBox>
+                                    <g:helpBalloon code="task.regulatoryRequirement" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="mandatoryRequirement">Mandatory Requirement:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'mandatoryRequirement','errors')}">
+                                    <g:checkBox name="mandatoryRequirement" value="${taskInstance?.mandatoryRequirement}" ></g:checkBox>
+                                    <g:helpBalloon code="task.mandatoryRequirement" />
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="positiveFault">Positive Fault:</label>
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'positiveFault','errors')}">
Index: /trunk/grails-app/views/taskDetailed/show.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/show.gsp	(revision 727)
+++ /trunk/grails-app/views/taskDetailed/show.gsp	(revision 728)
@@ -28,8 +28,17 @@
                     Task #${taskInstance.id}
                     <g:if test="${taskInstance.attentionFlag}" >
-                        <img  src="${resource(dir:'images/skin',file:'flag_red.png')}" alt="Flag" />
+                        <img  src="${resource(dir:'images/skin',file:'flag_red.png')}" alt="Attention Flag" title="Attention Flag" />
                     </g:if>
                     <g:if test="${taskInstance.taskStatus.id == 3}" >
-                        <img  src="${resource(dir:'images/skin',file:'tick.png')}" alt="Flag" />
+                        <img  src="${resource(dir:'images/skin',file:'tick.png')}" alt="Complete" title="Complete" />
+                    </g:if>
+                    <g:if test="${taskInstance.safetyRequirement}" >
+                        <img  src="${resource(dir:'images/skin',file:'lightning.png')}" alt="Safety Requirement" title="Safety Requirement" />
+                    </g:if>
+                    <g:if test="${taskInstance.regulatoryRequirement}" >
+                        <img  src="${resource(dir:'images/skin',file:'script_lightning.png')}" alt="Regulatory Requirement" title="Regulatory Requirement" />
+                    </g:if>
+                    <g:if test="${taskInstance.mandatoryRequirement}" >
+                        <img  src="${resource(dir:'images/skin',file:'script.png')}" alt="Mandatory Requirement" title="Mandatory Requirement" />
                     </g:if>
                 </h1>
@@ -188,18 +197,4 @@
 
                                     <tr class="prop">
-                                        <td valign="top" class="name">Safety Requirement:</td>
-
-                                        <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'safetyRequirement')}</td>
-
-                                    </tr>
-
-                                    <tr class="prop">
-                                        <td valign="top" class="name">Mandatory/Regulatory:</td>
-
-                                        <td valign="top" class="value">${fieldValue(bean:taskInstance, field:'mandatoryRegulatory')}</td>
-
-                                    </tr>
-
-                                    <tr class="prop">
                                         <td valign="top" class="name">Positive Fault:</td>