anchor.diff:      </div>
   </fieldset>
   
  +   <!-- fields which weren't working-->
  +   <fieldset>
  +    <div class="row">
  +    <form:hidden path="emergencyContactPersonId" />
  +    <h3 class="text-left">8.(a) In case of accident or illness, notify</h3>
  +
  +        <div class="col-md-4">
  +            <div class="col-md-12">
  +                <div class="form-group">
  +             <label for="emergencyContactForename">First</label>
  +            <form:input class="form-control" path="emergencyContactForename" placeholder="First Name"/>
  +                </div>
  +            </div>
  +        </div>
  +        <div class="col-md-4">
  +            <div class="col-md-12">
  +                <div class="form-group">
  +                <label for="emergencyContactSurname">Last</label>
  +            <form:input class="form-control" path="emergencyContactSurname" placeholder="Surname"/>
  +                </div>
  +            </div>
  +        </div>
  +        <div class="col-md-4">
  +            <div class="col-md-12">
  +                <div class="form-group">
  +            <label for="emergencyRelationshipCode">Relationship</label>
  +            <form:select class="form-control" path="emergencyRelationshipCode">
  +                <form:option value="" label="Relationship" />
  +                <form:options items="${relationshipValues}" />
  +            </form:select>
  +                </div>
  +            </div>
  +        </div>
  +    </div>
  +    <div id="emergency-contact-linked" class="controls alert span10" style="display:none;">
  +        <button type="button" class="close">Unlink</button>
  +        Linked to an existing person in the database
  +    </div>
  +    
  +</fieldset>
  +            
  +<!-- End of fields which weren't working-->
                       
  -                    
  - <fieldset class="control-group">
  -     <div id="emergency-contact-additional-fields">
  -         <div class="row">  
  -         <h3 class="text-left">8.(b) In case of illness or accident, notify</h3>
  -            <div class="controls controls-row">
  -                <div class="col-md-4">
  -                    <div class="col-md-6">
  -                        <div class="form-group">
  -                    <label for="emergencyContactTelephone">Telephone</label>
  -                    <form:input class="form-control" path="emergencyContactTelephone" placeholder="Home"/>
  -                        </div>
  -                    </div>
  -                </div>
  -            <div class="col-md-4">
  -                <div class="col-md-6">
  -                    <div class="form-group">
  -                <label for="emergencyContactMobile">Mobile</label>
  -                <form:input class="form-control" path="emergencyContactMobile" placeholder="Mobile"/>
  -                    </div>
  -                </div>
  -            </div>
  -            </div>
  -          </div>
  -       </div>
  + <fieldset>
  +        <!-- Original H3 was here but deleted -->
  +    <div class="row">
  +        <div class="col-md-4">
  +            <div class="col-md-6">
  +                <div class="form-group">
  +            <label for="emergencyContactTelephone">Telephone</label>
  +            <form:input class="form-control" path="emergencyContactTelephone" placeholder="Home"/>
  +                </div>
  +            </div>
  +        </div>
  +    <div class="col-md-4">
  +        <div class="col-md-6">
  +            <div class="form-group">
  +        <label for="emergencyContactMobile">Mobile</label>
  +        <form:input class="form-control" path="emergencyContactMobile" placeholder="Mobile"/>
  +            </div>
  +        </div>
  +    </div>
  +    </div>
    </fieldset>
  -                    <fieldset>
  -                        <div class="row">
  -                           <div class="col-md-4">
  -                                <div class="col-md-12">
  -                                    <div class="form-group">
  -                                    <label for="emergencyContactStreet">Street</label>
  -                                <form:input class="form-control" path="emergencyContactStreet" placeholder="Street" />
  -                                    </div>
  -                                </div>
  -                            </div>
  -                            <div class="col-md-4">
  -                                <div class="col-md-12">
  -                                    <div class="form-group">
  -                                    <label for="emergencyContactTown">Town</label>
  -                                <form:input class="form-control" path="emergencyContactTown" placeholder="Town" />
  -                                    </div>
  -                                </div>
  -                            </div>
  -                            <div class="col-md-4">
  -                                <div class="col-md-12">
  -                                    <div class="form-group">
  -                                    <label for="emergencyContactCounty">County</label>
  -                                <form:input class="form-control" path="emergencyContactCounty" placeholder="County" />
  -                                    </div>
  -                                </div>
  -                            </div>
  -                            <div class="col-md-4">
  -                                <div class="col-md-6">
  -                                    <div class="form-group">
  -                                 <label for="emergencyContactPostcode">Postcode</label>
  -                                <form:input class="form-control" path="emergencyContactPostcode" maxlength="10" placeholder="Postcode" />
  -                                    </div>
  -                                </div>
  -                            </div>
  -                        </div>
  -                      
  -                    </fieldset>
  -                
  +<fieldset>
  +    <div class="row">
  +       <div class="col-md-4">
  +            <div class="col-md-12">
  +                <div class="form-group">
  +                <label for="emergencyContactStreet">Street</label>
  +            <form:input class="form-control" path="emergencyContactStreet" placeholder="Street" />
  +                </div>
  +            </div>
  +        </div>
  +        <div class="col-md-4">
  +            <div class="col-md-12">
  +                <div class="form-group">
  +                <label for="emergencyContactTown">Town</label>
  +            <form:input class="form-control" path="emergencyContactTown" placeholder="Town" />
  +                </div>
  +            </div>
  +        </div>
  +        <div class="col-md-4">
  +            <div class="col-md-12">
  +                <div class="form-group">
  +                <label for="emergencyContactCounty">County</label>
  +            <form:input class="form-control" path="emergencyContactCounty" placeholder="County" />
  +                </div>
  +            </div>
  +        </div>
  +        <div class="col-md-4">
  +            <div class="col-md-6">
  +                <div class="form-group">
  +             <label for="emergencyContactPostcode">Postcode</label>
  +            <form:input class="form-control" path="emergencyContactPostcode" maxlength="10" placeholder="Postcode" />
  +                </div>
  +            </div>
  +        </div>
  +    </div>
  +
  +</fieldset>
  +
   <fieldset>
     <div class="row">
           <h3 class="text-left">9. Congregation</h3>
  
positive.code:         </div>
      </div>
  </fieldset>
                  <fieldset>
                      
                      <div>
                       <input type="submit" class="btn btn-large btn-success"/>
                      </div>
    </div>
                  </fieldset>
              </form:form>
              <%@ include file="/WEB-INF/views/common/footer.jsp" %>
          <!-- mustache template used to display the person selection form -->
  
negative.code:                 <div class="col-md-12">
                   <div class="form-group"> 
                       <label for="mobile">Mobile</label>
                      <form:input class="form-control" path="mobile" placeholder="Mobile"/>
                   </div>   
                  </div>
              </div>
  