diff --git a/ADL.csproj b/ADL.csproj
index 24fbcdc..483b68e 100755
--- a/ADL.csproj
+++ b/ADL.csproj
@@ -53,6 +53,8 @@
     <Content Include="transforms\localise-transform.xslt" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="schemas\adl-0.dtd" />
+    <None Include="schemas\adl-0.xsd" />
     <None Include="test.build" />
   </ItemGroup>
   <ItemGroup>
diff --git a/transforms/adl2controllerclasses.xslt b/transforms/adl2controllerclasses.xslt
index 2487895..fd3b5e9 100755
--- a/transforms/adl2controllerclasses.xslt
+++ b/transforms/adl2controllerclasses.xslt
@@ -9,8 +9,8 @@
     Transform ADL into (partial) controller classes
     
     $Author: sb $
-    $Revision: 1.6 $
-    $Date: 2008-05-29 16:39:08 $
+    $Revision: 1.7 $
+    $Date: 2008-06-03 14:38:15 $
   -->
 
   <!-- WARNING WARNING WARNING: Do NOT reformat this file! 
@@ -72,7 +72,7 @@
 //
 //  Automatically generated abstract super class for controllers for the
 //	<xsl:value-of select="/adl:application/@name"/> application; generated using
-//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.6 $', 10)"/>
+//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.7 $', 10)"/>
 //
 //  This file is automatically generated; DO NOT EDIT IT.
 //
@@ -135,7 +135,7 @@ namespace <xsl:value-of select="$controllerns"/> {
 //
 //  Controller for auto-generated forms for editing <xsl:value-of select="@name"/>s
 //  Automatically generated from application description using
-//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.6 $', 10)"/>
+//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.7 $', 10)"/>
 //
 //  This file is automatically generated; DO NOT EDIT IT.
 //
@@ -204,10 +204,15 @@ namespace <xsl:value-of select="$controllerns"/> {
             </xsl:otherwise>
           </xsl:choose>
         </xsl:for-each>
+		<xsl:for-each select="descendant::adl:property[@type='list']">
+			<xsl:variable name="entityname" select="@entity"/>
+				Register&lt;<xsl:value-of select="concat( $entityns, '.', $entityname)"/>&gt;( "", EntityShuffleControl&lt;<xsl:value-of select="concat( $entityns, '.', $entityname)"/>&gt;.Instance);
+		</xsl:for-each>
+
 			}
 		}
 
-	<xsl:if test="adl:property[@type='message']">
+		<xsl:if test="adl:property[@type='message']">
 		/// &lt;summary&gt;
 		/// Temporary hack to sort a problem with uninitialised messages
 		/// &lt;/summary&gt;
diff --git a/transforms/adl2views.xslt b/transforms/adl2views.xslt
index feade61..1c725d3 100755
--- a/transforms/adl2views.xslt
+++ b/transforms/adl2views.xslt
@@ -13,8 +13,8 @@
     Transform ADL into velocity view templates
     
     $Author: sb $
-    $Revision: 1.3 $
-    $Date: 2008-05-29 16:39:38 $
+    $Revision: 1.4 $
+    $Date: 2008-06-03 14:38:15 $
 	-->
 	<!-- WARNING WARNING WARNING: Do NOT reformat this file! 
 		Whitespace (or lack of it) is significant! -->
@@ -124,7 +124,7 @@
 			Auto generated Velocity maybe-delete form for <xsl:value-of select="@name"/>,
 			generated from ADL.
 
-			Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.3 $', 10)"/>
+			Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.4 $', 10)"/>
 		</xsl:comment>
 		<xsl:call-template name="maybe-delete">
 			<xsl:with-param name="entity" select="."/>
@@ -162,7 +162,7 @@
 						Auto generated Velocity maybe-delete form for <xsl:value-of select="@name"/>,
 						generated from ADL.
 
-						Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.3 $', 10)"/>
+						Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.4 $', 10)"/>
 					</xsl:comment>
 					<xsl:call-template name="install-scripts"/>
 				</head>
@@ -243,7 +243,7 @@
 			Auto generated Velocity <xsl:value-of select="@name"/> form for <xsl:value-of select="ancestor::adl:entity/@name"/>,
 			generated from ADL.
 
-			Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.3 $', 10)"/>
+			Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.4 $', 10)"/>
 		</xsl:comment>
 		#capturefor( title)
 		#if ( $instance)
@@ -257,13 +257,6 @@
 		#capturefor( headextras)
 		<xsl:call-template name="head"/>
 		<script type='text/javascript' language='JavaScript1.2'>
-			var panes = new Array( <xsl:for-each select='adl:fieldgroup'>
-				"<xsl:value-of select='@name'/>"<xsl:choose>
-					<xsl:when test="position() = last()"/>
-					<xsl:otherwise>,</xsl:otherwise>
-				</xsl:choose>
-			</xsl:for-each> );
-
 			var siteRoot = '$siteRoot';
 
 			function performInitialisation()
@@ -314,8 +307,6 @@
 
 		${StylesHelper.InstallStylesheet( "Epoch")}
 
-		<script type="text/javascript" language='JavaScript1.2' src="../script/panes.js"></script>
-
 		<style type="text/css">
 			<xsl:for-each select="ancestor::adl:entity//adl:property[@required='true']">
 				#<xsl:value-of select="concat( 'advice-required-instance_', @name)"/>
@@ -363,16 +354,10 @@
 					Auto generated Velocity form for <xsl:value-of select="ancestor::adl:entity/@name"/>,
 					generated from ADL.
 
-					Generated using adl2views.xsl <xsl:value-of select="substring( '$Revision: 1.3 $', 10)"/>
+					Generated using adl2views.xsl <xsl:value-of select="substring( '$Revision: 1.4 $', 10)"/>
 				</xsl:comment>
 				<xsl:call-template name="install-scripts"/>
 				<script type='text/javascript' language='JavaScript1.2'>
-					var panes = new Array( <xsl:for-each select='adl:fieldgroup'>
-						"<xsl:value-of select='@name'/>"<xsl:choose>
-							<xsl:when test="position() = last()"/>
-							<xsl:otherwise>,</xsl:otherwise>
-						</xsl:choose>
-					</xsl:for-each> );
 
 					var siteRoot = '$siteRoot';
 
@@ -423,8 +408,6 @@
 
 				${StylesHelper.InstallStylesheet( "Epoch")}
 
-				<script type="text/javascript" language='JavaScript1.2' src="../script/panes.js"></script>
-
 				<style type="text/css">
 					<xsl:for-each select="ancestor::adl:entity//adl:property[@required='true']">
 						#<xsl:value-of select="concat( 'advice-required-instance_', @name)"/>
@@ -478,7 +461,8 @@
 					#end
 				#end
 			</xsl:if>
-			<form method="post" onsubmit="invokeSubmitHandlers( this)">
+			<form method="post" onsubmit="invokeSubmitHandlers( this)"  class="tabbed">
+				<input type="hidden" name="currentpane" value="$!currentpane" />
 				<xsl:attribute name="action">
 					<xsl:value-of select="concat( $formname, 'SubmitHandler.rails')"/>
 				</xsl:attribute>
@@ -503,7 +487,7 @@
 					</xsl:choose>
 				</xsl:for-each>
 				<xsl:if test="$form/adl:fieldgroup">
-					<div id="tabbar">
+					<!-- div id="tabbar">
 						<xsl:for-each select="$form/adl:fieldgroup">
 							<span class="tab">
 								<xsl:attribute name="id">
@@ -525,10 +509,10 @@
 								</a>
 							</span>
 						</xsl:for-each>
-					</div>
+					</div -->
 				</xsl:if>
 				<xsl:apply-templates select="$form/adl:fieldgroup"/>
-				<div class="pane">
+				<div class="non-pane">
 					<table>
 						<xsl:choose>
 							<xsl:when test="@properties='listed'">
@@ -574,7 +558,7 @@
 	</xsl:template>
 
 	<xsl:template match="adl:fieldgroup">
-		<div class="pane">
+		<div class="tab-pane">
 			<xsl:attribute name="id">
 				<xsl:value-of select="concat( @name, 'pane')"/>
 			</xsl:attribute>
@@ -584,19 +568,14 @@
 					<xsl:otherwise>display: none</xsl:otherwise>
 				</xsl:choose>
 			</xsl:attribute>
-			<a>
-				<xsl:attribute name="name">
-					<xsl:value-of select="concat( @name, 'anchor')"/>
-				</xsl:attribute>
-				<h3>
-					<xsl:call-template name="showprompt">
-						<xsl:with-param name="node" select="."/>
-						<xsl:with-param name="fallback" select="@name"/>
-						<xsl:with-param name="entity" select="ancestor::adl:entity"/>
-						<xsl:with-param name="locale" select="$locale"/>
-					</xsl:call-template>
-				</h3>
-			</a>
+			<h3 class="title">
+				<xsl:call-template name="showprompt">
+					<xsl:with-param name="node" select="."/>
+					<xsl:with-param name="fallback" select="@name"/>
+					<xsl:with-param name="entity" select="ancestor::adl:entity"/>
+					<xsl:with-param name="locale" select="$locale"/>
+				</xsl:call-template>
+			</h3>
 			<table>
 				<xsl:apply-templates select="adl:field|adl:verb|adl:auxlist"/>
 			</table>
@@ -987,7 +966,7 @@
 			Auto generated Velocity list for <xsl:value-of select="@name"/>,
 			generated from ADL.
 
-			Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.3 $', 10)"/>
+			Generated using adl2views.xslt <xsl:value-of select="substring( '$Revision: 1.4 $', 10)"/>
 		</xsl:comment>
 
 		#capturefor( title)
@@ -1026,7 +1005,7 @@
 					  Auto generated Velocity list for <xsl:value-of select="ancestor::adl:entity/@name"/>,
 					  generated from ADL.
 
-					  Generated using adl2listview.xsl <xsl:value-of select="substring( '$Revision: 1.3 $', 10)"/>
+					  Generated using adl2listview.xsl <xsl:value-of select="substring( '$Revision: 1.4 $', 10)"/>
 				  </xsl:comment>
 				  <xsl:call-template name="install-scripts"/>
 			  </head>
@@ -1379,75 +1358,71 @@
 
 	<!-- overall page layout -->
 
-  <xsl:template match="adl:content"/>
+	<xsl:template match="adl:content"/>
 
-    <!-- assuming an empty layout, install all the standard scripts 
+	<!-- assuming an empty layout, install all the standard scripts 
     which an ADL page may need -->
-    <xsl:template name="install-scripts">
-      ${ScriptsHelper.InstallScript( "ShuffleWidget")}
+	<xsl:template name="install-scripts">
+		${ScriptsHelper.InstallScript( "ShuffleWidget")}
 
-      ${Ajax.InstallScripts()}
-      ${FormHelper.InstallScripts()}
-      ${Validation.InstallScripts()}
-      ${Scriptaculous.InstallScripts()}
-      ${DateTimeHelper.InstallScripts()}
+		${Ajax.InstallScripts()}
+		${FormHelper.InstallScripts()}
+		${Validation.InstallScripts()}
+		${Scriptaculous.InstallScripts()}
+		${DateTimeHelper.InstallScripts()}
 
-      ${ScriptsHelper.InstallScript( "Sitewide")}
-      ${ScriptsHelper.InstallScript( "Behaviour")}
-      ${ScriptsHelper.InstallScript( "Epoch")}
-      ${ScriptsHelper.InstallScript( "Panes")}
-    </xsl:template>
+		${ScriptsHelper.InstallScript( "Sitewide")}
+		${ScriptsHelper.InstallScript( "Behaviour")}
+		${ScriptsHelper.InstallScript( "Epoch")}
+		${ScriptsHelper.InstallScript( "Panes")}
+	</xsl:template>
 
-		<xsl:template match="navigation">
-			foobar!
-		</xsl:template>
-		
-		<xsl:template match="adl:navigation">
-			<xsl:variable name="pagename" select="@name"/>
-			<ul class="generatednav">
-				<xsl:choose>
-					<xsl:when test="@include='list'">
-						<xsl:for-each select="//adl:entity[adl:list[@name=$pagename]]">
-							<li>
-								<a>
-									<xsl:attribute name="href">
-										<xsl:value-of select="concat( '$siteRoot', '/', $area-name, '/', @name, '/', adl:list[position()=1]/@name, '.rails')"/>
-									</xsl:attribute>
-									<xsl:value-of select="@name"/>
-								</a>
-							</li>
-						</xsl:for-each>
-					</xsl:when>
-					<xsl:when test="@include='form'">
-						<xsl:for-each select="//adl:entity[adl:form[@name=$pagename]]">
-							<li>
-								<a>
-									<xsl:attribute name="href">
-										<xsl:value-of select="concat( '$siteRoot', '/', $area-name, '/', @name, '/', adl:list[position()=1]/@name, '.rails')"/>
-									</xsl:attribute>
-									<xsl:value-of select="@name"/>
-								</a>
-							</li>
-						</xsl:for-each>
-					</xsl:when>
-					<xsl:when test="@include='page'">
-						<xsl:for-each select="//adl:entity[adl:page[@name=$pagename]]">
-							<li>
-								<a>
-									<xsl:attribute name="href">
-										<xsl:value-of select="concat( '$siteRoot', '/', $area-name, '/', @name, '/', adl:list[position()=1]/@name, '.rails')"/>
-									</xsl:attribute>
-									<xsl:value-of select="@name"/>
-								</a>
-							</li>
-						</xsl:for-each>
-					</xsl:when>
-				</xsl:choose>
-			</ul>
-		</xsl:template>
-		
-		
-    <xsl:template name="head">
+	<xsl:template match="adl:navigation">
+		<xsl:variable name="pagename" select="@name"/>
+		<ul class="generatednav">
+			<xsl:choose>
+				<xsl:when test="@include='list'">
+					<xsl:for-each select="//adl:entity[adl:list[@name=$pagename]]">
+						<li>
+							<a>
+								<xsl:attribute name="href">
+									<xsl:value-of select="concat( '$siteRoot', '/', $area-name, '/', @name, '/', adl:list[position()=1]/@name, '.rails')"/>
+								</xsl:attribute>
+								<xsl:value-of select="@name"/>
+							</a>
+						</li>
+					</xsl:for-each>
+				</xsl:when>
+				<xsl:when test="@include='form'">
+					<xsl:for-each select="//adl:entity[adl:form[@name=$pagename]]">
+						<li>
+							<a>
+								<xsl:attribute name="href">
+									<xsl:value-of select="concat( '$siteRoot', '/', $area-name, '/', @name, '/', adl:list[position()=1]/@name, '.rails')"/>
+								</xsl:attribute>
+								<xsl:value-of select="@name"/>
+							</a>
+						</li>
+					</xsl:for-each>
+				</xsl:when>
+				<xsl:when test="@include='page'">
+					<xsl:for-each select="//adl:entity[adl:page[@name=$pagename]]">
+						<li>
+							<a>
+								<xsl:attribute name="href">
+									<xsl:value-of select="concat( '$siteRoot', '/', $area-name, '/', @name, '/', adl:list[position()=1]/@name, '.rails')"/>
+								</xsl:attribute>
+								<xsl:value-of select="@name"/>
+							</a>
+						</li>
+					</xsl:for-each>
+				</xsl:when>
+			</xsl:choose>
+		</ul>
+	</xsl:template>
+
+
+	<xsl:template name="head">
     <xsl:choose>
       <xsl:when test="adl:head">
         <xsl:for-each select="adl:head/*">
diff --git a/transforms/i18n-en-GB-include.xslt b/transforms/i18n-en-GB-include.xslt
index 741d671..9252781 100755
--- a/transforms/i18n-en-GB-include.xslt
+++ b/transforms/i18n-en-GB-include.xslt
@@ -22,12 +22,10 @@
 	Templates are listed in alphabetical order.
     
     $Author: sb $
-    $Revision: 1.1 $
-    $Date: 2008-05-29 16:40:09 $
+    $Revision: 1.2 $
+    $Date: 2008-06-03 14:38:15 $
 	-->
 
-	<xsl:output method="xml" indent="yes"/>
-
 	<xsl:template name="i18n-add-a-new">
 		<!-- a string, presumed to be the name of a domain entity -->
 		<xsl:param name="entity-name"/>