Index: branches/features/purchaseOrders/grails-app/views/_about.gsp
===================================================================
--- branches/features/purchaseOrders/grails-app/views/_about.gsp	(revision 920)
+++ branches/features/purchaseOrders/grails-app/views/_about.gsp	(revision 942)
@@ -191,10 +191,16 @@
                 </td>
             </tr>
-                <tr>
-                    <td>
-                        Plugins: ${plugins}
-                    </td>
-                </tr>
-        </tbody>
-    </table>
-</div>
+            <tr>
+                <td>
+                    Plugins: ${plugins}
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    Java version: ${System.getProperty('java.version').encodeAsHTML()} (As supplied by host JVM) <br />
+                    Groovy version: ${org.codehaus.groovy.runtime.InvokerHelper.getVersion()} (As supplied with Grails)
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</div>
Index: branches/features/purchaseOrders/grails-app/views/layouts/main.gsp
===================================================================
--- branches/features/purchaseOrders/grails-app/views/layouts/main.gsp	(revision 920)
+++ branches/features/purchaseOrders/grails-app/views/layouts/main.gsp	(revision 942)
@@ -34,14 +34,7 @@
                     <g:message code="ajax.default.could.not.perform.operation" />
                 </div>
-                <g:if env="production">
-                    <div id="Header">
-                        <a href="javascript: openWindow('http://www.gnumims.org')" id=HeaderLink></a>
-                    </div>
-                </g:if>
-                <g:else>
-                    <div id="HeaderDev">
-                        <a href="javascript: openWindow('http://www.gnumims.org')" id=HeaderLink></a>
-                    </div>
-                </g:else>
+                <div id="${custom.headerId()}">
+                    <a href="javascript: openWindow('http://www.gnumims.org')" id=HeaderLink></a>
+                </div>
 
                 <g:isLoggedIn>
Index: branches/features/purchaseOrders/grails-app/views/login/auth.gsp
===================================================================
--- branches/features/purchaseOrders/grails-app/views/login/auth.gsp	(revision 920)
+++ branches/features/purchaseOrders/grails-app/views/login/auth.gsp	(revision 942)
@@ -72,5 +72,5 @@
         <h1>Welcome to gnuMims please log in</h1>
 
-        <g:if env="development">
+        <g:if test="${grailsApplication.config.demoMode.enabled}">
         The demo users are <b>user</b>, <b>manager</b> and  <b>admin</b> all having the password: <b>pass</b>
         </g:if>
@@ -85,9 +85,9 @@
                     <label for='j_username'>Login ID</label>
 
-                    <g:if env="production">
-                        <input type='text' class='text_' name='j_username' id='j_username'/>
+                    <g:if test="${grailsApplication.config.demoMode.enabled}">
+                        <input type='text' class='text_' name='j_username' id='j_username' value='manager'  />
                     </g:if>
                     <g:else >
-                        <input type='text' class='text_' name='j_username' id='j_username' value='manager'  />
+                        <input type='text' class='text_' name='j_username' id='j_username'/>
                     </g:else >
 
@@ -96,9 +96,9 @@
                     <label for='j_password'>Password</label>
 
-                    <g:if env="production">
-                        <input type='password' class='text_' name='j_password' id='j_password' />
+                    <g:if test="${grailsApplication.config.demoMode.enabled}">
+                        <input type='password' class='text_' name='j_password' id='j_password' value="pass" />
                     </g:if>
                     <g:else >
-                        <input type='password' class='text_' name='j_password' id='j_password' value="pass" />
+                        <input type='password' class='text_' name='j_password' id='j_password' />
                     </g:else >
                 </p>