Index: trunk/grails-app/services/CreateDataService.groovy
===================================================================
--- trunk/grails-app/services/CreateDataService.groovy	(revision 504)
+++ trunk/grails-app/services/CreateDataService.groovy	(revision 506)
@@ -46,12 +46,13 @@
 
         if(appConfigService.exists("baseDataCreated")) {
-            log.error "Base data has already been created, will NOT recreate."
+            log.info "Base data previously created."
             return false
         }
 
-        log.info "Creating base data..."
+        log.info "Creating base data."
 
         // Person and Utils
         createBaseAuthorities()
+        createBasePersonGroupTypes()
         createBasePersonGroups()
         createBaseDefinitions()
@@ -211,30 +212,34 @@
     }
 
+    void createBasePersonGroupTypes() {
+
+        //PersonGroupType.
+        def personGroupTypeInstance
+        personGroupTypeInstance = new PersonGroupType(name:"Team")
+        saveAndTest(personGroupTypeInstance)
+        personGroupTypeInstance = new PersonGroupType(name:"Contractor")
+        saveAndTest(personGroupTypeInstance)
+        personGroupTypeInstance = new PersonGroupType(name:"Project Team")
+        saveAndTest(personGroupTypeInstance)
+    }
+
     void createBasePersonGroups() {
-        //TypeOfPersonGroup
-        def personGroupTypeInstance
-            personGroupTypeInstance = new PersonGroupType(name:"Team")
-        saveAndTest(personGroupTypeInstance)
-            personGroupTypeInstance = new PersonGroupType(name:"Contractor")
-        saveAndTest(personGroupTypeInstance)
-            personGroupTypeInstance = new PersonGroupType(name:"ProjectTeam")
-        saveAndTest(personGroupTypeInstance)
 
         //PersonGroup
         def personGroupInstance
-            personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(1),
-                            name:"Electrical")
+        personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(1),
+                                                                                name:"Electrical - General")
         saveAndTest(personGroupInstance)
-            personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(1),
-                            name:"Mechanical")
+        personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(1),
+                                                                                name:"Mechanical - General")
         saveAndTest(personGroupInstance)
-            personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(1),
-                            name:"Production")
+        personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(1),
+                                                                                name:"Production")
         saveAndTest(personGroupInstance)
-            personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(2),
-                            name:"Kewl AirCon Guys")
+        personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(2),
+                                                                                name:"AirCon Contractor")
         saveAndTest(personGroupInstance)
-            personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(3),
-                            name:"gnuMims")
+        personGroupInstance = new PersonGroup(personGroupType:PersonGroupType.get(3),
+                                                                                name:"gnuMims")
         saveAndTest(personGroupInstance)
     }
Index: trunk/grails-app/views/person/create.gsp
===================================================================
--- trunk/grails-app/views/person/create.gsp	(revision 504)
+++ trunk/grails-app/views/person/create.gsp	(revision 506)
@@ -94,7 +94,11 @@
                             <g:helpBalloon class="helpballoon" code="person.personGroups" />
                             <custom:checkBoxList name="personGroups"
-                                                            from="${PersonGroup.list().sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                            from="${PersonGroup.findAllByIsActive(true)}"
                                                             value="${person?.personGroups?.collect{it.id}}"
-                                                            optionKey="id"/>
+                                                            optionKey="id"
+                                                            sortBy="name"
+                                                            linkController="personGroupDetailed"
+                                                            linkAction="show"/>
+                            <g:link controller="personGroupDetailed" action="create">+Add Group</g:link>
                         </td>
                     </tr>
Index: trunk/grails-app/views/person/edit.gsp
===================================================================
--- trunk/grails-app/views/person/edit.gsp	(revision 504)
+++ trunk/grails-app/views/person/edit.gsp	(revision 506)
@@ -139,4 +139,5 @@
                                                             linkController="personGroupDetailed"
                                                             linkAction="show"/>
+                            <g:link controller="personGroupDetailed" action="create">+Add Group</g:link>
                         </td>
                     </tr>
@@ -164,4 +165,5 @@
             <div class="buttons">
                 <span class="button"><g:actionSubmit class="save" value="Update" /></span>
+                    <span class="button"><g:actionSubmit class="cancel" value="Cancel" action="Show"/></span>
                 <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
             </div>