Index: trunk/src/templates/scaffolding/create.gsp
===================================================================
--- trunk/src/templates/scaffolding/create.gsp	(revision 178)
+++ trunk/src/templates/scaffolding/create.gsp	(revision 398)
@@ -13,7 +13,5 @@
         <div class="body">
             <h1>Create ${className}</h1>
-            <g:if test="\${flash.message}">
-            <div class="message">\${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <g:hasErrors bean="\${${propertyName}}">
             <div class="errors">
Index: trunk/src/templates/scaffolding/edit.gsp
===================================================================
--- trunk/src/templates/scaffolding/edit.gsp	(revision 178)
+++ trunk/src/templates/scaffolding/edit.gsp	(revision 398)
@@ -14,7 +14,5 @@
         <div class="body">
             <h1>Edit ${className}</h1>
-            <g:if test="\${flash.message}">
-            <div class="message">\${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <g:hasErrors bean="\${${propertyName}}">
             <div class="errors">
@@ -56,4 +54,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/src/templates/scaffolding/list.gsp
===================================================================
--- trunk/src/templates/scaffolding/list.gsp	(revision 178)
+++ trunk/src/templates/scaffolding/list.gsp	(revision 398)
@@ -13,7 +13,5 @@
         <div class="body">
             <h1>${className} 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/src/templates/scaffolding/show.gsp
===================================================================
--- trunk/src/templates/scaffolding/show.gsp	(revision 178)
+++ trunk/src/templates/scaffolding/show.gsp	(revision 398)
@@ -14,7 +14,5 @@
         <div class="body">
             <h1>Show ${className}</h1>
-            <g:if test="\${flash.message}">
-            <div class="message">\${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <div class="dialog">
                 <table>