Index: trunk/grails-app/views/departmentDetailed/create.gsp
===================================================================
--- trunk/grails-app/views/departmentDetailed/create.gsp	(revision 410)
+++ trunk/grails-app/views/departmentDetailed/create.gsp	(revision 412)
@@ -6,14 +6,12 @@
         <meta name="layout" content="main" />
         <title>Create Department</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><g:link class="list" action="list">Department List</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Create Department</h1>
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <g:hasErrors bean="${departmentInstance}">
             <div class="errors">
Index: trunk/grails-app/views/departmentDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/departmentDetailed/edit.gsp	(revision 410)
+++ trunk/grails-app/views/departmentDetailed/edit.gsp	(revision 412)
@@ -6,15 +6,12 @@
         <meta name="layout" content="main" />
         <title>Edit Department</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><g:link class="list" action="list">Department List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New Department</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Edit Department</h1>
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <g:hasErrors bean="${departmentInstance}">
             <div class="errors">
@@ -118,4 +115,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>
Index: trunk/grails-app/views/departmentDetailed/list.gsp
===================================================================
--- trunk/grails-app/views/departmentDetailed/list.gsp	(revision 410)
+++ trunk/grails-app/views/departmentDetailed/list.gsp	(revision 412)
@@ -6,14 +6,12 @@
         <meta name="layout" content="main" />
         <title>Department List</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><g:link class="create" action="create">New Department</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Department List</h1>
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <div class="list">
                 <table>
Index: trunk/grails-app/views/departmentDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/departmentDetailed/show.gsp	(revision 410)
+++ trunk/grails-app/views/departmentDetailed/show.gsp	(revision 412)
@@ -6,15 +6,12 @@
         <meta name="layout" content="main" />
         <title>Show Department</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><g:link class="list" action="list">Department List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New Department</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Show Department</h1>
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <div class="dialog">
                 <table>
