diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit.java b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit.java
index 72d1788..093d546 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit.java
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit.java
@@ -195,6 +195,25 @@ public void setSubUnitHierarchys(
 			Collection<AdminUnitHierarchy> subUnitHierarchys) {
 		this.subUnitHierarchys = subUnitHierarchys;
 	}
+
+	@Transactional
+	public void remove() {
+        	if (this.entityManager == null) this.entityManager = entityManager();
+        	setClosedBy((String) SecurityContextHolder.getContext().getAuthentication().getName());
+        	this.entityManager.createQuery("UPDATE AdminUnit SET closedDate = CURDATE(), closedBy = '" + getClosedBy() + "' WHERE id = " + this.getId()).executeUpdate();
+    	}
+
+	public static long countAdminUnits() {
+        	return entityManager().createQuery("SELECT COUNT(o) FROM AdminUnit o WHERE closedDate > CURDATE()", Long.class).getSingleResult();
+    	}
+    
+    	public static List<AdminUnit> findAllAdminUnits() {
+        	return entityManager().createQuery("SELECT o FROM AdminUnit o WHERE closedDate > CURDATE()", AdminUnit.class).getResultList();
+    	}
+    
+    	public static List<AdminUnit> findAdminUnitEntries(int firstResult, int maxResults) {
+        	return entityManager().createQuery("SELECT o FROM AdminUnit o WHERE closedDate > CURDATE()", AdminUnit.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    	}
 	
 /*	public static final Date notDeleted = new Date(253402207200000L);
 
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit_Roo_Entity.aj b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit_Roo_Entity.aj
index 6e7a6a2..819be88 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit_Roo_Entity.aj
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit_Roo_Entity.aj
@@ -9,21 +9,9 @@ import java.util.List;
 
 privileged aspect AdminUnit_Roo_Entity {
     
-    public static long AdminUnit.countAdminUnits() {
-        return entityManager().createQuery("SELECT COUNT(o) FROM AdminUnit o", Long.class).getSingleResult();
-    }
-    
-    public static List<AdminUnit> AdminUnit.findAllAdminUnits() {
-        return entityManager().createQuery("SELECT o FROM AdminUnit o", AdminUnit.class).getResultList();
-    }
-    
     public static AdminUnit AdminUnit.findAdminUnit(Long id) {
         if (id == null) return null;
         return entityManager().find(AdminUnit.class, id);
     }
     
-    public static List<AdminUnit> AdminUnit.findAdminUnitEntries(int firstResult, int maxResults) {
-        return entityManager().createQuery("SELECT o FROM AdminUnit o", AdminUnit.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
-    
 }
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/create.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/create.jspx
index 6b1b85b..e39bf9f 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/create.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/create.jspx
@@ -12,7 +12,7 @@
         <field:datetime dateTimePattern="${adminUnit_openeddate_date_format}" field="openedDate" id="c_ee_itcollege_example_entities_AdminUnit_openedDate" z="EI8oaStS18FMuSYgG3PsdXLWeRw="/>
         <field:input field="changedBy" id="c_ee_itcollege_example_entities_AdminUnit_changedBy" z="ah8risAwM4tMYLGKexRwWbhgbAc="/>
         <field:simple field="regiments" id="c_ee_itcollege_example_entities_AdminUnit_regiments" messageCode="entity_reference_not_managed" messageCodeAttribute="Regiment" z="w6a5ToqAdhrK5Nb6x5esmXRFmYk="/>
-        <field:select field="adminUnitType" id="c_ee_itcollege_example_entities_AdminUnit_adminUnitType" itemValue="id" items="${adminunittypes}" path="/adminunittypes" z="9kh9VZnAl8kq0fkQN+hKh8xuPVk="/>
+        <field:select field="adminUnitType" id="c_ee_itcollege_example_entities_AdminUnit_adminUnitType" itemValue="id" itemLabel="name" items="${adminunittypes}" path="/adminunittypes" z="user-managed"/>
         <field:simple field="adminUnitHierarchys" id="c_ee_itcollege_example_entities_AdminUnit_adminUnitHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit Hierarchy" z="mxuRyTcZ5NgNHENvQCHdXxeubE4="/>
         <field:simple field="subUnitHierarchys" id="c_ee_itcollege_example_entities_AdminUnit_subUnitHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit Hierarchy" z="o0jX17wlU+4SzDqFQMLTZtWy/uc="/>
         <field:input field="closedBy" id="c_ee_itcollege_example_entities_AdminUnit_closedBy" z="pF4d5ZzmduafDT4CrzVzfug9CwQ="/>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/update.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/update.jspx
index f56202e..50f0919 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/update.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/update.jspx
@@ -14,7 +14,7 @@
         <field:input field="changedBy" id="c_ee_itcollege_example_entities_AdminUnit_changedBy" z="ah8risAwM4tMYLGKexRwWbhgbAc="/>
         <field:input field="closedBy" id="c_ee_itcollege_example_entities_AdminUnit_closedBy" z="pF4d5ZzmduafDT4CrzVzfug9CwQ="/>
         <field:simple field="regiments" id="c_ee_itcollege_example_entities_AdminUnit_regiments" messageCode="entity_reference_not_managed" messageCodeAttribute="Regiment" z="w6a5ToqAdhrK5Nb6x5esmXRFmYk="/>
-        <field:select field="adminUnitType" id="c_ee_itcollege_example_entities_AdminUnit_adminUnitType" itemValue="id" items="${adminunittypes}" path="/adminunittypes" z="9kh9VZnAl8kq0fkQN+hKh8xuPVk="/>
+        <field:select field="adminUnitType" id="c_ee_itcollege_example_entities_AdminUnit_adminUnitType" itemValue="id" itemLabel="name" items="${adminunittypes}" path="/adminunittypes" z="user-managed"/>
         <field:simple field="adminUnitHierarchys" id="c_ee_itcollege_example_entities_AdminUnit_adminUnitHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit Hierarchy" z="mxuRyTcZ5NgNHENvQCHdXxeubE4="/>
         <field:simple field="subUnitHierarchys" id="c_ee_itcollege_example_entities_AdminUnit_subUnitHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit Hierarchy" z="o0jX17wlU+4SzDqFQMLTZtWy/uc="/>
     </form:update>