Index: trunk/grails-app/views/unitOfMeasure/create.gsp
===================================================================
--- trunk/grails-app/views/unitOfMeasure/create.gsp	(revision 556)
+++ trunk/grails-app/views/unitOfMeasure/create.gsp	(revision 557)
@@ -13,7 +13,5 @@
         <div class="body">
             <h1>Create UnitOfMeasure</h1>
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <g:hasErrors bean="${unitOfMeasureInstance}">
             <div class="errors">
@@ -28,8 +26,17 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
+                                    <label for="name">Name:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:unitOfMeasureInstance,field:'name','errors')}">
+                                    <input type="text" maxlength="50" id="name" name="name" value="${fieldValue(bean:unitOfMeasureInstance,field:'name')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
                                     <label for="description">Description:</label>
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:unitOfMeasureInstance,field:'description','errors')}">
-                                    <input type="text" id="description" name="description" value="${fieldValue(bean:unitOfMeasureInstance,field:'description')}"/>
+                                    <input type="text" maxlength="100" id="description" name="description" value="${fieldValue(bean:unitOfMeasureInstance,field:'description')}"/>
                                 </td>
                             </tr> 
@@ -41,13 +48,4 @@
                                 <td valign="top" class="value ${hasErrors(bean:unitOfMeasureInstance,field:'isActive','errors')}">
                                     <g:checkBox name="isActive" value="${unitOfMeasureInstance?.isActive}" ></g:checkBox>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="name">Name:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:unitOfMeasureInstance,field:'name','errors')}">
-                                    <input type="text" id="name" name="name" value="${fieldValue(bean:unitOfMeasureInstance,field:'name')}"/>
                                 </td>
                             </tr> 
Index: trunk/grails-app/views/unitOfMeasure/edit.gsp
===================================================================
--- trunk/grails-app/views/unitOfMeasure/edit.gsp	(revision 556)
+++ trunk/grails-app/views/unitOfMeasure/edit.gsp	(revision 557)
@@ -14,7 +14,5 @@
         <div class="body">
             <h1>Edit UnitOfMeasure</h1>
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <g:hasErrors bean="${unitOfMeasureInstance}">
             <div class="errors">
@@ -31,8 +29,17 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
+                                    <label for="name">Name:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:unitOfMeasureInstance,field:'name','errors')}">
+                                    <input type="text" maxlength="50" id="name" name="name" value="${fieldValue(bean:unitOfMeasureInstance,field:'name')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
                                     <label for="description">Description:</label>
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:unitOfMeasureInstance,field:'description','errors')}">
-                                    <input type="text" id="description" name="description" value="${fieldValue(bean:unitOfMeasureInstance,field:'description')}"/>
+                                    <input type="text" maxlength="100" id="description" name="description" value="${fieldValue(bean:unitOfMeasureInstance,field:'description')}"/>
                                 </td>
                             </tr> 
@@ -49,5 +56,5 @@
 </g:each>
 </ul>
-<g:link controller="inventoryItem" params="['unitOfMeasure.id':unitOfMeasureInstance?.id]" action="create">Add InventoryItem</g:link>
+<g:link controller="inventoryItem" params="['unitOfMeasure.id':unitOfMeasureInstance?.id]" action="create">+Add InventoryItem</g:link>
 
                                 </td>
@@ -63,13 +70,4 @@
                             </tr> 
                         
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="name">Name:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:unitOfMeasureInstance,field:'name','errors')}">
-                                    <input type="text" id="name" name="name" value="${fieldValue(bean:unitOfMeasureInstance,field:'name')}"/>
-                                </td>
-                            </tr> 
-                        
                         </tbody>
                     </table>
@@ -77,4 +75,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/unitOfMeasure/list.gsp
===================================================================
--- trunk/grails-app/views/unitOfMeasure/list.gsp	(revision 556)
+++ trunk/grails-app/views/unitOfMeasure/list.gsp	(revision 557)
@@ -13,7 +13,5 @@
         <div class="body">
             <h1>UnitOfMeasure List</h1>
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <div class="list">
                 <table>
@@ -23,9 +21,9 @@
                    	        <g:sortableColumn property="id" title="Id" />
                         
+                   	        <g:sortableColumn property="name" title="Name" />
+                        
                    	        <g:sortableColumn property="description" title="Description" />
                         
                    	        <g:sortableColumn property="isActive" title="Is Active" />
-                        
-                   	        <g:sortableColumn property="name" title="Name" />
                         
                         </tr>
@@ -37,9 +35,9 @@
                             <td><g:link action="show" id="${unitOfMeasureInstance.id}">${fieldValue(bean:unitOfMeasureInstance, field:'id')}</g:link></td>
                         
+                            <td>${fieldValue(bean:unitOfMeasureInstance, field:'name')}</td>
+                        
                             <td>${fieldValue(bean:unitOfMeasureInstance, field:'description')}</td>
                         
                             <td>${fieldValue(bean:unitOfMeasureInstance, field:'isActive')}</td>
-                        
-                            <td>${fieldValue(bean:unitOfMeasureInstance, field:'name')}</td>
                         
                         </tr>
Index: trunk/grails-app/views/unitOfMeasure/show.gsp
===================================================================
--- trunk/grails-app/views/unitOfMeasure/show.gsp	(revision 556)
+++ trunk/grails-app/views/unitOfMeasure/show.gsp	(revision 557)
@@ -14,7 +14,5 @@
         <div class="body">
             <h1>Show UnitOfMeasure</h1>
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <div class="dialog">
                 <table>
@@ -26,4 +24,11 @@
                             
                             <td valign="top" class="value">${fieldValue(bean:unitOfMeasureInstance, field:'id')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Name:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:unitOfMeasureInstance, field:'name')}</td>
                             
                         </tr>
@@ -56,11 +61,4 @@
                         </tr>
                     
-                        <tr class="prop">
-                            <td valign="top" class="name">Name:</td>
-                            
-                            <td valign="top" class="value">${fieldValue(bean:unitOfMeasureInstance, field:'name')}</td>
-                            
-                        </tr>
-                    
                     </tbody>
                 </table>