Index: /branches/TaskRewrite/src/grails-app/conf/BootStrap.groovy
===================================================================
--- /branches/TaskRewrite/src/grails-app/conf/BootStrap.groovy	(revision 58)
+++ /branches/TaskRewrite/src/grails-app/conf/BootStrap.groovy	(revision 59)
@@ -46,52 +46,60 @@
 //                         name:"gnuMims").save()
 
+        //Authority
+        def authInstance
+
+        authInstance = new Authority(description:"Application Admin",
+                                        authority:"ROLE_ADMIN")
+        BootStrapSaveAndTest(authInstance)
+
+        authInstance = new Authority(description:"Application Admin",
+                                        authority:"ROLE_USER")
+        BootStrapSaveAndTest(authInstance)
             
         //Person
-//         def passwordEncoded = authenticateService.encodePassword("pass")
+        def passwordEncoded = authenticateService.encodePassword("pass")
+        def personInstance
 
-        def personInstance = new Person(loginName:"admin",
+        personInstance = new Person(loginName:"admin",
                                     firstName:"Admin",
                                     lastName:"Powers",
-                                    password:authenticateService.encodePassword("pass"),
+                                    password:passwordEncoded,
                                     email:"admin@example.com")
         BootStrapSaveAndTest(personInstance)
+        personInstance.addToAuthorities(Authority.get(1))
+        personInstance.addToAuthorities(Authority.get(2))
 
-        //Role
-        def authInstance = new Authority(description:"Application Admin",
-                            authority:"ROLE_ADMIN")
-            authInstance.addToPersons(personInstance)
-            authInstance.save()
+        personInstance = new Person(loginName:"user",
+                                    firstName:"Demo",
+                                    lastName:"Danza",
+                                    password:passwordEncoded,
+                                    email:"user@example.com")
+        BootStrapSaveAndTest(personInstance)
+        personInstance.addToAuthorities(Authority.get(2))
 
-//         new Person(username:"admin", 
-//             userRealName:"Admin Powers", 
-//             enabled:true,
-//             
-//         new Person(personGroup:PersonGroup.get(3),
-//             firstName:"Admin",
-//             lastName:"Powers",
-//             userId:"admin",
-//             password:"pass").save()
-//         new Person(personGroup:PersonGroup.get(1),
-//             firstName:"Demo",
-//             lastName:"Danza",
-//             userId:"user",
-//             password:"pass").save()
+        personInstance = new Person(loginName:"craig",
+                                    firstName:"Craig",
+                                    lastName:"SuperTech",
+                                    password:passwordEncoded,
+                                    email:"user@example.com")
+        BootStrapSaveAndTest(personInstance)
+        personInstance.addToAuthorities(Authority.get(2))
 
+        personInstance = new Person(loginName:"joe",
+                                    firstName:"Joe",
+                                    lastName:"Samples",
+                                    password:passwordEncoded,
+                                    email:"user@example.com")
+        BootStrapSaveAndTest(personInstance)
+        personInstance.addToAuthorities(Authority.get(2))
 
-//         new Person(personGroup:PersonGroup.get(1),
-//             firstName:"Craig",
-//             lastName:"SuperTech",
-//             userId:"craig",
-//             password:"pass").save()
-//         new Person(personGroup:PersonGroup.get(2),
-//             firstName:"Joe",
-//             lastName:"Samples",
-//             userId:"joe",
-//             password:"pass").save()
-//         new Person(personGroup:PersonGroup.get(1),
-//             firstName:"Production",
-//             lastName:"Mann",
-//             userId:"Mann",
-//             password:"pass").save()
+        personInstance = new Person(loginName:"mann",
+                                    firstName:"Production",
+                                    lastName:"Mann",
+                                    password:passwordEncoded,
+                                    email:"user@example.com")
+        BootStrapSaveAndTest(personInstance)
+        personInstance.addToAuthorities(Authority.get(2))
+
                 
         //TaskGroup
Index: /branches/TaskRewrite/src/grails-app/controllers/AppCoreController.groovy
===================================================================
--- /branches/TaskRewrite/src/grails-app/controllers/AppCoreController.groovy	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/controllers/AppCoreController.groovy	(revision 59)
@@ -0,0 +1,23 @@
+import org.codehaus.groovy.grails.plugins.springsecurity.Secured
+
+@Secured(['ROLE_USER'])
+class AppCoreController extends BaseController {
+
+    def index = { redirect(action:home,params:params) }
+
+    // the delete, save and update actions only accept POST requests
+    //def allowedMethods = [delete:'POST', save:'POST', update:'POST']
+
+
+    def home = {
+        //if(!params.max) params.max = 10
+        //[ personInstanceList: Person.list( params ) ]
+    }
+
+    @Secured(['ROLE_ADMIN'])   
+    def admin = {
+        //if(!params.max) params.max = 10
+        //[ personInstanceList: Person.list( params ) ]
+    }
+
+}
Index: /branches/TaskRewrite/src/grails-app/controllers/AuthorityController.groovy
===================================================================
--- /branches/TaskRewrite/src/grails-app/controllers/AuthorityController.groovy	(revision 58)
+++ /branches/TaskRewrite/src/grails-app/controllers/AuthorityController.groovy	(revision 59)
@@ -1,8 +1,3 @@
-
-
-
-/**
- * Authority Controller.
- */
+@Secured(['ROLE_ADMIN'])
 class AuthorityController {
 
Index: /branches/TaskRewrite/src/grails-app/controllers/BaseController.groovy
===================================================================
--- /branches/TaskRewrite/src/grails-app/controllers/BaseController.groovy	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/controllers/BaseController.groovy	(revision 59)
@@ -0,0 +1,5 @@
+abstract class BaseController {
+    def whatsit() {
+    }
+}
+
Index: /branches/TaskRewrite/src/grails-app/controllers/LoginController.groovy
===================================================================
--- /branches/TaskRewrite/src/grails-app/controllers/LoginController.groovy	(revision 58)
+++ /branches/TaskRewrite/src/grails-app/controllers/LoginController.groovy	(revision 59)
@@ -38,4 +38,9 @@
 		}
 	}
+
+    def loggedOut = {
+        flash['message'] = 'Successfully logged out'
+        auth()
+    }
 
 	/**
Index: /branches/TaskRewrite/src/grails-app/controllers/LogoutController.groovy
===================================================================
--- /branches/TaskRewrite/src/grails-app/controllers/LogoutController.groovy	(revision 58)
+++ /branches/TaskRewrite/src/grails-app/controllers/LogoutController.groovy	(revision 59)
@@ -9,5 +9,6 @@
 	def index = {
 		// TODO  put any pre-logout code here
-		redirect(uri: '/j_spring_security_logout')
+        
+		redirect(uri: '/j_spring_security_logout?logoutSuccessUrl=/login/loggedOut')
 	}
 }
Index: /branches/TaskRewrite/src/grails-app/controllers/PersonController.groovy
===================================================================
--- /branches/TaskRewrite/src/grails-app/controllers/PersonController.groovy	(revision 58)
+++ /branches/TaskRewrite/src/grails-app/controllers/PersonController.groovy	(revision 59)
@@ -5,4 +5,5 @@
  * User controller.
  */
+@Secured(['ROLE_ADMIN'])
 class PersonController {
 
Index: /branches/TaskRewrite/src/grails-app/controllers/PersonGroupController.groovy
===================================================================
--- /branches/TaskRewrite/src/grails-app/controllers/PersonGroupController.groovy	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/controllers/PersonGroupController.groovy	(revision 59)
@@ -0,0 +1,83 @@
+@Secured(['ROLE_ADMIN'])
+class PersonGroupController extends BaseController {
+
+    def index = { redirect(action:list,params:params) }
+
+    // the delete, save and update actions only accept POST requests
+    def allowedMethods = [delete:'POST', save:'POST', update:'POST']
+
+    def list = {
+        if(!params.max) params.max = 10
+        [ personGroupInstanceList: PersonGroup.list( params ) ]
+    }
+
+    def show = {
+        def personGroupInstance = PersonGroup.get( params.id )
+
+        if(!personGroupInstance) {
+            flash.message = "PersonGroup not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else { return [ personGroupInstance : personGroupInstance ] }
+    }
+
+    def delete = {
+        def personGroupInstance = PersonGroup.get( params.id )
+        if(personGroupInstance) {
+            personGroupInstance.delete()
+            flash.message = "PersonGroup ${params.id} deleted"
+            redirect(action:list)
+        }
+        else {
+            flash.message = "PersonGroup not found with id ${params.id}"
+            redirect(action:list)
+        }
+    }
+
+    def edit = {
+        def personGroupInstance = PersonGroup.get( params.id )
+
+        if(!personGroupInstance) {
+            flash.message = "PersonGroup not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else {
+            return [ personGroupInstance : personGroupInstance ]
+        }
+    }
+
+    def update = {
+        def personGroupInstance = PersonGroup.get( params.id )
+        if(personGroupInstance) {
+            personGroupInstance.properties = params
+            if(!personGroupInstance.hasErrors() && personGroupInstance.save()) {
+                flash.message = "PersonGroup ${params.id} updated"
+                redirect(action:show,id:personGroupInstance.id)
+            }
+            else {
+                render(view:'edit',model:[personGroupInstance:personGroupInstance])
+            }
+        }
+        else {
+            flash.message = "PersonGroup not found with id ${params.id}"
+            redirect(action:edit,id:params.id)
+        }
+    }
+
+    def create = {
+        def personGroupInstance = new PersonGroup()
+        personGroupInstance.properties = params
+        return ['personGroupInstance':personGroupInstance]
+    }
+
+    def save = {
+        def personGroupInstance = new PersonGroup(params)
+        if(!personGroupInstance.hasErrors() && personGroupInstance.save()) {
+            flash.message = "PersonGroup ${personGroupInstance.id} created"
+            redirect(action:show,id:personGroupInstance.id)
+        }
+        else {
+            render(view:'create',model:[personGroupInstance:personGroupInstance])
+        }
+    }
+}
Index: /branches/TaskRewrite/src/grails-app/controllers/PersonGroupTypeController.groovy
===================================================================
--- /branches/TaskRewrite/src/grails-app/controllers/PersonGroupTypeController.groovy	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/controllers/PersonGroupTypeController.groovy	(revision 59)
@@ -0,0 +1,83 @@
+@Secured(['ROLE_ADMIN'])
+class PersonGroupTypeController extends BaseController {
+
+    def index = { redirect(action:list,params:params) }
+
+    // the delete, save and update actions only accept POST requests
+    def allowedMethods = [delete:'POST', save:'POST', update:'POST']
+
+    def list = {
+        if(!params.max) params.max = 10
+        [ personGroupTypeInstanceList: PersonGroupType.list( params ) ]
+    }
+
+    def show = {
+        def personGroupTypeInstance = PersonGroupType.get( params.id )
+
+        if(!personGroupTypeInstance) {
+            flash.message = "PersonGroupType not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else { return [ personGroupTypeInstance : personGroupTypeInstance ] }
+    }
+
+    def delete = {
+        def personGroupTypeInstance = PersonGroupType.get( params.id )
+        if(personGroupTypeInstance) {
+            personGroupTypeInstance.delete()
+            flash.message = "PersonGroupType ${params.id} deleted"
+            redirect(action:list)
+        }
+        else {
+            flash.message = "PersonGroupType not found with id ${params.id}"
+            redirect(action:list)
+        }
+    }
+
+    def edit = {
+        def personGroupTypeInstance = PersonGroupType.get( params.id )
+
+        if(!personGroupTypeInstance) {
+            flash.message = "PersonGroupType not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else {
+            return [ personGroupTypeInstance : personGroupTypeInstance ]
+        }
+    }
+
+    def update = {
+        def personGroupTypeInstance = PersonGroupType.get( params.id )
+        if(personGroupTypeInstance) {
+            personGroupTypeInstance.properties = params
+            if(!personGroupTypeInstance.hasErrors() && personGroupTypeInstance.save()) {
+                flash.message = "PersonGroupType ${params.id} updated"
+                redirect(action:show,id:personGroupTypeInstance.id)
+            }
+            else {
+                render(view:'edit',model:[personGroupTypeInstance:personGroupTypeInstance])
+            }
+        }
+        else {
+            flash.message = "PersonGroupType not found with id ${params.id}"
+            redirect(action:edit,id:params.id)
+        }
+    }
+
+    def create = {
+        def personGroupTypeInstance = new PersonGroupType()
+        personGroupTypeInstance.properties = params
+        return ['personGroupTypeInstance':personGroupTypeInstance]
+    }
+
+    def save = {
+        def personGroupTypeInstance = new PersonGroupType(params)
+        if(!personGroupTypeInstance.hasErrors() && personGroupTypeInstance.save()) {
+            flash.message = "PersonGroupType ${personGroupTypeInstance.id} created"
+            redirect(action:show,id:personGroupTypeInstance.id)
+        }
+        else {
+            render(view:'create',model:[personGroupTypeInstance:personGroupTypeInstance])
+        }
+    }
+}
Index: /branches/TaskRewrite/src/grails-app/domain/Person.groovy
===================================================================
--- /branches/TaskRewrite/src/grails-app/domain/Person.groovy	(revision 58)
+++ /branches/TaskRewrite/src/grails-app/domain/Person.groovy	(revision 59)
@@ -1,6 +1,11 @@
 class Person {
 	static transients = ['pass']
-	static hasMany = [authorities: Authority]
-	static belongsTo = Authority
+    static hasMany = [authorities: Authority,
+                        personGroups: PersonGroup]
+//                         modifications: Modification,
+//                         entries: Entry,
+//                         tasks: Task]
+
+    static belongsTo = [Authority, PersonGroup]
 
 	String loginName
@@ -25,8 +30,8 @@
 
 	static constraints = {
-		loginName(blank: false, unique: true)
+		loginName(blank: false, unique: true)//minSize:7
 		firstName(blank: false)
         lastName(blank: false)
-		password(blank: false)
+		password(blank: false) //minSize:7
         employeeID(blank: true, nullable:true)
 	}
Index: /branches/TaskRewrite/src/grails-app/domain/PersonGroup.groovy
===================================================================
--- /branches/TaskRewrite/src/grails-app/domain/PersonGroup.groovy	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/domain/PersonGroup.groovy	(revision 59)
@@ -0,0 +1,17 @@
+class PersonGroup {
+    PersonGroupType personGroupType
+    String name
+    String description = ""
+    boolean isActive = true
+
+    static hasMany = [persons : Person]
+
+    static constraints = {
+        name(maxSize:50,unique:true,blank:false)
+        description(maxSize:100)
+    }
+
+    String toString() {
+        "${this.name}"
+    }
+}
Index: /branches/TaskRewrite/src/grails-app/domain/PersonGroupType.groovy
===================================================================
--- /branches/TaskRewrite/src/grails-app/domain/PersonGroupType.groovy	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/domain/PersonGroupType.groovy	(revision 59)
@@ -0,0 +1,16 @@
+class PersonGroupType {
+    String name
+    String description = ""
+    boolean isActive = true
+
+    static hasMany = [personGroups : PersonGroup]
+
+    static constraints = {
+        name(maxSize:50,unique:true,blank:false)
+        description(maxSize:100)
+    }
+
+    String toString() {
+        "${this.name}"
+    }
+}
Index: /branches/TaskRewrite/src/grails-app/views/_adminmenubar.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/_adminmenubar.gsp	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/views/_adminmenubar.gsp	(revision 59)
@@ -0,0 +1,15 @@
+<g:isLoggedIn>
+    <g:ifAnyGranted role="ROLE_ADMIN">
+        <span class="appControlButton">
+            <g:link controller="appCore" action="admin">
+                Admin
+            </g:link>
+        </span>
+    </g:ifAnyGranted>
+    <span class="appControlButton">
+        <g:link controller="logout">
+                Log out
+        </g:link>
+    </span>
+</g:isLoggedIn>
+
Index: /branches/TaskRewrite/src/grails-app/views/appCore/admin.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/appCore/admin.gsp	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/views/appCore/admin.gsp	(revision 59)
@@ -0,0 +1,25 @@
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Admin</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link controller="person" action="create">New Person</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Welcome to Admin</h1>
+            <br/>
+            <div class="dialog">
+                <ul>
+                <g:each var="c" in="${grailsApplication.controllerClasses}">
+                        <li class="controller"><g:link
+    controller="${c.logicalPropertyName}">${c.fullName}</g:link></li>
+                </g:each>
+                </ul>
+            </div>
+        </div>
+    </body>
+</html>
Index: /branches/TaskRewrite/src/grails-app/views/appCore/create.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/appCore/create.gsp	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/views/appCore/create.gsp	(revision 59)
@@ -0,0 +1,38 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Create AppCore</title>         
+    </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">AppCore List</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Create AppCore</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${appCoreInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${appCoreInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form action="save" method="post" >
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><input class="save" type="submit" value="Create" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: /branches/TaskRewrite/src/grails-app/views/appCore/edit.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/appCore/edit.gsp	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/views/appCore/edit.gsp	(revision 59)
@@ -0,0 +1,41 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Edit AppCore</title>
+    </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">AppCore List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New AppCore</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Edit AppCore</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${appCoreInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${appCoreInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form method="post" >
+                <input type="hidden" name="id" value="${appCoreInstance?.id}" />
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><g:actionSubmit class="save" value="Update" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: /branches/TaskRewrite/src/grails-app/views/appCore/home.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/appCore/home.gsp	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/views/appCore/home.gsp	(revision 59)
@@ -0,0 +1,25 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html;
+      charset=UTF-8"/>
+<meta name="layout" content="main" />
+<title>Home</title>
+</head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><g:link class="list" controller="task" action="list">Tasks</g:link></span>
+
+        </div>
+        <div class="body">
+            <g:if test="${flash.message}">
+                <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${person}">
+                <div class="errors">
+                    <g:renderErrors bean="${person}" as="list" />
+                </div>
+            </g:hasErrors>
+            
+        </div>
+    </body>
+</html>
Index: /branches/TaskRewrite/src/grails-app/views/appCore/list.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/appCore/list.gsp	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/views/appCore/list.gsp	(revision 59)
@@ -0,0 +1,44 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>AppCore List</title>
+    </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 AppCore</g:link></span>
+        </div>
+        <div class="body">
+            <h1>AppCore 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" />
+                        
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <g:each in="${appCoreInstanceList}" status="i" var="appCoreInstance">
+                        <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                        
+                            <td><g:link action="show" id="${appCoreInstance.id}">${fieldValue(bean:appCoreInstance, field:'id')}</g:link></td>
+                        
+                        </tr>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+            <div class="paginateButtons">
+                <g:paginate total="${AppCore.count()}" />
+            </div>
+        </div>
+    </body>
+</html>
Index: /branches/TaskRewrite/src/grails-app/views/appCore/show.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/appCore/show.gsp	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/views/appCore/show.gsp	(revision 59)
@@ -0,0 +1,44 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Show AppCore</title>
+    </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">AppCore List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New AppCore</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Show AppCore</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="dialog">
+                <table>
+                    <tbody>
+
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Id:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:appCoreInstance, field:'id')}</td>
+                            
+                        </tr>
+                    
+                    </tbody>
+                </table>
+            </div>
+            <div class="buttons">
+                <g:form>
+                    <input type="hidden" name="id" value="${appCoreInstance?.id}" />
+                    <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </g:form>
+            </div>
+        </div>
+    </body>
+</html>
Index: /branches/TaskRewrite/src/grails-app/views/authority/create.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/authority/create.gsp	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/views/authority/create.gsp	(revision 59)
@@ -0,0 +1,51 @@
+<head>
+	<meta name="layout" content="main" />
+	<title>Create Authority</title>
+</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">Authority List</g:link></span>
+	</div>
+
+	<div class="body">
+
+		<h1>Create Authority</h1>
+		<g:if test="${flash.message}">
+		<div class="message">${flash.message}</div>
+		</g:if>
+		<g:hasErrors bean="${authority}">
+		<div class="errors">
+		<g:renderErrors bean="${authority}" as="list" />
+		</div>
+		</g:hasErrors>
+
+		<g:form action="save">
+		<div class="dialog">
+		<table>
+		<tbody>
+			<tr class="prop">
+				<td valign="top" class="name"><label for="authority">Authority Name:</label></td>
+				<td valign="top" class="value ${hasErrors(bean:authority,field:'authority','errors')}">
+					<input type="text" id="authority" name="authority" value="${authority?.authority?.encodeAsHTML()}"/>
+				</td>
+			</tr>
+
+			<tr class="prop">
+				<td valign="top" class="name"><label for="description">Description:</label></td>
+				<td valign="top" class="value ${hasErrors(bean:authority,field:'description','errors')}">
+					<input type="text" id="description" name="description" value="${authority?.description?.encodeAsHTML()}"/>
+				</td>
+			</tr>
+		</tbody>
+		</table>
+		</div>
+
+		<div class="buttons">
+			<span class="button"><input class="save" type="submit" value="Create" /></span>
+		</div>
+		</g:form>
+	</div>
+</body>
Index: /branches/TaskRewrite/src/grails-app/views/authority/edit.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/authority/edit.gsp	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/views/authority/edit.gsp	(revision 59)
@@ -0,0 +1,69 @@
+<head>
+	<meta name="layout" content="main" />
+	<title>Edit Authority</title>
+</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">Authority List</g:link></span>
+		<span class="menuButton"><g:link class="create" action="create">New Authority</g:link></span>
+	</div>
+
+	<div class="body">
+		<h1>Edit Authority</h1>
+		<g:if test="${flash.message}">
+		<div class="message">${flash.message}</div>
+		</g:if>
+		<g:hasErrors bean="${authority}">
+		<div class="errors">
+			<g:renderErrors bean="${authority}" as="list" />
+		</div>
+		</g:hasErrors>
+		<div class="prop">
+			<span class="name">ID:</span>
+			<span class="value">${authority.id}</span>
+		</div>
+		<g:form>
+			<input type="hidden" name="id" value="${authority.id}" />
+			<input type="hidden" name="version" value="${authority.version}" />
+			<div class="dialog">
+			<table>
+			<tbody>
+				<tr class="prop">
+					<td valign="top" class="name"><label for="authority">Authority Name:</label></td>
+					<td valign="top" class="value ${hasErrors(bean:authority,field:'authority','errors')}">
+						<input type="text" id="authority" name="authority" value="${authority.authority?.encodeAsHTML()}"/>
+					</td>
+				</tr>
+
+				<tr class="prop">
+					<td valign="top" class="name"><label for="description">Description:</label></td>
+					<td valign="top" class="value ${hasErrors(bean:authority,field:'description','errors')}">
+						<input type="text" id="description" name="description" value="${authority.description?.encodeAsHTML()}"/>
+					</td>
+				</tr>
+
+				<tr class="prop">
+					<td valign="top" class="name"><label for="persons">Persons:</label></td>
+					<td valign="top" class="value ${hasErrors(bean:authority,field:'persons','errors')}">
+						<ul>
+						<g:each var="p" in="${authority.persons?}">
+							<li>${p}</li>
+						</g:each>
+						</ul>
+					</td>
+				</tr>
+			</tbody>
+			</table>
+			</div>
+
+			<div class="buttons">
+				<span class="button"><g:actionSubmit class="save" value="Update" /></span>
+				<span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+			</div>
+
+		</g:form>
+	</div>
+</body>
Index: /branches/TaskRewrite/src/grails-app/views/authority/list.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/authority/list.gsp	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/views/authority/list.gsp	(revision 59)
@@ -0,0 +1,49 @@
+<head>
+	<meta name="layout" content="main" />
+	<title>Authority List</title>
+</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 Authority</g:link></span>
+	</div>
+
+	<div class="body">
+		<h1>Authority 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="authority" title="Authority Name" />
+					<g:sortableColumn property="description" title="Description" />
+					<th>&nbsp;</th>
+				</tr>
+			</thead>
+			<tbody>
+			<g:each in="${authorityList}" status="i" var="authority">
+				<tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+					<td>${authority.id}</td>
+					<td>${authority.authority?.encodeAsHTML()}</td>
+					<td>${authority.description?.encodeAsHTML()}</td>
+					<td class="actionButtons">
+						<span class="actionButton">
+							<g:link action="show" id="${authority.id}">Show</g:link>
+						</span>
+					</td>
+				</tr>
+			</g:each>
+			</tbody>
+			</table>
+		</div>
+
+		<div class="paginateButtons">
+			<g:paginate total="${Authority.count()}" />
+		</div>
+	</div>
+</body>
Index: /branches/TaskRewrite/src/grails-app/views/authority/show.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/authority/show.gsp	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/views/authority/show.gsp	(revision 59)
@@ -0,0 +1,57 @@
+<head>
+	<meta name="layout" content="main" />
+	<title>Show Authority</title>
+</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">Authority List</g:link></span>
+		<span class="menuButton"><g:link class="create" action="create">New Authority</g:link></span>
+	</div>
+
+	<div class="body">
+		<h1>Show Authority</h1>
+		<g:if test="${flash.message}">
+		<div class="message">${flash.message}</div>
+		</g:if>
+		<div class="dialog">
+			<table>
+			<tbody>
+
+				<tr class="prop">
+					<td valign="top" class="name">ID:</td>
+					<td valign="top" class="value">${authority.id}</td>
+				</tr>
+
+				<tr class="prop">
+					<td valign="top" class="name">Authority Name:</td>
+					<td valign="top" class="value">${authority.authority}</td>
+				</tr>
+
+				<tr class="prop">
+					<td valign="top" class="name">Description:</td>
+					<td valign="top" class="value">${authority.description}</td>
+				</tr>
+
+				<tr class="prop">
+					<td valign="top" class="name">Persons:</td>
+					<td valign="top" class="value">${authority.persons}</td>
+				</tr>
+
+			</tbody>
+			</table>
+		</div>
+
+		<div class="buttons">
+			<g:form>
+				<input type="hidden" name="id" value="${authority?.id}" />
+				<span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
+				<span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+			</g:form>
+		</div>
+
+	</div>
+
+</body>
Index: /branches/TaskRewrite/src/grails-app/views/layouts/main.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/layouts/main.gsp	(revision 58)
+++ /branches/TaskRewrite/src/grails-app/views/layouts/main.gsp	(revision 59)
@@ -1,16 +1,37 @@
 <html>
     <head>
-        <title><g:layoutTitle default="Grails" /></title>
+        <title><g:layoutTitle default="gnuMims" /></title>
         <link rel="stylesheet" href="${createLinkTo(dir:'css',file:'main.css')}" />
-        <link rel="shortcut icon" href="${createLinkTo(dir:'images',file:'favicon.ico')}" type="image/x-icon" />
+        <link rel="shortcut icon" href="${createLinkTo(dir:'images',file:'gnuMimsIcon.ico')}" type="image/x-icon" />
         <g:layoutHead />
-        <g:javascript library="application" />				
+        <g:javascript library="application" />
     </head>
     <body>
+    <div id="wrapper" style="height: 100%;">
+    <div id="top">
+    </div>
+    <div id="content" align="center">
         <div id="spinner" class="spinner" style="display:none;">
-            <img src="${createLinkTo(dir:'images',file:'spinner.gif')}" alt="Spinner" />
+            <img src="${createLinkTo(dir:'images',file:'spinner.png')}" alt="Spinner" />
         </div>	
-        <div class="logo"><img src="${createLinkTo(dir:'images',file:'grails_logo.jpg')}" alt="Grails" /></div>	
-        <g:layoutBody />		
+        <!-- <div class="logo" style="text-align: center; width: 980px; height: 220px">
+          <img src="${createLinkTo(dir:'images',file:'logo.png')}"
+        alt="gnuMims" />
+        <g:render template="/adminmenubar" />
+
+        </div> -->
+        <div id="Header">
+        </div>
+        <div class="appControl">
+            <g:render template="/adminmenubar" />
+        </div>
+        <!-- Body wrapper div for IE -->
+        <div style="text-align: center; width: 980px">
+            <g:layoutBody />
+        </div>
+    </div>
+    <div id="bottom">
+    </div>
+    </div>
     </body>	
 </html>
Index: /branches/TaskRewrite/src/grails-app/views/login/auth.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/login/auth.gsp	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/views/login/auth.gsp	(revision 59)
@@ -0,0 +1,82 @@
+<head>
+<meta name='layout' content='main' />
+<title>Login</title>
+<style type='text/css' media='screen'>
+#login {
+	margin:15px 0px; padding:0px;
+	text-align:center;
+}
+#login .inner {
+	width:260px;
+	margin:0px auto;
+	text-align:left;
+	padding:10px;
+/*	border-top:1px dashed #499ede;
+	border-bottom:1px dashed #499ede;*/
+/*	background-color:#EEF;*/
+}
+#login .inner .fheader {
+	padding:4px;margin:3px 0px 3px 0;color:#2e3741;font-size:14px;font-weight:bold;
+}
+#login .inner .cssform p {
+	clear: left;
+	margin: 0;
+	padding: 5px 0 8px 0;
+	padding-left: 105px;
+/*	border-top: 1px dashed gray;*/
+	margin-bottom: 10px;
+	height: 1%;
+}
+#login .inner .cssform input[type='text'] {
+	width: 120px;
+}
+#login .inner .cssform label {
+	font-weight: bold;
+	float: left;
+	margin-left: -105px;
+	width: 100px;
+}
+#login .inner .login_message {color:red;}
+#login .inner .text_ {width:120px;}
+#login .inner .chk {height:12px;}
+</style>
+</head>
+
+<body>
+	<div id='login'>
+        <h1>Welcome to gnuMims please log in</h1>
+        The demo users are "admin" and "user" both having password "pass"
+
+		<div class='inner'>
+			<g:if test='${flash.message}'>
+			<div class='login_message'>${flash.message}</div>
+			</g:if>
+			<div class='fheader'></div>
+			<form action='${postUrl}' method='POST' id='loginForm' class='cssform'>
+				<p>
+					<label for='j_username'>Login ID</label>
+					<input type='text' class='text_' name='j_username' id='j_username' value='${request.remoteUser}' />
+				</p>
+				<p>
+					<label for='j_password'>Password</label>
+					<input type='password' class='text_' name='j_password' id='j_password' />
+				</p>
+<!--				<p>
+					<label for='remember_me'>Remember me</label>
+					<input type='checkbox' class='chk' name='_spring_security_remember_me' id='remember_me'
+					<g:if test='${hasCookie}'>checked='checked'</g:if> />
+				</p>-->
+				<p>
+					<input type='submit' value='Login' />
+				</p>
+			</form>
+		</div>
+	</div>
+<script type='text/javascript'>
+<!--
+(function(){
+	document.forms['loginForm'].elements['j_username'].focus();
+})();
+// -->
+</script>
+</body>
Index: /branches/TaskRewrite/src/grails-app/views/login/denied.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/login/denied.gsp	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/views/login/denied.gsp	(revision 59)
@@ -0,0 +1,6 @@
+<meta name='layout' content='main' />
+<title>Denied</title>
+
+<div class='body'>
+	<div class='errors'>Sorry, you're not authorized to view this page.</div>
+</div>
Index: /branches/TaskRewrite/src/grails-app/views/login/openIdAuth.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/login/openIdAuth.gsp	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/views/login/openIdAuth.gsp	(revision 59)
@@ -0,0 +1,67 @@
+<head>
+<meta name='layout' content='main' />
+<title>Login</title>
+<style type='text/css' media='screen'>
+#login {
+	margin:15px 0px; padding:0px;
+	text-align:center;
+}
+#login .inner {
+	width:260px;
+	margin:0px auto;
+	text-align:left;
+	padding:10px;
+	border-top:1px dashed #499ede;
+	border-bottom:1px dashed #499ede;
+	background-color:#EEF;
+}
+#login .inner .fheader {
+	padding:4px;margin:3px 0px 3px 0;color:#2e3741;font-size:14px;font-weight:bold;
+}
+#login .inner .cssform p{
+	clear: left;
+	margin: 0;
+	padding: 5px 0 8px 0;
+	padding-left: 105px;
+	border-top: 1px dashed gray;
+	margin-bottom: 10px;
+	height: 1%;
+}
+#login .inner .cssform input[type='text']{ 
+	width: 120px;
+}
+#login .inner .cssform label{
+	font-weight: bold;
+	float: left;
+	margin-left: -105px; 
+	width: 100px;
+}
+#login .inner .login_message {color:red;}
+#login .inner .text_ {width:120px;}
+</style>
+</head>
+
+<body>
+	<div id='login'>
+		<div class='inner'>
+			<g:if test='${flash.message}'>
+			<div class='login_message'>${flash.message}</div>
+			</g:if>
+			<div class='fheader'>Please Login..</div>
+			<form action='${postUrl}' method='POST' id='loginForm' class='cssform'>
+				<p>
+					<label for='j_username'>OpenID Identity</label>
+					<input type='text' class='text_' name='j_username' />
+				</p>
+				<p>
+					<input type='submit' value='Login' />
+				</p>
+			</form>
+		</div>
+	</div>
+<script type='text/javascript'>
+(function(){
+	document.forms['loginForm'].elements['j_username'].focus();
+})();
+</script>
+</body>
Index: /branches/TaskRewrite/src/grails-app/views/person/create.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/person/create.gsp	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/views/person/create.gsp	(revision 59)
@@ -0,0 +1,114 @@
+<head>
+	<meta name="layout" content="main" />
+	<title>Create Person</title>
+</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">Person List</g:link></span>
+	</div>
+
+	<div class="body">
+		<h1>Create Person</h1>
+		<g:if test="${flash.message}">
+		<div class="message">${flash.message}</div>
+		</g:if>
+		<g:hasErrors bean="${person}">
+		<div class="errors">
+			<g:renderErrors bean="${person}" as="list" />
+		</div>
+		</g:hasErrors>
+		<g:form action="save">
+			<div class="dialog">
+				<table>
+				<tbody>
+
+					<tr class="prop">
+						<td valign="top" class="name"><label for="loginName">Login Name:</label></td>
+						<td valign="top" class="value ${hasErrors(bean:person,field:'loginName','errors')}">
+							<input type="text" id="loginName" name="loginName" value="${person.loginName?.encodeAsHTML()}"/>
+						</td>
+					</tr>
+
+					<tr class="prop">
+						<td valign="top" class="name"><label for="firstName">First Name:</label></td>
+						<td valign="top" class="value ${hasErrors(bean:person,field:'firstName','errors')}">
+							<input type="text" id="firstName" name="firstName" value="${person.firstName?.encodeAsHTML()}"/>
+						</td>
+					</tr>
+
+                    <tr class="prop">
+                        <td valign="top" class="name"><label for="lastName">Last Name:</label></td>
+                        <td valign="top" class="value ${hasErrors(bean:person,field:'lastName','errors')}">
+                            <input type="text" id="lastName" name="lastName" value="${person.lastName?.encodeAsHTML()}"/>
+                        </td>
+                    </tr>
+
+
+					<tr class="prop">
+						<td valign="top" class="name"><label for="password">Password:</label></td>
+						<td valign="top" class="value ${hasErrors(bean:person,field:'password','errors')}">
+							<input type="password" id="password" name="password" value="${person.password?.encodeAsHTML()}"/>
+						</td>
+					</tr>
+
+					<tr class="prop">
+						<td valign="top" class="name"><label for="isActive">isActive:</label></td>
+						<td valign="top" class="value ${hasErrors(bean:person,field:'isActive','errors')}">
+							<g:checkBox name="isActive" value="${person.isActive}" ></g:checkBox>
+						</td>
+					</tr>
+
+					<tr class="prop">
+						<td valign="top" class="name"><label for="description">Description:</label></td>
+						<td valign="top" class="value ${hasErrors(bean:person,field:'description','errors')}">
+							<input type="text" id="description" name="description" value="${person.description?.encodeAsHTML()}"/>
+						</td>
+					</tr>
+
+					<tr class="prop">
+						<td valign="top" class="name"><label for="email">Email:</label></td>
+						<td valign="top" class="value ${hasErrors(bean:person,field:'email','errors')}">
+							<input type="text" id="email" name="email" value="${person.email?.encodeAsHTML()}"/>
+						</td>
+					</tr>
+
+					<tr class="prop">
+						<td valign="top" class="name"><label for="emailShow">Show Email:</label></td>
+						<td valign="top" class="value ${hasErrors(bean:person,field:'emailShow','errors')}">
+							<g:checkBox name="emailShow" value="${person.emailShow}"/>
+						</td>
+					</tr>
+
+                    <tr class="prop">
+                        <td valign="top" class="name"><label for="employeeID">employee ID:</label></td>
+                        <td valign="top" class="value ${hasErrors(bean:person,field:'employeeID','errors')}">
+                            <input type="text" id="employeeID" name="employeeID" value="${person.employeeID?.encodeAsHTML()}"/>
+                        </td>
+                    </tr>
+
+					<tr class="prop">
+						<td valign="top" class="name" align="left">Assign Roles:</td>
+					</tr>
+
+					<g:each in="${authorityList}">
+					<tr>
+						<td valign="top" class="name" align="left">${it.authority.encodeAsHTML()}</td>
+						<td align="left"><g:checkBox name="${it.authority}"/></td>
+					</tr>
+					</g:each>
+
+				</tbody>
+				</table>
+			</div>
+
+			<div class="buttons">
+				<span class="button"><input class="save" type="submit" value="Create" /></span>
+			</div>
+
+		</g:form>
+
+	</div>
+</body>
Index: /branches/TaskRewrite/src/grails-app/views/person/edit.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/person/edit.gsp	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/views/person/edit.gsp	(revision 59)
@@ -0,0 +1,125 @@
+<head>
+	<meta name="layout" content="main" />
+	<title>Edit Person</title>
+</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">Person List</g:link></span>
+		<span class="menuButton"><g:link class="create" action="create">New Person</g:link></span>
+	</div>
+
+	<div class="body">
+		<h1>Edit Person</h1>
+		<g:if test="${flash.message}">
+		<div class="message">${flash.message}</div>
+		</g:if>
+		<g:hasErrors bean="${person}">
+		<div class="errors">
+			<g:renderErrors bean="${person}" as="list" />
+		</div>
+		</g:hasErrors>
+
+		<div class="prop">
+			<span class="name">ID:</span>
+			<span class="value">${person.id}</span>
+		</div>
+
+		<g:form>
+			<input type="hidden" name="id" value="${person.id}" />
+			<input type="hidden" name="version" value="${person.version}" />
+			<div class="dialog">
+				<table>
+				<tbody>
+
+					<tr class="prop">
+						<td valign="top" class="name"><label for="loginName">Login Name:</label></td>
+						<td valign="top" class="value ${hasErrors(bean:person,field:'loginName','errors')}">
+							<input type="text" id="loginName" name="loginName" value="${person.loginName?.encodeAsHTML()}"/>
+						</td>
+					</tr>
+
+					<tr class="prop">
+						<td valign="top" class="name"><label for="firstName">Full Name:</label></td>
+						<td valign="top" class="value ${hasErrors(bean:person,field:'firstName','errors')}">
+							<input type="text" id="firstName" name="firstName" value="${person.firstName?.encodeAsHTML()}"/>
+						</td>
+					</tr>
+
+                    <tr class="prop">
+                        <td valign="top" class="name"><label for="lastName">Full Name:</label></td>
+                        <td valign="top" class="value ${hasErrors(bean:person,field:'lastName','errors')}">
+                            <input type="text" id="lastName" name="lastName" value="${person.lastName?.encodeAsHTML()}"/>
+                        </td>
+                    </tr>
+
+					<tr class="prop">
+						<td valign="top" class="name"><label for="password">Password:</label></td>
+						<td valign="top" class="value ${hasErrors(bean:person,field:'password','errors')}">
+							<input type="password" id="password" name="password" value="${person.password?.encodeAsHTML()}"/>
+						</td>
+					</tr>
+
+					<tr class="prop">
+						<td valign="top" class="name"><label for="isActive">isActive:</label></td>
+						<td valign="top" class="value ${hasErrors(bean:person,field:'isActive','errors')}">
+							<g:checkBox name="isActive" value="${person.isActive}"/>
+						</td>
+					</tr>
+
+					<tr class="prop">
+						<td valign="top" class="name"><label for="description">Description:</label></td>
+						<td valign="top" class="value ${hasErrors(bean:person,field:'description','errors')}">
+							<input type="text" id="description" name="description" value="${person.description?.encodeAsHTML()}"/>
+						</td>
+					</tr>
+
+					<tr class="prop">
+						<td valign="top" class="name"><label for="email">Email:</label></td>
+						<td valign="top" class="value ${hasErrors(bean:person,field:'email','errors')}">
+							<input type="text" id="email" name="email" value="${person?.email?.encodeAsHTML()}"/>
+						</td>
+					</tr>
+
+					<tr class="prop">
+						<td valign="top" class="name"><label for="emailShow">Show Email:</label></td>
+						<td valign="top" class="value ${hasErrors(bean:person,field:'emailShow','errors')}">
+							<g:checkBox name="emailShow" value="${person.emailShow}"/>
+						</td>
+					</tr>
+
+                    <tr class="prop">
+                        <td valign="top" class="name"><label for="employeeID">employee ID:</label></td>
+                        <td valign="top" class="value ${hasErrors(bean:person,field:'employeeID','errors')}">
+                            <input type="text" id="employeeID" name="employeeID" value="${person.employeeID?.encodeAsHTML()}"/>
+                        </td>
+                    </tr>
+
+					<tr class="prop">
+						<td valign="top" class="name"><label for="authorities">Authorities:</label></td>
+						<td valign="top" class="value ${hasErrors(bean:person,field:'authorities','errors')}">
+							<ul>
+							<g:each var="entry" in="${roleMap}">
+								<li>${entry.key.authority.encodeAsHTML()}
+									<g:checkBox name="${entry.key.authority}" value="${entry.value}"/>
+								</li>
+							</g:each>
+							</ul>
+						</td>
+					</tr>
+
+				</tbody>
+				</table>
+			</div>
+
+			<div class="buttons">
+				<span class="button"><g:actionSubmit class="save" value="Update" /></span>
+				<span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+			</div>
+
+		</g:form>
+
+	</div>
+</body>
Index: /branches/TaskRewrite/src/grails-app/views/person/list.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/person/list.gsp	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/views/person/list.gsp	(revision 59)
@@ -0,0 +1,60 @@
+<head>
+	<meta name="layout" content="main" />
+	<title>Person List</title>
+</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="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>
+                    <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>
+				</tr>
+			</g:each>
+			</tbody>
+			</table>
+		</div>
+
+		<div class="paginateButtons">
+			<g:paginate total="${Person.count()}" />
+		</div>
+
+	</div>
+</body>
Index: /branches/TaskRewrite/src/grails-app/views/person/show.gsp
===================================================================
--- /branches/TaskRewrite/src/grails-app/views/person/show.gsp	(revision 59)
+++ /branches/TaskRewrite/src/grails-app/views/person/show.gsp	(revision 59)
@@ -0,0 +1,92 @@
+<head>
+	<meta name="layout" content="main" />
+	<title>Show Person</title>
+</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">Person List</g:link></span>
+		<span class="menuButton"><g:link class="create" action="create">New Person</g:link></span>
+	</div>
+
+	<div class="body">
+		<h1>Show Person</h1>
+		<g:if test="${flash.message}">
+		<div class="message">${flash.message}</div>
+		</g:if>
+		<div class="dialog">
+			<table>
+			<tbody>
+
+				<tr class="prop">
+					<td valign="top" class="name">ID:</td>
+					<td valign="top" class="value">${person.id}</td>
+				</tr>
+
+				<tr class="prop">
+					<td valign="top" class="name">Login Name:</td>
+					<td valign="top" class="value">${person.loginName?.encodeAsHTML()}</td>
+				</tr>
+
+				<tr class="prop">
+					<td valign="top" class="name">First Name:</td>
+					<td valign="top" class="value">${person.firstName?.encodeAsHTML()}</td>
+				</tr>
+
+                <tr class="prop">
+                    <td valign="top" class="name">Last Name:</td>
+                    <td valign="top" class="value">${person.lastName?.encodeAsHTML()}</td>
+                </tr>
+
+				<tr class="prop">
+					<td valign="top" class="name">isActive:</td>
+					<td valign="top" class="value">${person.isActive}</td>
+				</tr>
+
+				<tr class="prop">
+					<td valign="top" class="name">Description:</td>
+					<td valign="top" class="value">${person.description?.encodeAsHTML()}</td>
+				</tr>
+
+				<tr class="prop">
+					<td valign="top" class="name">Email:</td>
+					<td valign="top" class="value">${person.email?.encodeAsHTML()}</td>
+				</tr>
+
+				<tr class="prop">
+					<td valign="top" class="name">Show Email:</td>
+					<td valign="top" class="value">${person.emailShow}</td>
+				</tr>
+
+                <tr class="prop">
+                    <td valign="top" class="name">Employee ID:</td>
+                    <td valign="top" class="value">${person.employeeID}</td>
+                </tr>
+
+				<tr class="prop">
+					<td valign="top" class="name">Authorities:</td>
+					<td valign="top" class="value">
+						<ul>
+						<g:each in="${roleNames}" var='name'>
+							<li>${name}</li>
+						</g:each>
+						</ul>
+					</td>
+				</tr>
+
+			</tbody>
+			</table>
+		</div>
+
+		<div class="buttons">
+			<g:form>
+				<input type="hidden" name="id" value="${person.id}" />
+				<span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
+				<span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+			</g:form>
+		</div>
+
+	</div>
+</body>
Index: /branches/TaskRewrite/src/web-app/css/main.css
===================================================================
--- /branches/TaskRewrite/src/web-app/css/main.css	(revision 58)
+++ /branches/TaskRewrite/src/web-app/css/main.css	(revision 59)
@@ -2,4 +2,5 @@
     margin: 0;
     /*padding: 0; SELECT NOT DISPLAYED CORRECTLY IN FIREFOX */
+
 }
 
@@ -13,7 +14,34 @@
 
 body {
+    text-align: center; 
+    width: 980px
     background: #fff;
     color: #333;
     font: 11px verdana, arial, helvetica, sans-serif;
+    background: transparent url("../images/brushed_metal.png") repeat fixed center;
+}
+
+#wrapper {
+  margin: 0 auto;
+  padding: 0;
+  width: 1024px;
+}
+
+#top {
+  background: url("../images/topBg.png") no-repeat scroll center;
+  width: 1020px;
+  height: 44px;
+}
+
+#content {
+  padding: 0px 20px 20px;
+  background: url("../images/Contentbg.png") repeat-y scroll center;
+  width: 980px;
+}
+
+#Header {
+  background: transparent url("../images/logo.png") no-repeat scroll center;
+  width: 980px;
+  height: 160px;
 }
 
@@ -22,5 +50,5 @@
     font-weight: bold;
     text-decoration: none;
-} 
+}
 
 h1 {
@@ -28,9 +56,9 @@
     font-weight: normal;
     font-size: 16px;
-    margin: .8em 0 .3em 0;
+    margin: 0 0 .3em 0;
 }
 
 ul {
-    padding-left: 15px;	
+    padding-left: 15px;
 }
 
@@ -56,6 +84,19 @@
 
 .body {
-    float: left;
-    margin: 0 15px 10px 15px;
+    padding: 0px 20px 20px;
+    background: url("../images/Contentbg.png") repeat-y scroll center;
+    height: 100%;
+}
+
+/* Login/out and Admin*/
+
+.appcontrol {
+    text-align: right;
+    padding: 5px 160px 5px 5px
+}
+
+.appcontrolButton {
+    font-size: 10px;
+    padding: 5px 5px;
 }
 
@@ -63,10 +104,20 @@
 
 .nav {
-    background: #fff url(../images/skin/shadow.jpg) bottom repeat-x;
-    border: 1px solid #ccc;
-    border-style: solid none solid none;	
-    margin-top: 5px;
-    padding: 7px 12px;
-}
+    text-align: centre;
+    background: url("../images/linkPanel_long.png") top no-repeat;
+    /*border: 1px solid #ccc;
+    border-style: solid none solid none;*/
+    padding: 15px 0px 0px 0px;
+    width: 980px;
+    height: 40px;
+}
+
+/*.nav a{
+    background: url("../images/linkPanel.png") no-repeat top;
+    display: inline-block;
+    width: 140px;
+    height: 40px;
+    text-decoration: none;
+}*/
 
 .menuButton {
@@ -76,20 +127,20 @@
 .menuButton a {
     color: #333;
-    padding: 4px 6px;
+    padding: 14px 25px;
 }
 .menuButton a.home {
-    background: url(../images/skin/house.png) center left no-repeat;
-    color: #333;
-    padding-left: 25px;
+    /*background: url(../images/skin/house.png) center left no-repeat;*/
+    color: #333;
+    /*padding: 25px;*/
 }
 .menuButton a.list {
-    background: url(../images/skin/database_table.png) center left no-repeat;
-    color: #333;
-    padding-left: 25px;
+    /*background: url(../images/skin/database_table.png) center left no-repeat;*/
+    color: #333;
+    /*padding-left: 25px;*/
 }
 .menuButton a.create {
-    background: url(../images/skin/database_add.png) center left no-repeat;
-    color: #333;
-    padding-left: 25px;
+    /*background: url(../images/skin/database_add.png) center left no-repeat;*/
+    color: #333;
+    /*padding-left: 25px;*/
 }
 
@@ -101,5 +152,5 @@
     color: #006dba;
     margin: 10px 0 5px 0;
-    padding: 5px 5px 5px 30px
+    padding: 5px 5px 5px 0px
 }
 
@@ -113,5 +164,5 @@
 div.errors ul {
     list-style: none;
-    padding: 0;	
+    padding: 0;
 }
 div.errors li {
@@ -137,5 +188,5 @@
     border: 0;
 }
-td, th { 
+td, th {
     font: 11px verdana, arial, helvetica, sans-serif;
     line-height: 12px;
@@ -266,2 +317,8 @@
     padding-left: 28px;
 }
+
+#bottom {
+  background: url("../images/bottomBg.png") no-repeat scroll center;
+  width: 1020px;
+  height: 100px;
+}
Index: /branches/TaskRewrite/src/web-app/index.gsp
===================================================================
--- /branches/TaskRewrite/src/web-app/index.gsp	(revision 58)
+++ /branches/TaskRewrite/src/web-app/index.gsp	(revision 59)
@@ -1,20 +1,1 @@
-<html>
-    <head>
-        <title>Welcome to Grails</title>
-		<meta name="layout" content="main" />
-    </head>
-    <body>
-        <h1 style="margin-left:20px;">Welcome to Grails</h1>
-        <p style="margin-left:20px;width:80%">Congratulations, you have successfully started your first Grails application! At the moment
-        this is the default page, feel free to modify it to either redirect to a controller or display whatever
-        content you may choose. Below is a list of controllers that are currently deployed in this application,
-        click on each to execute its default action:</p>
-        <div class="dialog" style="margin-left:20px;width:60%;">
-            <ul>
-              <g:each var="c" in="${grailsApplication.controllerClasses}">
-                    <li class="controller"><g:link controller="${c.logicalPropertyName}">${c.fullName}</g:link></li>
-              </g:each>
-            </ul>
-        </div>
-    </body>
-</html>
+<%response.sendRedirect(request.getContextPath()+'/appCore/home')%>