Index: /trunk/grails-app/conf/Config.groovy
===================================================================
--- /trunk/grails-app/conf/Config.groovy	(revision 384)
+++ /trunk/grails-app/conf/Config.groovy	(revision 385)
@@ -263,4 +263,20 @@
             [order:91, controller:'supplierTypeDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }]
         ]
+    ],
+    [order:110, controller:'siteDetailed', title:'site', action:'list',
+        subItems: [
+            [order:10, controller:'siteDetailed', title:'Site List', action:'list', isVisible: { true }],
+            [order:20, controller:'siteDetailed', title:'Create', action:'create', isVisible: { true }],
+            [order:90, controller:'siteDetailed', title:'Show', action:'show', isVisible: { params.action == 'show' }],
+            [order:91, controller:'siteDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }]
+        ]
+    ],
+    [order:110, controller:'sectionDetailed', title:'section', action:'list',
+        subItems: [
+            [order:10, controller:'sectionDetailed', title:'Section List', action:'list', isVisible: { true }],
+            [order:20, controller:'sectionDetailed', title:'Create', action:'create', isVisible: { true }],
+            [order:90, controller:'sectionDetailed', title:'Show', action:'show', isVisible: { params.action == 'show' }],
+            [order:91, controller:'sectionDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }]
+        ]
     ]
 ]
Index: /trunk/grails-app/controllers/SectionDetailedController.groovy
===================================================================
--- /trunk/grails-app/controllers/SectionDetailedController.groovy	(revision 384)
+++ /trunk/grails-app/controllers/SectionDetailedController.groovy	(revision 385)
@@ -20,4 +20,9 @@
     @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])
     def show = {
+
+        // In the case of an actionSubmit button, rewrite action name from 'index'.
+        if(params._action_Show)
+            params.action='show'
+
         def sectionInstance = Section.get( params.id )
 
@@ -50,4 +55,9 @@
 
     def edit = {
+
+        // In the case of an actionSubmit button, rewrite action name from 'index'.
+        if(params._action_Edit)
+            params.action='edit'
+
         def sectionInstance = Section.get( params.id )
 
Index: /trunk/grails-app/controllers/SiteDetailedController.groovy
===================================================================
--- /trunk/grails-app/controllers/SiteDetailedController.groovy	(revision 384)
+++ /trunk/grails-app/controllers/SiteDetailedController.groovy	(revision 385)
@@ -20,4 +20,9 @@
     @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])
     def show = {
+
+        // In the case of an actionSubmit button, rewrite action name from 'index'.
+        if(params._action_Show)
+            params.action='show'
+
         def siteInstance = Site.get( params.id )
 
@@ -50,4 +55,9 @@
 
     def edit = {
+
+        // In the case of an actionSubmit button, rewrite action name from 'index'.
+        if(params._action_Edit)
+            params.action='edit'
+
         def siteInstance = Site.get( params.id )
 
Index: /trunk/grails-app/views/sectionDetailed/create.gsp
===================================================================
--- /trunk/grails-app/views/sectionDetailed/create.gsp	(revision 384)
+++ /trunk/grails-app/views/sectionDetailed/create.gsp	(revision 385)
@@ -6,11 +6,11 @@
         <meta name="layout" content="main" />
         <title>Create Section</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><g:link class="list" action="list">Section List</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Create Section</h1>
             <g:render template="/shared/messages" />
             <g:hasErrors bean="${sectionInstance}">
@@ -78,4 +78,7 @@
                                 <td valign="top" class="value ${hasErrors(bean:sectionInstance,field:'site','errors')}">
                                     <g:select optionKey="id" from="${Site.list()}" name="site.id" value="${sectionInstance?.site?.id}" ></g:select>
+                                    <p>
+                                        <g:link controller="siteDetailed" action="create">Add Site</g:link>
+                                    </p>
                                 </td>
                             </tr> 
Index: /trunk/grails-app/views/sectionDetailed/edit.gsp
===================================================================
--- /trunk/grails-app/views/sectionDetailed/edit.gsp	(revision 384)
+++ /trunk/grails-app/views/sectionDetailed/edit.gsp	(revision 385)
@@ -6,12 +6,11 @@
         <meta name="layout" content="main" />
         <title>Edit Section</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><g:link class="list" action="list">Section List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New Section</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Edit Section</h1>
             <g:render template="/shared/messages" />
             <g:hasErrors bean="${sectionInstance}">
@@ -137,4 +136,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/sectionDetailed/list.gsp
===================================================================
--- /trunk/grails-app/views/sectionDetailed/list.gsp	(revision 384)
+++ /trunk/grails-app/views/sectionDetailed/list.gsp	(revision 385)
@@ -6,11 +6,11 @@
         <meta name="layout" content="main" />
         <title>Section List</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><g:link class="create" action="create">New Section</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Section List</h1>
             <g:render template="/shared/messages" />
             <div class="list">
Index: /trunk/grails-app/views/sectionDetailed/show.gsp
===================================================================
--- /trunk/grails-app/views/sectionDetailed/show.gsp	(revision 384)
+++ /trunk/grails-app/views/sectionDetailed/show.gsp	(revision 385)
@@ -6,12 +6,11 @@
         <meta name="layout" content="main" />
         <title>Show Section</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><g:link class="list" action="list">Section List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New Section</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Show Section</h1>
             <g:render template="/shared/messages" />
             <div class="dialog">
Index: /trunk/grails-app/views/siteDetailed/create.gsp
===================================================================
--- /trunk/grails-app/views/siteDetailed/create.gsp	(revision 384)
+++ /trunk/grails-app/views/siteDetailed/create.gsp	(revision 385)
@@ -6,11 +6,11 @@
         <meta name="layout" content="main" />
         <title>Create Site</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><g:link class="list" action="list">Site List</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Create Site</h1>
             <g:render template="/shared/messages" />
             <g:hasErrors bean="${siteInstance}">
Index: /trunk/grails-app/views/siteDetailed/edit.gsp
===================================================================
--- /trunk/grails-app/views/siteDetailed/edit.gsp	(revision 384)
+++ /trunk/grails-app/views/siteDetailed/edit.gsp	(revision 385)
@@ -6,12 +6,11 @@
         <meta name="layout" content="main" />
         <title>Edit Site</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><g:link class="list" action="list">Site List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New Site</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Edit Site</h1>
             <g:render template="/shared/messages" />
             <g:hasErrors bean="${siteInstance}">
@@ -116,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/siteDetailed/list.gsp
===================================================================
--- /trunk/grails-app/views/siteDetailed/list.gsp	(revision 384)
+++ /trunk/grails-app/views/siteDetailed/list.gsp	(revision 385)
@@ -6,11 +6,11 @@
         <meta name="layout" content="main" />
         <title>Site List</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><g:link class="create" action="create">New Site</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Site List</h1>
             <g:render template="/shared/messages" />
             <div class="list">
Index: /trunk/grails-app/views/siteDetailed/show.gsp
===================================================================
--- /trunk/grails-app/views/siteDetailed/show.gsp	(revision 384)
+++ /trunk/grails-app/views/siteDetailed/show.gsp	(revision 385)
@@ -6,12 +6,11 @@
         <meta name="layout" content="main" />
         <title>Show Site</title>
+        <nav:resources override="true"/>
     </head>
     <body>
         <div class="nav">
-            <span class="menuButton"><g:link class="list" action="list">Site List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New Site</g:link></span>
+            <nav:renderSubItems group="navAlt"/>
         </div>
         <div class="body">
-            <h1>Show Site</h1>
             <g:render template="/shared/messages" />
             <div class="dialog">
