diff --git a/view/address_form.xml b/view/address_form.xml
index 6a3e46c..5d2037c 100644
--- a/view/address_form.xml
+++ b/view/address_form.xml
@@ -7,7 +7,7 @@ this repository contains the full copyright notices and license terms. -->
     	<label name="party_related"/>
 	<field name="party_related"/>
     </xpath>
-    <xpath expr="/form/group[@id='checkboxes']" position="inside">
+    <xpath expr="/form/group[@id='checkboxes']/field[@name='delivery']" position="after">
 	<label name="campus"/>
 	<field name="campus"/>
     </xpath>
diff --git a/view/template_form.xml b/view/template_form.xml
index 17e42f8..2d0a363 100644
--- a/view/template_form.xml
+++ b/view/template_form.xml
@@ -35,6 +35,9 @@ this repository contains the full copyright notices and license terms. -->
 	    <field name="observation"/>
 	</page>
     </xpath>
+    <xpath expr="/form/notebook/page[@id='measurements']/label[@name='length']" position="before">
+	<separator id="measurements_equipment" string="Measurements of Equipment" colspan="4"/> 
+    </xpath>
     <xpath
 	expr="/form/notebook/page[@id='measurements']" position="inside">
 	<separator id="enviromental_conditions" string="Enviromental Conditions" colspan="4"/> 
@@ -61,6 +64,8 @@ this repository contains the full copyright notices and license terms. -->
 	<label name="voltageDC"/>
 	<field name="voltageDC"/>
 	<field name="voltageDC_uom"/>
+	
+	<separator id="time_life_equipment" string="Time Life Equipment" colspan="4"/> 
 
 	<label name="useful_life"/>
 	<field name="useful_life"/>