diff --git a/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
index 5a50e5ed0..07d86ac72 100644
--- a/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
@@ -1,42 +1,44 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
 <#assign toBeDeletedClass = "dataProp" />
+
 <#if editConfiguration.objectProperty = true>
-	<#assign toBeDeletedClass = "objProp" />
+    <#assign toBeDeletedClass = "objProp" />
 </#if>
+
 <#assign statement = editConfiguration.statementDisplay />
+
 <form action="${editConfiguration.deleteProcessingUrl}" method="get">
-    <label for="submit">
-    	<h2>Are you sure you want to delete the following entry from 
-    		<em>${editConfiguration.propertyName}</em>?
-    	</h2>
-    </label>
+    <h2>Are you sure you want to delete the following entry from <em>${editConfiguration.propertyName}</em>?</h2>
+    
     <div class="toBeDeleted ${toBeDeletedClass}">
-    	<#if editConfiguration.objectProperty = true>
-    		<#if statement.object?has_content>
-    			<#include "propStatement-default.ftl" />
-    		</#if>
-    	<#else>
-    		${statement.dataValue}
-    	</#if>
-   	</div>
-    <input type="hidden" name="subjectUri"   value="${editConfiguration.subjectUri}"/>
-    <input type="hidden" name="predicateUri" value="${editConfiguration.predicateUri}"/>
+        <#if editConfiguration.objectProperty = true>
+            <#if statement.object?has_content>
+                <#include "propStatement-default.ftl" />
+            </#if>
+        <#else>
+            ${statement.dataValue}
+        </#if>
+    </div>
+    
+    <input type="hidden" name="subjectUri"   value="${editConfiguration.subjectUri}" role="input"/>
+    <input type="hidden" name="predicateUri" value="${editConfiguration.predicateUri}" role="input"/>
     
     <#if editConfiguration.dataProperty = true>
-    	<input type="hidden" name="datapropKey" value="${editConfiguration.datapropKey}" />
-    	<input type="hidden" name="vitroNsProp" value="${editConfiguration.vitroNsProperty}" />
+        <input type="hidden" name="datapropKey" value="${editConfiguration.datapropKey}" role="input"/>
+        <input type="hidden" name="vitroNsProp" value="${editConfiguration.vitroNsProperty}" role="input"/>
     <#else>
-    	<input type="hidden" name="objectUri"    value="${editConfiguration.objectUri}"/>
+        <input type="hidden" name="objectUri"    value="${editConfiguration.objectUri}" role="input"/>
     </#if>
     
    
-   	<#if editConfiguration.objectProperty = true>
+    <#if editConfiguration.objectProperty = true>
     <p class="submit">
     </#if>
-    		<input type="submit" id="delete" value="Delete"/>
-			 or 
-			<a class="cancel" title="Cancel" href="${editConfiguration.cancelUrl}">Cancel</a>
+        <input type="submit" id="delete" value="Delete" role="button"/>
+        or 
+        <a class="cancel" title="Cancel" href="${editConfiguration.cancelUrl}">Cancel</a>
     <#if editConfiguration.objectProperty = true>
-   	</p>
+    </p>
     </#if>
-    	
 </form>
\ No newline at end of file