Index: trunk/src/grails-app/conf/BootStrap.groovy
===================================================================
--- trunk/src/grails-app/conf/BootStrap.groovy	(revision 43)
+++ trunk/src/grails-app/conf/BootStrap.groovy	(revision 44)
@@ -43,5 +43,5 @@
             
         //Person
-        new Person(personGroup:PersonGroup.get(1),
+        new Person(personGroup:PersonGroup.get(3),
             firstName:"Admin",
             lastName:"Powers",
@@ -49,6 +49,6 @@
             password:"pass").save()
         new Person(personGroup:PersonGroup.get(1),
-            firstName:"User",
-            lastName:"Tester",
+            firstName:"Demo",
+            lastName:"Danza",
             userId:"user",
             password:"pass").save()
Index: trunk/src/grails-app/controllers/PersonController.groovy
===================================================================
--- trunk/src/grails-app/controllers/PersonController.groovy	(revision 43)
+++ trunk/src/grails-app/controllers/PersonController.groovy	(revision 44)
@@ -92,7 +92,9 @@
             if (person) {
                     session.userId = person.userId
+                    def greeting = "Hi "+person.firstName+" "+person.lastName
                     def redirectParams = 
                         session.originalRequestParams ?
                         session.originalRequestParams : [controller:'task']
+        flash['message'] = "${greeting}"
                     redirect(redirectParams)
             }
Index: trunk/src/grails-app/views/_adminmenubar.gsp
===================================================================
--- trunk/src/grails-app/views/_adminmenubar.gsp	(revision 43)
+++ trunk/src/grails-app/views/_adminmenubar.gsp	(revision 44)
@@ -1,16 +1,13 @@
 <g:if test="${session.userId}">
-    <span class="appControlButton">
-        <g:link controller="task" action="list">
-                Task
-        </g:link>
-    </span>
-    <span class="appControlButton">
-        <g:link controller="person" action="admin">
+    <g:if test="${session.userId == 'admin'}">
+        <span class="appControlButton">
+            <g:link controller="person" action="admin">
                 Admin
-        </g:link>
-    </span>
+            </g:link>
+        </span>
+    </g:if>
     <span class="appControlButton">
         <g:link controller="person" action="logout">
-               Log out
+                Log out
         </g:link>
     </span>
Index: trunk/src/grails-app/views/layouts/main.gsp
===================================================================
--- trunk/src/grails-app/views/layouts/main.gsp	(revision 43)
+++ trunk/src/grails-app/views/layouts/main.gsp	(revision 44)
@@ -5,8 +5,10 @@
         <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;">
Index: trunk/src/grails-app/views/person/login.gsp
===================================================================
--- trunk/src/grails-app/views/person/login.gsp	(revision 43)
+++ trunk/src/grails-app/views/person/login.gsp	(revision 44)
@@ -7,9 +7,5 @@
 </head>
     <body>
-        <div class="nav">
-            <span class="menuButton">
-<!--                 <a class="home" href="${createLinkTo(dir:'')}">Home</a> -->
-            </span>
-        </div>
+
         <div class="body">
             <h1>Please log in</h1>
@@ -17,4 +13,5 @@
                 <div class="message">${flash.message}</div>
             </g:if>
+            The demo users are "admin" and "user" both having password "pass"
             <g:hasErrors bean="${person}">
                 <div class="errors">
Index: trunk/src/web-app/css/public.css
===================================================================
--- trunk/src/web-app/css/public.css	(revision 43)
+++ trunk/src/web-app/css/public.css	(revision 44)
@@ -24,5 +24,10 @@
   padding: 0;
   width: 1024px;
-  text-align: left;
+}
+
+#top {
+  background: url("../images/topBg.png") no-repeat scroll center;
+  width: 1020px;
+  height: 44px;
 }
 
@@ -37,5 +42,5 @@
   background: transparent url("../images/logo.png") no-repeat scroll center;
   width: 980px;
-  height: 200px;
+  height: 160px;
 }
 
@@ -83,9 +88,19 @@
 }
 
+/* Login/out and Admin*/
+
+.appcontrol {
+    text-align: right;
+    padding: 5px 160px 5px 5px
+}
+
+.appcontrolButton {
+    font-size: 10px;
+    padding: 5px 5px;
+}
+
 /* NAVIGATION MENU */
 
 .nav {
-
-    padding-top: 20px;
     background: url("../images/linkPanel_long.png") top no-repeat;
     /*border: 1px solid #ccc;
@@ -94,14 +109,4 @@
     width: 650px;
     height: 40px;
-}
-
-.appcontrol {
-    text-align: right;
-    padding: 5px 160px 5px 5px
-}
-
-.appcontrolButton {
-    font-size: 10px;
-    padding: 5px 5px;
 }
 
