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..e79bcd3 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
@@ -53,27 +53,6 @@ public class AdminUnit extends BaseEntity implements Serializable {
     @DateTimeFormat(style = "M-")
     private Date untilDate;
 
-	private String changedBy;
-    
-    @Temporal(TemporalType.TIMESTAMP)
-    @DateTimeFormat(style = "M-")
-    private Date changedDate;
-    
-    private String closedBy;
-    
-	@Temporal(TemporalType.TIMESTAMP)
-	@DateTimeFormat(style = "M-")
-	private Date closedDate = GeneralFunctions.notDeleted;
-	
-	public Date getClosedDate() {
-		return closedDate;
-	}
-
-	public void setClosedDate(Date closedDate) {
-		this.closedDate = closedDate;
-	}
-	
-    
 	@OneToMany(mappedBy = "adminUnit")
 	private Collection<Regiment> regiments;
 
@@ -127,31 +106,6 @@ public void setUntilDate(Date untilDate) {
 		this.untilDate = untilDate;
 	}
 
-	
-	public String getChangedBy() {
-		return changedBy;
-	}
-
-	public void setChangedBy(String changedBy) {
-		this.changedBy = changedBy;
-	}
-
-	protected Date getChangedDate() {
-		return changedDate;
-	}
-
-	public void setChangedDate(Date changedDate) {
-		this.changedDate = changedDate;
-	}
-
-	public String getClosedBy() {
-		return closedBy;
-	}
-
-	public void setClosedBy(String closedBy) {
-		this.closedBy = closedBy;
-	}
-
 	public Collection<Regiment> getRegiments() {
 	    return regiments;
 	}
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitHierarchy.java b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitHierarchy.java
index 54a9328..6fd111b 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitHierarchy.java
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitHierarchy.java
@@ -42,26 +42,6 @@ public class AdminUnitHierarchy extends BaseEntity implements Serializable {
     @DateTimeFormat(style = "M-")
     private Date untilDate;
     
-    private String changedBy;
-    
-    @Temporal(TemporalType.TIMESTAMP)
-    @DateTimeFormat(style = "M-")
-    private Date changedDate;
-    
-    private String closedBy;
-    
-	@Temporal(TemporalType.TIMESTAMP)
-	@DateTimeFormat(style = "M-")
-	private Date closedDate = GeneralFunctions.notDeleted;
-	
-	public Date getClosedDate() {
-		return closedDate;
-	}
-
-	public void setClosedDate(Date closedDate) {
-		this.closedDate = closedDate;
-	}
-	
 	@ManyToOne
 	private AdminUnit adminUnit;
 
@@ -91,30 +71,6 @@ public Date getUntilDate() {
 	public void setUntilDate(Date untilDate) {
 		this.untilDate = untilDate;
 	}
-	
-	public String getChangedBy() {
-		return changedBy;
-	}
-
-	public void setChangedBy(String changedBy) {
-		this.changedBy = changedBy;
-	}
-
-	public Date getChangedDate() {
-		return changedDate;
-	}
-
-	public void setChangedDate(Date changedDate) {
-		this.changedDate = changedDate;
-	}
-
-	public String getClosedBy() {
-		return closedBy;
-	}
-
-	public void setClosedBy(String closedBy) {
-		this.closedBy = closedBy;
-	}
 
 	public AdminUnit getAdminUnit() {
 	    return adminUnit;
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitHierarchy_Roo_ToString.aj b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitHierarchy_Roo_ToString.aj
index 8b1bd44..d27b40d 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitHierarchy_Roo_ToString.aj
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitHierarchy_Roo_ToString.aj
@@ -17,12 +17,10 @@ privileged aspect AdminUnitHierarchy_Roo_ToString {
         sb.append("Comment: ").append(getComment()).append(", ");
         sb.append("DateTime: ").append(getDateTime()).append(", ");
         sb.append("FromDate: ").append(getFromDate()).append(", ");
-        sb.append("Id: ").append(getId()).append(", ");
         sb.append("OpenedBy: ").append(getOpenedBy()).append(", ");
         sb.append("OpenedDate: ").append(getOpenedDate()).append(", ");
         sb.append("SubUnit: ").append(getSubUnit()).append(", ");
-        sb.append("UntilDate: ").append(getUntilDate()).append(", ");
-        sb.append("Version: ").append(getVersion());
+        sb.append("UntilDate: ").append(getUntilDate());
         return sb.toString();
     }
     
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitType.java b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitType.java
index 0918005..1cbabd1 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitType.java
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitType.java
@@ -52,27 +52,6 @@ public class AdminUnitType extends BaseEntity implements Serializable {
 	@Temporal(TemporalType.TIMESTAMP)
     @DateTimeFormat(style = "M-")
     private Date untilDate;
-       
-    private String changedBy;
-    
-    @Temporal(TemporalType.TIMESTAMP)
-    @DateTimeFormat(style = "M-")
-    private Date changedDate;
-    
-    private String closedBy;
-    
-	@Temporal(TemporalType.TIMESTAMP)
-	@DateTimeFormat(style = "M-")
-	private Date closedDate = GeneralFunctions.notDeleted;
-	
-	public Date getClosedDate() {
-		return closedDate;
-	}
-
-	public void setClosedDate(Date closedDate) {
-		this.closedDate = closedDate;
-	}
-	
   
 	@OneToMany(mappedBy = "adminUnitType")
 	private Collection<AdminUnit> adminUnits;
@@ -124,31 +103,6 @@ public void setUntilDate(Date untilDate) {
 		this.untilDate = untilDate;
 	}
 
-	public String getChangedBy() {
-		return changedBy;
-	}
-
-	public void setChangedBy(String changedBy) {
-		this.changedBy = changedBy;
-	}
-
-	public Date getChangedDate() {
-		return changedDate;
-	}
-
-	public void setChangedDate(Date changedDate) {
-		this.changedDate = changedDate;
-	}
-
-	public String getClosedBy() {
-		return closedBy;
-	}
-
-	public void setClosedBy(String closedBy) {
-		this.closedBy = closedBy;
-	}
-
-
 	public Collection<AdminUnit> getAdminUnits() {
 	    return adminUnits;
 	}
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitTypeHierarchy.java b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitTypeHierarchy.java
index 5d3e66e..be64b9c 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitTypeHierarchy.java
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitTypeHierarchy.java
@@ -32,26 +32,6 @@ public class AdminUnitTypeHierarchy extends BaseEntity implements Serializable {
 	@NotNull
 	private String comment;
 	
-    private String changedBy;
-    
-    @Temporal(TemporalType.TIMESTAMP)
-    @DateTimeFormat(style = "M-")
-    private Date changedDate;
-    
-    private String closedBy;
-    
-	@Temporal(TemporalType.TIMESTAMP)
-	@DateTimeFormat(style = "M-")
-	private Date closedDate = GeneralFunctions.notDeleted;
-	
-	public Date getClosedDate() {
-		return closedDate;
-	}
-
-	public void setClosedDate(Date closedDate) {
-		this.closedDate = closedDate;
-	}
-	
 	@ManyToOne
 	private AdminUnitType adminUnitType;
 
@@ -66,30 +46,6 @@ public void setComment(String comment) {
 		this.comment = comment;
 	}
 
-	public String getChangedBy() {
-		return changedBy;
-	}
-
-	public void setChangedBy(String changedBy) {
-		this.changedBy = changedBy;
-	}
-
-	public Date getChangedDate() {
-		return changedDate;
-	}
-
-	public void setChangedDate(Date changedDate) {
-		this.changedDate = changedDate;
-	}
-
-	public String getClosedBy() {
-		return closedBy;
-	}
-
-	public void setClosedBy(String closedBy) {
-		this.closedBy = closedBy;
-	}
-
 	public AdminUnitType getAdminUnitType() {
 	    return adminUnitType;
 	}
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitTypeHierarchy_Roo_ToString.aj b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitTypeHierarchy_Roo_ToString.aj
index 3e06fe4..8a571ac 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitTypeHierarchy_Roo_ToString.aj
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitTypeHierarchy_Roo_ToString.aj
@@ -16,11 +16,9 @@ privileged aspect AdminUnitTypeHierarchy_Roo_ToString {
         sb.append("ClosedDate: ").append(getClosedDate()).append(", ");
         sb.append("Comment: ").append(getComment()).append(", ");
         sb.append("DateTime: ").append(getDateTime()).append(", ");
-        sb.append("Id: ").append(getId()).append(", ");
         sb.append("OpenedBy: ").append(getOpenedBy()).append(", ");
         sb.append("OpenedDate: ").append(getOpenedDate()).append(", ");
-        sb.append("SubAdminUnitType: ").append(getSubAdminUnitType()).append(", ");
-        sb.append("Version: ").append(getVersion());
+        sb.append("SubAdminUnitType: ").append(getSubAdminUnitType());
         return sb.toString();
     }
     
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitType_Roo_ToString.aj b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitType_Roo_ToString.aj
index 68aaeda..cbf49cb 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitType_Roo_ToString.aj
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnitType_Roo_ToString.aj
@@ -19,13 +19,11 @@ privileged aspect AdminUnitType_Roo_ToString {
         sb.append("Comment: ").append(getComment()).append(", ");
         sb.append("DateTime: ").append(getDateTime()).append(", ");
         sb.append("FromDate: ").append(getFromDate()).append(", ");
-        sb.append("Id: ").append(getId()).append(", ");
         sb.append("Name: ").append(getName()).append(", ");
         sb.append("OpenedBy: ").append(getOpenedBy()).append(", ");
         sb.append("OpenedDate: ").append(getOpenedDate()).append(", ");
         sb.append("SubAdminUnitTypeHierarchys: ").append(getSubAdminUnitTypeHierarchys() == null ? "null" : getSubAdminUnitTypeHierarchys().size()).append(", ");
-        sb.append("UntilDate: ").append(getUntilDate()).append(", ");
-        sb.append("Version: ").append(getVersion());
+        sb.append("UntilDate: ").append(getUntilDate());
         return sb.toString();
     }
     
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit_Roo_ToString.aj b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit_Roo_ToString.aj
index b9c4bf5..1790ec9 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit_Roo_ToString.aj
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/AdminUnit_Roo_ToString.aj
@@ -12,20 +12,19 @@ privileged aspect AdminUnit_Roo_ToString {
         sb.append("AdminUnitHierarchys: ").append(getAdminUnitHierarchys() == null ? "null" : getAdminUnitHierarchys().size()).append(", ");
         sb.append("AdminUnitType: ").append(getAdminUnitType()).append(", ");
         sb.append("ChangedBy: ").append(getChangedBy()).append(", ");
+        sb.append("ChangedDate: ").append(getChangedDate()).append(", ");
         sb.append("ClosedBy: ").append(getClosedBy()).append(", ");
         sb.append("ClosedDate: ").append(getClosedDate()).append(", ");
         sb.append("Code: ").append(getCode()).append(", ");
         sb.append("Comment: ").append(getComment()).append(", ");
         sb.append("DateTime: ").append(getDateTime()).append(", ");
         sb.append("FromDate: ").append(getFromDate()).append(", ");
-        sb.append("Id: ").append(getId()).append(", ");
         sb.append("Name: ").append(getName()).append(", ");
         sb.append("OpenedBy: ").append(getOpenedBy()).append(", ");
         sb.append("OpenedDate: ").append(getOpenedDate()).append(", ");
         sb.append("Regiments: ").append(getRegiments() == null ? "null" : getRegiments().size()).append(", ");
         sb.append("SubUnitHierarchys: ").append(getSubUnitHierarchys() == null ? "null" : getSubUnitHierarchys().size()).append(", ");
-        sb.append("UntilDate: ").append(getUntilDate()).append(", ");
-        sb.append("Version: ").append(getVersion());
+        sb.append("UntilDate: ").append(getUntilDate());
         return sb.toString();
     }
     
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/BaseEntity.java b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/BaseEntity.java
index 5290a6f..7119936 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/BaseEntity.java
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/BaseEntity.java
@@ -22,9 +22,9 @@
  //public class BaseEntity {
 public abstract class BaseEntity {
 
-		@Id
-		@GeneratedValue(strategy = GenerationType.AUTO)
-		private Long id;
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private Long id;
 	 
 	private String openedBy;
 
@@ -32,24 +32,40 @@ public abstract class BaseEntity {
     @DateTimeFormat(style = "M-")
     private Date openedDate = getDateTime();
 	
+    private String changedBy;
+    
+    @Temporal(TemporalType.TIMESTAMP)
+    @DateTimeFormat(style = "M-")
+    private Date changedDate;
+    
+    private String closedBy;
+    
+	@Temporal(TemporalType.TIMESTAMP)
+	@DateTimeFormat(style = "M-")
+	private Date closedDate = GeneralFunctions.notDeleted;
 
-	
-	// getter & setter - ei muuda!
-	
 	public String getOpenedBy() {
 		return openedBy;
 	}
 
-	public void setOpenedBy(String openedBy) {
-		this.openedBy = openedBy;
-	}
-
 	public Date getOpenedDate() {
 		return openedDate;
 	}
+	
+	public Date getClosedDate() {
+		return closedDate;
+	}
+	
+	public String getChangedBy() {
+		return changedBy;
+	}
+
+	public Date getChangedDate() {
+		return changedDate;
+	}
 
-	public void setOpenedDate(Date openedDate) {
-		this.openedDate = openedDate;
+	public String getClosedBy() {
+		return closedBy;
 	}
 	
 	@PrePersist
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/BaseEntity_Roo_ToString.aj b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/BaseEntity_Roo_ToString.aj
index e84fc2c..d8be9aa 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/BaseEntity_Roo_ToString.aj
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/BaseEntity_Roo_ToString.aj
@@ -9,11 +9,13 @@ privileged aspect BaseEntity_Roo_ToString {
     
     public String BaseEntity.toString() {
         StringBuilder sb = new StringBuilder();
+        sb.append("ChangedBy: ").append(getChangedBy()).append(", ");
+        sb.append("ChangedDate: ").append(getChangedDate()).append(", ");
+        sb.append("ClosedBy: ").append(getClosedBy()).append(", ");
+        sb.append("ClosedDate: ").append(getClosedDate()).append(", ");
         sb.append("DateTime: ").append(getDateTime()).append(", ");
-        sb.append("Id: ").append(getId()).append(", ");
         sb.append("OpenedBy: ").append(getOpenedBy()).append(", ");
-        sb.append("OpenedDate: ").append(getOpenedDate()).append(", ");
-        sb.append("Version: ").append(getVersion());
+        sb.append("OpenedDate: ").append(getOpenedDate());
         return sb.toString();
     }
     
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/Regiment.java b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/Regiment.java
index 4f8e5c9..9c06563 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/Regiment.java
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/Regiment.java
@@ -52,26 +52,6 @@ public class Regiment extends BaseEntity implements Serializable {
     @DateTimeFormat(style = "M-")
     private Date untilDate;
     
-    private String changedBy;
-    
-    @Temporal(TemporalType.TIMESTAMP)
-    @DateTimeFormat(style = "M-")
-    private Date changedDate;
-    
-    private String closedBy;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	@DateTimeFormat(style = "M-")
-	private Date closedDate = GeneralFunctions.notDeleted;
-	
-	public Date getClosedDate() {
-		return closedDate;
-	}
-
-	public void setClosedDate(Date closedDate) {
-		this.closedDate = closedDate;
-	}
-	
 	@ManyToOne
 	private AdminUnit adminUnit;
 
@@ -120,30 +100,6 @@ public Date getUntilDate() {
 	public void setUntilDate(Date untilDate) {
 		this.untilDate = untilDate;
 	}
-	
-	public String getChangedBy() {
-		return changedBy;
-	}
-
-	public void setChangedBy(String changedBy) {
-		this.changedBy = changedBy;
-	}
-
-	public Date getChangedDate() {
-		return changedDate;
-	}
-
-	public void setChangedDate(Date changedDate) {
-		this.changedDate = changedDate;
-	}
-
-	public String getClosedBy() {
-		return closedBy;
-	}
-
-	public void setClosedBy(String closedBy) {
-		this.closedBy = closedBy;
-	}
 
 	public AdminUnit getAdminUnit() {
 	    return adminUnit;
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/RegimentHierarchy.java b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/RegimentHierarchy.java
index abb6f20..012d8c8 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/RegimentHierarchy.java
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/RegimentHierarchy.java
@@ -42,27 +42,6 @@ public class RegimentHierarchy extends BaseEntity implements Serializable {
     @DateTimeFormat(style = "M-")
     private Date untilDate;
     
-    private String changedBy;
-    
-    @Temporal(TemporalType.TIMESTAMP)
-    @DateTimeFormat(style = "M-")
-    private Date changedDate;
-    
-    private String closedBy;
-    
-	@Temporal(TemporalType.TIMESTAMP)
-	@DateTimeFormat(style = "M-")
-	private Date closedDate = GeneralFunctions.notDeleted;
-	
-	public Date getClosedDate() {
-		return closedDate;
-	}
-
-	public void setClosedDate(Date closedDate) {
-		this.closedDate = closedDate;
-	}
-	
-	
 	@ManyToOne
 	private Regiment regiment;
 
@@ -94,30 +73,6 @@ public void setUntilDate(Date untilDate) {
 		this.untilDate = untilDate;
 	}
 
-	public String getChangedBy() {
-		return changedBy;
-	}
-
-	public void setChangedBy(String changedBy) {
-		this.changedBy = changedBy;
-	}
-
-	public Date getChangedDate() {
-		return changedDate;
-	}
-
-	public void setChangedDate(Date changedDate) {
-		this.changedDate = changedDate;
-	}
-
-	public String getClosedBy() {
-		return closedBy;
-	}
-
-	public void setClosedBy(String closedBy) {
-		this.closedBy = closedBy;
-	}
-
 	public Regiment getRegiment() {
 	    return regiment;
 	}
@@ -134,4 +89,8 @@ public void setSubRegiment(Regiment param) {
 	    this.subRegiment = param;
 	}    
 
+	public String getChildName()
+	{
+		return subRegiment.getName();
+	}
 }
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/RegimentHierarchy_Roo_ToString.aj b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/RegimentHierarchy_Roo_ToString.aj
index 81e9437..c6bb301 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/entities/RegimentHierarchy_Roo_ToString.aj
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/entities/RegimentHierarchy_Roo_ToString.aj
@@ -11,6 +11,7 @@ privileged aspect RegimentHierarchy_Roo_ToString {
         StringBuilder sb = new StringBuilder();
         sb.append("ChangedBy: ").append(getChangedBy()).append(", ");
         sb.append("ChangedDate: ").append(getChangedDate()).append(", ");
+        sb.append("ChildName: ").append(getChildName()).append(", ");
         sb.append("ClosedBy: ").append(getClosedBy()).append(", ");
         sb.append("ClosedDate: ").append(getClosedDate()).append(", ");
         sb.append("Comment: ").append(getComment()).append(", ");
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/web/AdminUnitController_Roo_Controller.aj b/javaee-project-team21/src/main/java/ee/itcollege/example/web/AdminUnitController_Roo_Controller.aj
index 11e7318..df37a1e 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/web/AdminUnitController_Roo_Controller.aj
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/web/AdminUnitController_Roo_Controller.aj
@@ -118,8 +118,6 @@ privileged aspect AdminUnitController_Roo_Controller {
     }
     
     void AdminUnitController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("adminUnit_openeddate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("adminUnit_closeddate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
         uiModel.addAttribute("adminUnit_fromdate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
         uiModel.addAttribute("adminUnit_untildate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
     }
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/web/AdminUnitHierarchyController_Roo_Controller.aj b/javaee-project-team21/src/main/java/ee/itcollege/example/web/AdminUnitHierarchyController_Roo_Controller.aj
index bbc45e6..4128a1a 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/web/AdminUnitHierarchyController_Roo_Controller.aj
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/web/AdminUnitHierarchyController_Roo_Controller.aj
@@ -3,41 +3,20 @@
 
 package ee.itcollege.example.web;
 
-import ee.itcollege.example.entities.AdminUnit;
 import ee.itcollege.example.entities.AdminUnitHierarchy;
 import java.io.UnsupportedEncodingException;
-import java.lang.Integer;
-import java.lang.Long;
 import java.lang.String;
-import java.util.Collection;
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 import org.joda.time.format.DateTimeFormat;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.util.UriUtils;
 import org.springframework.web.util.WebUtils;
 
 privileged aspect AdminUnitHierarchyController_Roo_Controller {
     
-    @RequestMapping(method = RequestMethod.POST)
-    public String AdminUnitHierarchyController.create(@Valid AdminUnitHierarchy adminUnitHierarchy, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            uiModel.addAttribute("adminUnitHierarchy", adminUnitHierarchy);
-            addDateTimeFormatPatterns(uiModel);
-            return "adminunithierarchys/create";
-        }
-        uiModel.asMap().clear();
-        adminUnitHierarchy.persist();
-        return "redirect:/adminunithierarchys/" + encodeUrlPathSegment(adminUnitHierarchy.getId().toString(), httpServletRequest);
-    }
-    
     @RequestMapping(params = "form", method = RequestMethod.GET)
     public String AdminUnitHierarchyController.createForm(Model uiModel) {
         uiModel.addAttribute("adminUnitHierarchy", new AdminUnitHierarchy());
@@ -45,72 +24,9 @@ privileged aspect AdminUnitHierarchyController_Roo_Controller {
         return "adminunithierarchys/create";
     }
     
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    public String AdminUnitHierarchyController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("adminunithierarchy", AdminUnitHierarchy.findAdminUnitHierarchy(id));
-        uiModel.addAttribute("itemId", id);
-        return "adminunithierarchys/show";
-    }
-    
-    @RequestMapping(method = RequestMethod.GET)
-    public String AdminUnitHierarchyController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            uiModel.addAttribute("adminunithierarchys", AdminUnitHierarchy.findAdminUnitHierarchyEntries(page == null ? 0 : (page.intValue() - 1) * sizeNo, sizeNo));
-            float nrOfPages = (float) AdminUnitHierarchy.countAdminUnitHierarchys() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("adminunithierarchys", AdminUnitHierarchy.findAllAdminUnitHierarchys());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "adminunithierarchys/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT)
-    public String AdminUnitHierarchyController.update(@Valid AdminUnitHierarchy adminUnitHierarchy, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            uiModel.addAttribute("adminUnitHierarchy", adminUnitHierarchy);
-            addDateTimeFormatPatterns(uiModel);
-            return "adminunithierarchys/update";
-        }
-        uiModel.asMap().clear();
-        adminUnitHierarchy.merge();
-        return "redirect:/adminunithierarchys/" + encodeUrlPathSegment(adminUnitHierarchy.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", method = RequestMethod.GET)
-    public String AdminUnitHierarchyController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("adminUnitHierarchy", AdminUnitHierarchy.findAdminUnitHierarchy(id));
-        addDateTimeFormatPatterns(uiModel);
-        return "adminunithierarchys/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    public String AdminUnitHierarchyController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        AdminUnitHierarchy.findAdminUnitHierarchy(id).remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/adminunithierarchys";
-    }
-    
-    @ModelAttribute("adminunits")
-    public Collection<AdminUnit> AdminUnitHierarchyController.populateAdminUnits() {
-        return AdminUnit.findAllAdminUnits();
-    }
-    
-    @ModelAttribute("adminunithierarchys")
-    public Collection<AdminUnitHierarchy> AdminUnitHierarchyController.populateAdminUnitHierarchys() {
-        return AdminUnitHierarchy.findAllAdminUnitHierarchys();
-    }
-    
     void AdminUnitHierarchyController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("adminUnitHierarchy_openeddate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("adminUnitHierarchy_closeddate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
         uiModel.addAttribute("adminUnitHierarchy_fromdate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
         uiModel.addAttribute("adminUnitHierarchy_untildate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("adminUnitHierarchy_changeddate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
     }
     
     String AdminUnitHierarchyController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/web/AdminUnitTypeController_Roo_Controller.aj b/javaee-project-team21/src/main/java/ee/itcollege/example/web/AdminUnitTypeController_Roo_Controller.aj
index c49e25f..088f002 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/web/AdminUnitTypeController_Roo_Controller.aj
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/web/AdminUnitTypeController_Roo_Controller.aj
@@ -3,42 +3,20 @@
 
 package ee.itcollege.example.web;
 
-import ee.itcollege.example.entities.AdminUnit;
 import ee.itcollege.example.entities.AdminUnitType;
-import ee.itcollege.example.entities.AdminUnitTypeHierarchy;
 import java.io.UnsupportedEncodingException;
-import java.lang.Integer;
-import java.lang.Long;
 import java.lang.String;
-import java.util.Collection;
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 import org.joda.time.format.DateTimeFormat;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.util.UriUtils;
 import org.springframework.web.util.WebUtils;
 
 privileged aspect AdminUnitTypeController_Roo_Controller {
     
-    @RequestMapping(method = RequestMethod.POST)
-    public String AdminUnitTypeController.create(@Valid AdminUnitType adminUnitType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            uiModel.addAttribute("adminUnitType", adminUnitType);
-            addDateTimeFormatPatterns(uiModel);
-            return "adminunittypes/create";
-        }
-        uiModel.asMap().clear();
-        adminUnitType.persist();
-        return "redirect:/adminunittypes/" + encodeUrlPathSegment(adminUnitType.getId().toString(), httpServletRequest);
-    }
-    
     @RequestMapping(params = "form", method = RequestMethod.GET)
     public String AdminUnitTypeController.createForm(Model uiModel) {
         uiModel.addAttribute("adminUnitType", new AdminUnitType());
@@ -46,77 +24,9 @@ privileged aspect AdminUnitTypeController_Roo_Controller {
         return "adminunittypes/create";
     }
     
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    public String AdminUnitTypeController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("adminunittype", AdminUnitType.findAdminUnitType(id));
-        uiModel.addAttribute("itemId", id);
-        return "adminunittypes/show";
-    }
-    
-    @RequestMapping(method = RequestMethod.GET)
-    public String AdminUnitTypeController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            uiModel.addAttribute("adminunittypes", AdminUnitType.findAdminUnitTypeEntries(page == null ? 0 : (page.intValue() - 1) * sizeNo, sizeNo));
-            float nrOfPages = (float) AdminUnitType.countAdminUnitTypes() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("adminunittypes", AdminUnitType.findAllAdminUnitTypes());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "adminunittypes/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT)
-    public String AdminUnitTypeController.update(@Valid AdminUnitType adminUnitType, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            uiModel.addAttribute("adminUnitType", adminUnitType);
-            addDateTimeFormatPatterns(uiModel);
-            return "adminunittypes/update";
-        }
-        uiModel.asMap().clear();
-        adminUnitType.merge();
-        return "redirect:/adminunittypes/" + encodeUrlPathSegment(adminUnitType.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", method = RequestMethod.GET)
-    public String AdminUnitTypeController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("adminUnitType", AdminUnitType.findAdminUnitType(id));
-        addDateTimeFormatPatterns(uiModel);
-        return "adminunittypes/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    public String AdminUnitTypeController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        AdminUnitType.findAdminUnitType(id).remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/adminunittypes";
-    }
-    
-    @ModelAttribute("adminunits")
-    public Collection<AdminUnit> AdminUnitTypeController.populateAdminUnits() {
-        return AdminUnit.findAllAdminUnits();
-    }
-    
-    @ModelAttribute("adminunittypes")
-    public Collection<AdminUnitType> AdminUnitTypeController.populateAdminUnitTypes() {
-        return AdminUnitType.findAllAdminUnitTypes();
-    }
-    
-    @ModelAttribute("adminunittypehierarchys")
-    public Collection<AdminUnitTypeHierarchy> AdminUnitTypeController.populateAdminUnitTypeHierarchys() {
-        return AdminUnitTypeHierarchy.findAllAdminUnitTypeHierarchys();
-    }
-    
     void AdminUnitTypeController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("adminUnitType_openeddate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("adminUnitType_closeddate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
         uiModel.addAttribute("adminUnitType_fromdate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
         uiModel.addAttribute("adminUnitType_untildate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("adminUnitType_changeddate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
     }
     
     String AdminUnitTypeController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/web/AdminUnitTypeHierarchyController_Roo_Controller.aj b/javaee-project-team21/src/main/java/ee/itcollege/example/web/AdminUnitTypeHierarchyController_Roo_Controller.aj
index b5760cc..629c85f 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/web/AdminUnitTypeHierarchyController_Roo_Controller.aj
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/web/AdminUnitTypeHierarchyController_Roo_Controller.aj
@@ -3,114 +3,24 @@
 
 package ee.itcollege.example.web;
 
-import ee.itcollege.example.entities.AdminUnitType;
 import ee.itcollege.example.entities.AdminUnitTypeHierarchy;
 import java.io.UnsupportedEncodingException;
-import java.lang.Integer;
-import java.lang.Long;
 import java.lang.String;
-import java.util.Collection;
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import org.joda.time.format.DateTimeFormat;
-import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.util.UriUtils;
 import org.springframework.web.util.WebUtils;
 
 privileged aspect AdminUnitTypeHierarchyController_Roo_Controller {
     
-    @RequestMapping(method = RequestMethod.POST)
-    public String AdminUnitTypeHierarchyController.create(@Valid AdminUnitTypeHierarchy adminUnitTypeHierarchy, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            uiModel.addAttribute("adminUnitTypeHierarchy", adminUnitTypeHierarchy);
-            addDateTimeFormatPatterns(uiModel);
-            return "adminunittypehierarchys/create";
-        }
-        uiModel.asMap().clear();
-        adminUnitTypeHierarchy.persist();
-        return "redirect:/adminunittypehierarchys/" + encodeUrlPathSegment(adminUnitTypeHierarchy.getId().toString(), httpServletRequest);
-    }
-    
     @RequestMapping(params = "form", method = RequestMethod.GET)
     public String AdminUnitTypeHierarchyController.createForm(Model uiModel) {
         uiModel.addAttribute("adminUnitTypeHierarchy", new AdminUnitTypeHierarchy());
-        addDateTimeFormatPatterns(uiModel);
         return "adminunittypehierarchys/create";
     }
     
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    public String AdminUnitTypeHierarchyController.show(@PathVariable("id") Long id, Model uiModel) {
-        addDateTimeFormatPatterns(uiModel);
-        uiModel.addAttribute("adminunittypehierarchy", AdminUnitTypeHierarchy.findAdminUnitTypeHierarchy(id));
-        uiModel.addAttribute("itemId", id);
-        return "adminunittypehierarchys/show";
-    }
-    
-    @RequestMapping(method = RequestMethod.GET)
-    public String AdminUnitTypeHierarchyController.list(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        if (page != null || size != null) {
-            int sizeNo = size == null ? 10 : size.intValue();
-            uiModel.addAttribute("adminunittypehierarchys", AdminUnitTypeHierarchy.findAdminUnitTypeHierarchyEntries(page == null ? 0 : (page.intValue() - 1) * sizeNo, sizeNo));
-            float nrOfPages = (float) AdminUnitTypeHierarchy.countAdminUnitTypeHierarchys() / sizeNo;
-            uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
-        } else {
-            uiModel.addAttribute("adminunittypehierarchys", AdminUnitTypeHierarchy.findAllAdminUnitTypeHierarchys());
-        }
-        addDateTimeFormatPatterns(uiModel);
-        return "adminunittypehierarchys/list";
-    }
-    
-    @RequestMapping(method = RequestMethod.PUT)
-    public String AdminUnitTypeHierarchyController.update(@Valid AdminUnitTypeHierarchy adminUnitTypeHierarchy, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
-        if (bindingResult.hasErrors()) {
-            uiModel.addAttribute("adminUnitTypeHierarchy", adminUnitTypeHierarchy);
-            addDateTimeFormatPatterns(uiModel);
-            return "adminunittypehierarchys/update";
-        }
-        uiModel.asMap().clear();
-        adminUnitTypeHierarchy.merge();
-        return "redirect:/adminunittypehierarchys/" + encodeUrlPathSegment(adminUnitTypeHierarchy.getId().toString(), httpServletRequest);
-    }
-    
-    @RequestMapping(value = "/{id}", params = "form", method = RequestMethod.GET)
-    public String AdminUnitTypeHierarchyController.updateForm(@PathVariable("id") Long id, Model uiModel) {
-        uiModel.addAttribute("adminUnitTypeHierarchy", AdminUnitTypeHierarchy.findAdminUnitTypeHierarchy(id));
-        addDateTimeFormatPatterns(uiModel);
-        return "adminunittypehierarchys/update";
-    }
-    
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    public String AdminUnitTypeHierarchyController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
-        AdminUnitTypeHierarchy.findAdminUnitTypeHierarchy(id).remove();
-        uiModel.asMap().clear();
-        uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
-        uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
-        return "redirect:/adminunittypehierarchys";
-    }
-    
-    @ModelAttribute("adminunittypes")
-    public Collection<AdminUnitType> AdminUnitTypeHierarchyController.populateAdminUnitTypes() {
-        return AdminUnitType.findAllAdminUnitTypes();
-    }
-    
-    @ModelAttribute("adminunittypehierarchys")
-    public Collection<AdminUnitTypeHierarchy> AdminUnitTypeHierarchyController.populateAdminUnitTypeHierarchys() {
-        return AdminUnitTypeHierarchy.findAllAdminUnitTypeHierarchys();
-    }
-    
-    void AdminUnitTypeHierarchyController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("adminUnitTypeHierarchy_openeddate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("adminUnitTypeHierarchy_closeddate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("adminUnitTypeHierarchy_changeddate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
-    }
-    
     String AdminUnitTypeHierarchyController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
         String enc = httpServletRequest.getCharacterEncoding();
         if (enc == null) {
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj b/javaee-project-team21/src/main/java/ee/itcollege/example/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj
index 6e32e92..17865d4 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.aj
@@ -31,42 +31,42 @@ privileged aspect ApplicationConversionServiceFactoryBean_Roo_ConversionService
     
     static class ee.itcollege.example.web.ApplicationConversionServiceFactoryBean.AdminUnitConverter implements Converter<AdminUnit, String> {
         public String convert(AdminUnit adminUnit) {
-            return new StringBuilder().append(adminUnit.getOpenedBy()).append(" ").append(adminUnit.getOpenedDate()).append(" ").append(adminUnit.getClosedDate()).append(" ").append(adminUnit.getName()).toString();
+            return new StringBuilder().append(adminUnit.getOpenedBy()).append(" ").append(adminUnit.getOpenedDate()).append(" ").append(adminUnit.getClosedDate()).append(" ").append(adminUnit.getChangedBy()).toString();
         }
         
     }
     
     static class ee.itcollege.example.web.ApplicationConversionServiceFactoryBean.AdminUnitHierarchyConverter implements Converter<AdminUnitHierarchy, String> {
         public String convert(AdminUnitHierarchy adminUnitHierarchy) {
-            return new StringBuilder().append(adminUnitHierarchy.getOpenedBy()).append(" ").append(adminUnitHierarchy.getOpenedDate()).append(" ").append(adminUnitHierarchy.getClosedDate()).append(" ").append(adminUnitHierarchy.getComment()).toString();
+            return new StringBuilder().append(adminUnitHierarchy.getOpenedBy()).append(" ").append(adminUnitHierarchy.getOpenedDate()).append(" ").append(adminUnitHierarchy.getClosedDate()).append(" ").append(adminUnitHierarchy.getChangedBy()).toString();
         }
         
     }
     
     static class ee.itcollege.example.web.ApplicationConversionServiceFactoryBean.AdminUnitTypeConverter implements Converter<AdminUnitType, String> {
         public String convert(AdminUnitType adminUnitType) {
-            return new StringBuilder().append(adminUnitType.getOpenedBy()).append(" ").append(adminUnitType.getOpenedDate()).append(" ").append(adminUnitType.getClosedDate()).append(" ").append(adminUnitType.getName()).toString();
+            return new StringBuilder().append(adminUnitType.getOpenedBy()).append(" ").append(adminUnitType.getOpenedDate()).append(" ").append(adminUnitType.getClosedDate()).append(" ").append(adminUnitType.getChangedBy()).toString();
         }
         
     }
     
     static class ee.itcollege.example.web.ApplicationConversionServiceFactoryBean.AdminUnitTypeHierarchyConverter implements Converter<AdminUnitTypeHierarchy, String> {
         public String convert(AdminUnitTypeHierarchy adminUnitTypeHierarchy) {
-            return new StringBuilder().append(adminUnitTypeHierarchy.getOpenedBy()).append(" ").append(adminUnitTypeHierarchy.getOpenedDate()).append(" ").append(adminUnitTypeHierarchy.getClosedDate()).append(" ").append(adminUnitTypeHierarchy.getComment()).toString();
+            return new StringBuilder().append(adminUnitTypeHierarchy.getOpenedBy()).append(" ").append(adminUnitTypeHierarchy.getOpenedDate()).append(" ").append(adminUnitTypeHierarchy.getClosedDate()).append(" ").append(adminUnitTypeHierarchy.getChangedBy()).toString();
         }
         
     }
     
     static class ee.itcollege.example.web.ApplicationConversionServiceFactoryBean.RegimentConverter implements Converter<Regiment, String> {
         public String convert(Regiment regiment) {
-            return new StringBuilder().append(regiment.getOpenedBy()).append(" ").append(regiment.getOpenedDate()).append(" ").append(regiment.getClosedDate()).append(" ").append(regiment.getName()).toString();
+            return new StringBuilder().append(regiment.getOpenedBy()).append(" ").append(regiment.getOpenedDate()).append(" ").append(regiment.getClosedDate()).append(" ").append(regiment.getChangedBy()).toString();
         }
         
     }
     
     static class ee.itcollege.example.web.ApplicationConversionServiceFactoryBean.RegimentHierarchyConverter implements Converter<RegimentHierarchy, String> {
         public String convert(RegimentHierarchy regimentHierarchy) {
-            return new StringBuilder().append(regimentHierarchy.getOpenedBy()).append(" ").append(regimentHierarchy.getOpenedDate()).append(" ").append(regimentHierarchy.getClosedDate()).append(" ").append(regimentHierarchy.getComment()).toString();
+            return new StringBuilder().append(regimentHierarchy.getOpenedBy()).append(" ").append(regimentHierarchy.getOpenedDate()).append(" ").append(regimentHierarchy.getClosedDate()).append(" ").append(regimentHierarchy.getChangedBy()).toString();
         }
         
     }
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/web/RegimentController_Roo_Controller.aj b/javaee-project-team21/src/main/java/ee/itcollege/example/web/RegimentController_Roo_Controller.aj
index 1fe25ea..74d9af5 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/web/RegimentController_Roo_Controller.aj
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/web/RegimentController_Roo_Controller.aj
@@ -112,11 +112,8 @@ privileged aspect RegimentController_Roo_Controller {
     }
     
     void RegimentController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("regiment_openeddate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("regiment_closeddate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
         uiModel.addAttribute("regiment_fromdate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
         uiModel.addAttribute("regiment_untildate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("regiment_changeddate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
     }
     
     String RegimentController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
diff --git a/javaee-project-team21/src/main/java/ee/itcollege/example/web/RegimentHierarchyController_Roo_Controller.aj b/javaee-project-team21/src/main/java/ee/itcollege/example/web/RegimentHierarchyController_Roo_Controller.aj
index 70d948b..9f3860b 100644
--- a/javaee-project-team21/src/main/java/ee/itcollege/example/web/RegimentHierarchyController_Roo_Controller.aj
+++ b/javaee-project-team21/src/main/java/ee/itcollege/example/web/RegimentHierarchyController_Roo_Controller.aj
@@ -106,11 +106,8 @@ privileged aspect RegimentHierarchyController_Roo_Controller {
     }
     
     void RegimentHierarchyController.addDateTimeFormatPatterns(Model uiModel) {
-        uiModel.addAttribute("regimentHierarchy_openeddate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("regimentHierarchy_closeddate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
         uiModel.addAttribute("regimentHierarchy_fromdate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
         uiModel.addAttribute("regimentHierarchy_untildate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
-        uiModel.addAttribute("regimentHierarchy_changeddate_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
     }
     
     String RegimentHierarchyController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/i18n/application.et.properties b/javaee-project-team21/src/main/webapp/WEB-INF/i18n/application.et.properties
index fd2342f..4917744 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/i18n/application.et.properties
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/i18n/application.et.properties
@@ -111,3 +111,4 @@ menu_item_regiment_list_label=Regiments
 menu_item_regiment_new_label=Regiment
 menu_item_regimenthierarchy_list_label=Regiment Hierarchys
 menu_item_regimenthierarchy_new_label=Regiment Hierarchy
+menu_item_subregimenthierarchys_new_label=Uus
\ No newline at end of file
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/i18n/application.properties b/javaee-project-team21/src/main/webapp/WEB-INF/i18n/application.properties
index bbf674c..de0c8f1 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/i18n/application.properties
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/i18n/application.properties
@@ -1,128 +1,131 @@
-#Updated at Sun Dec 04 23:09:55 EET 2011
-#Sun Dec 04 23:09:55 EET 2011
-application_name=Javaee-project-team21
-label_ee_itcollege_example_entities_adminunit=Admin Unit
-label_ee_itcollege_example_entities_adminunit__id=_id
-label_ee_itcollege_example_entities_adminunit_adminunithierarchys=Admin Unit Hierarchys
-label_ee_itcollege_example_entities_adminunit_adminunittype=Admin Unit Type
-label_ee_itcollege_example_entities_adminunit_changedby=Changed By
-label_ee_itcollege_example_entities_adminunit_changeddate=Changed Date
-label_ee_itcollege_example_entities_adminunit_closedby=Closed By
-label_ee_itcollege_example_entities_adminunit_closeddate=Closed Date
-label_ee_itcollege_example_entities_adminunit_code=Code
-label_ee_itcollege_example_entities_adminunit_comment=Comment
-label_ee_itcollege_example_entities_adminunit_fromdate=From Date
-label_ee_itcollege_example_entities_adminunit_id=Id
-label_ee_itcollege_example_entities_adminunit_name=Name
-label_ee_itcollege_example_entities_adminunit_openedby=Opened By
-label_ee_itcollege_example_entities_adminunit_openeddate=Opened Date
-label_ee_itcollege_example_entities_adminunit_plural=Admin Units
-label_ee_itcollege_example_entities_adminunit_regiments=Regiments
-label_ee_itcollege_example_entities_adminunit_subunithierarchys=Sub Unit Hierarchys
-label_ee_itcollege_example_entities_adminunit_untildate=Until Date
-label_ee_itcollege_example_entities_adminunit_version=Version
-label_ee_itcollege_example_entities_adminunithierarchy=Admin Unit Hierarchy
-label_ee_itcollege_example_entities_adminunithierarchy__id=_id
-label_ee_itcollege_example_entities_adminunithierarchy_adminunit=Admin Unit
-label_ee_itcollege_example_entities_adminunithierarchy_changedby=Changed By
-label_ee_itcollege_example_entities_adminunithierarchy_changeddate=Changed Date
-label_ee_itcollege_example_entities_adminunithierarchy_closedby=Closed By
-label_ee_itcollege_example_entities_adminunithierarchy_closeddate=Closed Date
-label_ee_itcollege_example_entities_adminunithierarchy_comment=Comment
-label_ee_itcollege_example_entities_adminunithierarchy_fromdate=From Date
-label_ee_itcollege_example_entities_adminunithierarchy_id=Id
-label_ee_itcollege_example_entities_adminunithierarchy_openedby=Opened By
-label_ee_itcollege_example_entities_adminunithierarchy_openeddate=Opened Date
-label_ee_itcollege_example_entities_adminunithierarchy_plural=Admin Unit Hierarchys
-label_ee_itcollege_example_entities_adminunithierarchy_subunit=Sub Unit
-label_ee_itcollege_example_entities_adminunithierarchy_untildate=Until Date
-label_ee_itcollege_example_entities_adminunithierarchy_version=Version
-label_ee_itcollege_example_entities_adminunittype=Admin Unit Type
-label_ee_itcollege_example_entities_adminunittype__id=_id
-label_ee_itcollege_example_entities_adminunittype_adminunits=Admin Units
-label_ee_itcollege_example_entities_adminunittype_adminunittypehierarchys=Admin Unit Type Hierarchys
-label_ee_itcollege_example_entities_adminunittype_changedby=Changed By
-label_ee_itcollege_example_entities_adminunittype_changeddate=Changed Date
-label_ee_itcollege_example_entities_adminunittype_closedby=Closed By
-label_ee_itcollege_example_entities_adminunittype_closeddate=Closed Date
-label_ee_itcollege_example_entities_adminunittype_code=Code
-label_ee_itcollege_example_entities_adminunittype_comment=Comment
-label_ee_itcollege_example_entities_adminunittype_fromdate=From Date
-label_ee_itcollege_example_entities_adminunittype_id=Id
-label_ee_itcollege_example_entities_adminunittype_name=Name
-label_ee_itcollege_example_entities_adminunittype_openedby=Opened By
-label_ee_itcollege_example_entities_adminunittype_openeddate=Opened Date
-label_ee_itcollege_example_entities_adminunittype_plural=Admin Unit Types
-label_ee_itcollege_example_entities_adminunittype_subadminunittypehierarchys=Sub Admin Unit Type Hierarchys
-label_ee_itcollege_example_entities_adminunittype_untildate=Until Date
-label_ee_itcollege_example_entities_adminunittype_version=Version
-label_ee_itcollege_example_entities_adminunittypehierarchy=Admin Unit Type Hierarchy
-label_ee_itcollege_example_entities_adminunittypehierarchy__id=_id
-label_ee_itcollege_example_entities_adminunittypehierarchy_adminunittype=Admin Unit Type
-label_ee_itcollege_example_entities_adminunittypehierarchy_changedby=Changed By
-label_ee_itcollege_example_entities_adminunittypehierarchy_changeddate=Changed Date
-label_ee_itcollege_example_entities_adminunittypehierarchy_closedby=Closed By
-label_ee_itcollege_example_entities_adminunittypehierarchy_closeddate=Closed Date
-label_ee_itcollege_example_entities_adminunittypehierarchy_comment=Comment
-label_ee_itcollege_example_entities_adminunittypehierarchy_id=Id
-label_ee_itcollege_example_entities_adminunittypehierarchy_openedby=Opened By
-label_ee_itcollege_example_entities_adminunittypehierarchy_openeddate=Opened Date
-label_ee_itcollege_example_entities_adminunittypehierarchy_plural=Admin Unit Type Hierarchys
-label_ee_itcollege_example_entities_adminunittypehierarchy_subadminunittype=Sub Admin Unit Type
-label_ee_itcollege_example_entities_adminunittypehierarchy_version=Version
-label_ee_itcollege_example_entities_regiment=Regiment
-label_ee_itcollege_example_entities_regiment__id=_id
-label_ee_itcollege_example_entities_regiment_adminunit=Admin Unit
-label_ee_itcollege_example_entities_regiment_changedby=Changed By
-label_ee_itcollege_example_entities_regiment_changeddate=Changed Date
-label_ee_itcollege_example_entities_regiment_closedby=Closed By
-label_ee_itcollege_example_entities_regiment_closeddate=Closed Date
-label_ee_itcollege_example_entities_regiment_code=Code
-label_ee_itcollege_example_entities_regiment_comment=Comment
-label_ee_itcollege_example_entities_regiment_fromdate=From Date
-label_ee_itcollege_example_entities_regiment_id=Id
-label_ee_itcollege_example_entities_regiment_name=Name
-label_ee_itcollege_example_entities_regiment_openedby=Opened By
-label_ee_itcollege_example_entities_regiment_openeddate=Opened Date
-label_ee_itcollege_example_entities_regiment_plural=Regiments
-label_ee_itcollege_example_entities_regiment_regimenthierarchys=Regiment Hierarchys
-label_ee_itcollege_example_entities_regiment_subregimenthierarchys=Sub Regiment Hierarchys
-label_ee_itcollege_example_entities_regiment_untildate=Until Date
-label_ee_itcollege_example_entities_regiment_version=Version
-label_ee_itcollege_example_entities_regimenthierarchy=Regiment Hierarchy
-label_ee_itcollege_example_entities_regimenthierarchy__id=_id
-label_ee_itcollege_example_entities_regimenthierarchy_changedby=Changed By
-label_ee_itcollege_example_entities_regimenthierarchy_changeddate=Changed Date
-label_ee_itcollege_example_entities_regimenthierarchy_closedby=Closed By
-label_ee_itcollege_example_entities_regimenthierarchy_closeddate=Closed Date
-label_ee_itcollege_example_entities_regimenthierarchy_comment=Comment
-label_ee_itcollege_example_entities_regimenthierarchy_fromdate=From Date
-label_ee_itcollege_example_entities_regimenthierarchy_id=Id
-label_ee_itcollege_example_entities_regimenthierarchy_openedby=Opened By
-label_ee_itcollege_example_entities_regimenthierarchy_openeddate=Opened Date
-label_ee_itcollege_example_entities_regimenthierarchy_plural=Regiment Hierarchys
-label_ee_itcollege_example_entities_regimenthierarchy_regiment=Regiment
-label_ee_itcollege_example_entities_regimenthierarchy_subregiment=Sub Regiment
-label_ee_itcollege_example_entities_regimenthierarchy_untildate=Until Date
-label_ee_itcollege_example_entities_regimenthierarchy_version=Version
-label_regimentedit_index=Regiment Edit Controller View
-menu_category_adminunit_label=Admin Unit
-menu_category_adminunithierarchy_label=Admin Unit Hierarchy
-menu_category_adminunittype_label=Admin Unit Type
-menu_category_adminunittypehierarchy_label=Admin Unit Type Hierarchy
-menu_category_controller_label=Controller
-menu_category_regiment_label=Regiment
-menu_category_regimenthierarchy_label=Regiment Hierarchy
-menu_item_adminunit_list_label=Admin Units
-menu_item_adminunit_new_label=Admin Unit
-menu_item_adminunithierarchy_list_label=Admin Unit Hierarchys
-menu_item_adminunithierarchy_new_label=Admin Unit Hierarchy
-menu_item_adminunittype_list_label=Admin Unit Types
-menu_item_adminunittype_new_label=Admin Unit Type
-menu_item_adminunittypehierarchy_list_label=Admin Unit Type Hierarchys
-menu_item_adminunittypehierarchy_new_label=Admin Unit Type Hierarchy
-menu_item_controller__regimenteditindex_id_label=Regiment Edit Controller View
-menu_item_regiment_list_label=Regiments
-menu_item_regiment_new_label=Regiment
-menu_item_regimenthierarchy_list_label=Regiment Hierarchys
-menu_item_regimenthierarchy_new_label=Regiment Hierarchy
+#Updated at Sun Dec 18 17:45:00 EET 2011
+#Sun Dec 18 17:45:00 EET 2011
+application_name=Javaee-project-team21
+label_ee_itcollege_example_entities_adminunit=Admin Unit
+label_ee_itcollege_example_entities_adminunit__id=_id
+label_ee_itcollege_example_entities_adminunit_adminunithierarchys=Admin Unit Hierarchys
+label_ee_itcollege_example_entities_adminunit_adminunittype=Admin Unit Type
+label_ee_itcollege_example_entities_adminunit_changedby=Changed By
+label_ee_itcollege_example_entities_adminunit_changeddate=Changed Date
+label_ee_itcollege_example_entities_adminunit_closedby=Closed By
+label_ee_itcollege_example_entities_adminunit_closeddate=Closed Date
+label_ee_itcollege_example_entities_adminunit_code=Code
+label_ee_itcollege_example_entities_adminunit_comment=Comment
+label_ee_itcollege_example_entities_adminunit_fromdate=From Date
+label_ee_itcollege_example_entities_adminunit_id=Id
+label_ee_itcollege_example_entities_adminunit_name=Name
+label_ee_itcollege_example_entities_adminunit_openedby=Opened By
+label_ee_itcollege_example_entities_adminunit_openeddate=Opened Date
+label_ee_itcollege_example_entities_adminunit_plural=Admin Units
+label_ee_itcollege_example_entities_adminunit_regiments=Regiments
+label_ee_itcollege_example_entities_adminunit_subunithierarchys=Sub Unit Hierarchys
+label_ee_itcollege_example_entities_adminunit_untildate=Until Date
+label_ee_itcollege_example_entities_adminunit_version=Version
+label_ee_itcollege_example_entities_adminunithierarchy=Admin Unit Hierarchy
+label_ee_itcollege_example_entities_adminunithierarchy__id=_id
+label_ee_itcollege_example_entities_adminunithierarchy_adminunit=Admin Unit
+label_ee_itcollege_example_entities_adminunithierarchy_changedby=Changed By
+label_ee_itcollege_example_entities_adminunithierarchy_changeddate=Changed Date
+label_ee_itcollege_example_entities_adminunithierarchy_closedby=Closed By
+label_ee_itcollege_example_entities_adminunithierarchy_closeddate=Closed Date
+label_ee_itcollege_example_entities_adminunithierarchy_comment=Comment
+label_ee_itcollege_example_entities_adminunithierarchy_fromdate=From Date
+label_ee_itcollege_example_entities_adminunithierarchy_id=Id
+label_ee_itcollege_example_entities_adminunithierarchy_openedby=Opened By
+label_ee_itcollege_example_entities_adminunithierarchy_openeddate=Opened Date
+label_ee_itcollege_example_entities_adminunithierarchy_plural=Admin Unit Hierarchys
+label_ee_itcollege_example_entities_adminunithierarchy_subunit=Sub Unit
+label_ee_itcollege_example_entities_adminunithierarchy_untildate=Until Date
+label_ee_itcollege_example_entities_adminunithierarchy_version=Version
+label_ee_itcollege_example_entities_adminunittype=Admin Unit Type
+label_ee_itcollege_example_entities_adminunittype__id=_id
+label_ee_itcollege_example_entities_adminunittype_adminunits=Admin Units
+label_ee_itcollege_example_entities_adminunittype_adminunittypehierarchys=Admin Unit Type Hierarchys
+label_ee_itcollege_example_entities_adminunittype_changedby=Changed By
+label_ee_itcollege_example_entities_adminunittype_changeddate=Changed Date
+label_ee_itcollege_example_entities_adminunittype_closedby=Closed By
+label_ee_itcollege_example_entities_adminunittype_closeddate=Closed Date
+label_ee_itcollege_example_entities_adminunittype_code=Code
+label_ee_itcollege_example_entities_adminunittype_comment=Comment
+label_ee_itcollege_example_entities_adminunittype_fromdate=From Date
+label_ee_itcollege_example_entities_adminunittype_id=Id
+label_ee_itcollege_example_entities_adminunittype_name=Name
+label_ee_itcollege_example_entities_adminunittype_openedby=Opened By
+label_ee_itcollege_example_entities_adminunittype_openeddate=Opened Date
+label_ee_itcollege_example_entities_adminunittype_plural=Admin Unit Types
+label_ee_itcollege_example_entities_adminunittype_subadminunittypehierarchys=Sub Admin Unit Type Hierarchys
+label_ee_itcollege_example_entities_adminunittype_untildate=Until Date
+label_ee_itcollege_example_entities_adminunittype_version=Version
+label_ee_itcollege_example_entities_adminunittypehierarchy=Admin Unit Type Hierarchy
+label_ee_itcollege_example_entities_adminunittypehierarchy__id=_id
+label_ee_itcollege_example_entities_adminunittypehierarchy_adminunittype=Admin Unit Type
+label_ee_itcollege_example_entities_adminunittypehierarchy_changedby=Changed By
+label_ee_itcollege_example_entities_adminunittypehierarchy_changeddate=Changed Date
+label_ee_itcollege_example_entities_adminunittypehierarchy_closedby=Closed By
+label_ee_itcollege_example_entities_adminunittypehierarchy_closeddate=Closed Date
+label_ee_itcollege_example_entities_adminunittypehierarchy_comment=Comment
+label_ee_itcollege_example_entities_adminunittypehierarchy_id=Id
+label_ee_itcollege_example_entities_adminunittypehierarchy_openedby=Opened By
+label_ee_itcollege_example_entities_adminunittypehierarchy_openeddate=Opened Date
+label_ee_itcollege_example_entities_adminunittypehierarchy_plural=Admin Unit Type Hierarchys
+label_ee_itcollege_example_entities_adminunittypehierarchy_subadminunittype=Sub Admin Unit Type
+label_ee_itcollege_example_entities_adminunittypehierarchy_version=Version
+label_ee_itcollege_example_entities_regiment=Regiment
+label_ee_itcollege_example_entities_regiment__id=_id
+label_ee_itcollege_example_entities_regiment_adminunit=Location
+label_ee_itcollege_example_entities_regiment_changedby=Changed By
+label_ee_itcollege_example_entities_regiment_changeddate=Changed Date
+label_ee_itcollege_example_entities_regiment_closedby=Closed By
+label_ee_itcollege_example_entities_regiment_closeddate=Closed Date
+label_ee_itcollege_example_entities_regiment_code=Code
+label_ee_itcollege_example_entities_regiment_comment=Comment
+label_ee_itcollege_example_entities_regiment_fromdate=From Date
+label_ee_itcollege_example_entities_regiment_id=Id
+label_ee_itcollege_example_entities_regiment_name=Name
+label_ee_itcollege_example_entities_regiment_openedby=Opened By
+label_ee_itcollege_example_entities_regiment_openeddate=Opened Date
+label_ee_itcollege_example_entities_regiment_parent=Parent
+label_ee_itcollege_example_entities_regiment_parentregiment=Parent Regiment
+label_ee_itcollege_example_entities_regiment_plural=Regiments
+label_ee_itcollege_example_entities_regiment_regimenthierarchys=Parent
+label_ee_itcollege_example_entities_regiment_subregimenthierarchys=Underlying
+label_ee_itcollege_example_entities_regiment_untildate=Until Date
+label_ee_itcollege_example_entities_regiment_version=Version
+label_ee_itcollege_example_entities_regimenthierarchy=Regiment Hierarchy
+label_ee_itcollege_example_entities_regimenthierarchy__id=_id
+label_ee_itcollege_example_entities_regimenthierarchy_changedby=Changed By
+label_ee_itcollege_example_entities_regimenthierarchy_changeddate=Changed Date
+label_ee_itcollege_example_entities_regimenthierarchy_closedby=Closed By
+label_ee_itcollege_example_entities_regimenthierarchy_closeddate=Closed Date
+label_ee_itcollege_example_entities_regimenthierarchy_comment=Comment
+label_ee_itcollege_example_entities_regimenthierarchy_fromdate=From Date
+label_ee_itcollege_example_entities_regimenthierarchy_id=Id
+label_ee_itcollege_example_entities_regimenthierarchy_openedby=Opened By
+label_ee_itcollege_example_entities_regimenthierarchy_openeddate=Opened Date
+label_ee_itcollege_example_entities_regimenthierarchy_plural=Regiment Hierarchys
+label_ee_itcollege_example_entities_regimenthierarchy_regiment=Regiment
+label_ee_itcollege_example_entities_regimenthierarchy_subregiment=Sub Regiment
+label_ee_itcollege_example_entities_regimenthierarchy_untildate=Until Date
+label_ee_itcollege_example_entities_regimenthierarchy_version=Version
+label_regimentedit_index=Regiment Edit Controller View
+menu_category_adminunit_label=Admin Unit
+menu_category_adminunithierarchy_label=Admin Unit Hierarchy
+menu_category_adminunittype_label=Admin Unit Type
+menu_category_adminunittypehierarchy_label=Admin Unit Type Hierarchy
+menu_category_controller_label=Controller
+menu_category_regiment_label=Regiment
+menu_category_regimenthierarchy_label=Regiment Hierarchy
+menu_item_adminunit_list_label=Admin Units
+menu_item_adminunit_new_label=Admin Unit
+menu_item_adminunithierarchy_list_label=Admin Unit Hierarchys
+menu_item_adminunithierarchy_new_label=Admin Unit Hierarchy
+menu_item_adminunittype_list_label=Admin Unit Types
+menu_item_adminunittype_new_label=Admin Unit Type
+menu_item_adminunittypehierarchy_list_label=Admin Unit Type Hierarchys
+menu_item_adminunittypehierarchy_new_label=Admin Unit Type Hierarchy
+menu_item_controller__regimenteditindex_id_label=Regiment Edit Controller View
+menu_item_regiment_list_label=Regiments
+menu_item_regiment_new_label=Regiment
+menu_item_regimenthierarchy_list_label=Regiment Hierarchys
+menu_item_regimenthierarchy_new_label=Regiment Hierarchy
+menu_item_subregimenthierarchys_new_label=New
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/i18n/messages.et.properties b/javaee-project-team21/src/main/webapp/WEB-INF/i18n/messages.et.properties
index 1898f98..a764c55 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/i18n/messages.et.properties
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/i18n/messages.et.properties
@@ -41,6 +41,9 @@ button_end=L
 button_showmessage=Show Message
 button_showstacktrace=Show Stack Trace
 button_showcookie=Show Cookie
+button_add=Lisa
+button_remove=Eemalda
+button_change=Muuda
 
 #field labels
 field_simple_validation=Enter {0} {1}
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/i18n/messages.properties b/javaee-project-team21/src/main/webapp/WEB-INF/i18n/messages.properties
index a8e2e04..f5ab951 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/i18n/messages.properties
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/i18n/messages.properties
@@ -41,6 +41,9 @@ button_end=End
 button_showmessage=Show Message
 button_showstacktrace=Show Stack Trace
 button_showcookie=Show Cookie
+button_add=Add
+button_remove=Remove
+button_change=Change
 
 
 #field labels
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/i18n/messages_de.properties b/javaee-project-team21/src/main/webapp/WEB-INF/i18n/messages_de.properties
index a369899..063ae62 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/i18n/messages_de.properties
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/i18n/messages_de.properties
@@ -41,6 +41,9 @@ button_end=Ende
 button_showmessage=Meldung Anzeigen
 button_showstacktrace=Stack Trace Anzeigen
 button_showcookie=Cookie Anzeigen
+button_add=Add
+button_remove=Remove
+button_change=Change
 
 #field labels
 field_simple_validation=Bitte {0} eingeben {1}
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/create.tagx b/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/create.tagx
index ef74243..22ec781 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/create.tagx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/create.tagx
@@ -48,8 +48,9 @@
         <jsp:doBody />
         <div class="submit" id="${fn:escapeXml(id)}_submit">
           <spring:message code="button_save" var="save_button" htmlEscape="false" />
+          <spring:message code="button_reset" var="reset_button" htmlEscape="false" />
           <script type="text/javascript">Spring.addDecoration(new Spring.ValidateAllDecoration({elementId:'proceed', event:'onclick'}));</script>
-          <input id="proceed" type="submit" value="${fn:escapeXml(save_button)}"/>
+          <input id="proceed" type="submit" value="${fn:escapeXml(save_button)}"/> <input id="reset" type="reset" value="${fn:escapeXml(reset_button)}"/>
         </div>
       </form:form>
     </util:panel>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/customTable.tagx b/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/customTable.tagx
new file mode 100644
index 0000000..f5f8e1c
--- /dev/null
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/customTable.tagx
@@ -0,0 +1,169 @@
+<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" xmlns:spring="http://www.springframework.org/tags" xmlns:form="http://www.springframework.org/tags/form" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
+  <jsp:directive.tag import="java.util.ArrayList" />
+  <jsp:output omit-xml-declaration="yes" />
+
+  <jsp:directive.attribute name="id" type="java.lang.String" required="true" rtexprvalue="true" description="The identifier for this tag (do not change!)" />
+  <jsp:directive.attribute name="data" type="java.util.Collection" required="true" rtexprvalue="true" description="The collection to be displayed in the table" />
+  <jsp:directive.attribute name="path" type="java.lang.String" required="true" rtexprvalue="true" description="Specify the URL path" />
+  <jsp:directive.attribute name="typeIdFieldName" type="java.lang.String" required="false" rtexprvalue="true" description="The identifier field name for the type (defaults to 'id')" />
+  <jsp:directive.attribute name="create" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Include 'create' link into table (default true)" />
+  <jsp:directive.attribute name="update" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Include 'update' link into table (default true)" />
+  <jsp:directive.attribute name="delete" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Include 'delete' link into table (default true)" />
+  <jsp:directive.attribute name="view" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Include 'view' link into table (default true)" />
+  <jsp:directive.attribute name="render" type="java.lang.Boolean" required="false" rtexprvalue="true" description="Indicate if the contents of this tag and all enclosed tags should be rendered (default 'true')" />
+  <jsp:directive.attribute name="z" type="java.lang.String" required="false" description="Used for checking if element has been modified (to recalculate simply provide empty string value)" />
+  <jsp:directive.attribute name="columnLabels" type="java.lang.String" required="false" rtexprvalue="true" description="Column labels" />
+  <jsp:directive.attribute name="columnProperties" type="java.lang.String" required="false" rtexprvalue="true" description="Column properties" />
+  <jsp:directive.attribute name="columnTypes" type="java.lang.String" required="false" rtexprvalue="true" description="Column types" />
+  <jsp:directive.attribute name="columnMaxLengths" type="java.lang.String" required="false" rtexprvalue="true" description="Column max len" />
+  <jsp:directive.attribute name="columnDatePatterns" type="java.lang.String" required="false" rtexprvalue="true" description="Column date patterns" />
+
+  <c:if test="${empty render or render}">
+	<jsp:doBody />
+
+    <c:if test="${empty typeIdFieldName}">
+      <c:set var="typeIdFieldName" value="id" />
+    </c:if>
+
+    <c:if test="${empty update}">
+      <c:set var="update" value="true" />
+    </c:if>
+
+    <c:if test="${empty delete}">
+      <c:set var="delete" value="true" />
+    </c:if>
+
+    <spring:message var="typeName" code="menu_item_${fn:toLowerCase(fn:split(id,'_')[fn:length(fn:split(id,'_')) - 1])}_new_label" htmlEscape="false" />
+    <c:set var="lengths" value="${fn:split(columnMaxLengths, ',')}" scope="request" />
+    <c:set var="types" value="${fn:split(columnTypes, ',')}" scope="request" />
+    <c:set var="patterns" value="${fn:split(columnDatePatterns, ',')}" scope="request" />
+	
+    <spring:eval var="colCounter" expression="1" />
+    
+    <table>
+      <thead>
+        <tr>
+          <c:forTokens items="${columnLabels}" delims="," var="columnHeading">
+            <th>
+              <c:out value="${columnHeading}" />
+              <spring:eval var="colCounter" expression="colCounter  + 1" />
+            </th>
+          </c:forTokens>
+          <c:if test="${view}">
+	          <th></th>
+	          <spring:eval var="colCounter" expression="colCounter  + 1" />
+          </c:if>
+          <c:if test="${update}">
+            <th></th>
+            <spring:eval var="colCounter" expression="colCounter  + 1" />
+          </c:if>
+          <c:if test="${delete}">
+            <th></th>
+            <spring:eval var="colCounter" expression="colCounter  + 1" />
+          </c:if>
+        </tr>
+      </thead>
+      <c:forEach items="${data}" var="item">
+        <tr>
+          <c:forTokens items="${columnProperties}" delims="," var="column" varStatus="num">
+            <c:set var="columnMaxLength" value="${lengths[num.count-1]}" />
+            <c:set var="columnType" value="${types[num.count-1]}" />
+            <c:set var="columnDatePattern" value="${patterns[num.count-1]}" />
+            <td>
+              <c:choose>
+                <c:when test="${columnType eq 'date'}">
+                  <spring:escapeBody>
+                    <fmt:formatDate value="${item[column]}" pattern="${fn:escapeXml(columnDatePattern)}" var="colTxt" />
+                  </spring:escapeBody>
+                </c:when>
+                <c:when test="${columnType eq 'calendar'}">
+                  <spring:escapeBody>
+                    <fmt:formatDate value="${item[column].time}" pattern="${fn:escapeXml(columnDatePattern)}" var="colTxt"/>
+                  </spring:escapeBody>
+                </c:when>
+                <c:otherwise>
+                  <c:set var="colTxt">
+                    <spring:eval expression="item[column]" htmlEscape="false" />
+                  </c:set>
+                </c:otherwise>
+              </c:choose>
+              <c:if test="${columnMaxLength ge 0}">
+                <c:set value="${fn:substring(colTxt, 0, columnMaxLength)}" var="colTxt" />
+              </c:if>
+              <c:out value="${colTxt}" />
+            </td>
+          </c:forTokens>
+          <c:set var="itemId"><spring:eval expression="item[typeIdFieldName]"/></c:set>
+          <c:if test="${view}">
+	          <td class="utilbox">
+	            <spring:url value="${path}/${itemId}" var="show_form_url" />
+	            <spring:url value="/resources/images/show.png" var="show_image_url" />
+	            <spring:message arguments="${typeName}" code="entity_show" var="show_label" htmlEscape="false" />
+	            <a href="${fn:escapeXml(show_form_url)}" alt="${fn:escapeXml(show_label)}" title="${fn:escapeXml(show_label)}">
+	              <img alt="${fn:escapeXml(show_label)}" class="image" src="${fn:escapeXml(show_image_url)}" title="${fn:escapeXml(show_label)}" />
+	            </a>
+	          </td>
+          </c:if>
+          <c:if test="${update}">
+            <td class="utilbox">
+              <spring:url value="${path}/${itemId}" var="update_form_url">
+                <spring:param name="form" />
+              </spring:url>
+              <spring:url value="/resources/images/update.png" var="update_image_url" />
+              <spring:message arguments="${typeName}" code="entity_update" var="update_label" htmlEscape="false" />
+              <a href="${fn:escapeXml(update_form_url)}" alt="${fn:escapeXml(update_label)}" title="${fn:escapeXml(update_label)}">
+                <img alt="${fn:escapeXml(update_label)}" class="image" src="${fn:escapeXml(update_image_url)}" title="${fn:escapeXml(update_label)}" />
+              </a>
+            </td>
+          </c:if>
+          <c:if test="${delete}">
+            <td class="utilbox">
+              <spring:url value="${path}/${itemId}" var="delete_form_url" />
+              <spring:url value="/resources/images/delete.png" var="delete_image_url" />
+              <form:form action="${fn:escapeXml(delete_form_url)}" method="DELETE">
+                <spring:message arguments="${typeName}" code="entity_delete" var="delete_label" htmlEscape="false" />
+                <c:set var="delete_confirm_msg">
+                  <spring:escapeBody javaScriptEscape="true">
+                    <spring:message code="entity_delete_confirm" />
+                  </spring:escapeBody>
+                </c:set>
+				<spring:message code="button_remove" var="remove_button" htmlEscape="false" />
+                <input class="button" title="${fn:escapeXml(delete_label)}" type="submit" value="${fn:escapeXml(remove_button)}" onclick="return confirm('${delete_confirm_msg}');" />
+                <c:if test="${not empty param.page}">
+                  <input name="page" type="hidden" value="1" />
+                </c:if>
+                <c:if test="${not empty param.size}">
+                  <input name="size" type="hidden" value="${fn:escapeXml(param.size)}" />
+                </c:if>
+              </form:form>
+            </td>
+          </c:if>
+        </tr>
+      </c:forEach>
+      <c:if test="${not empty maxPages}">
+      <tr class="footer">
+        <td colspan="${colCounter}">
+            <util:pagination maxPages="${maxPages}" page="${param.page}" size="${param.size}" />
+        </td>
+      </tr>
+      </c:if>
+    </table>
+    <div class="table-new">
+    <c:if test="${empty create or create}">
+      <span class="new">
+        <spring:url value="${path}" var="create_url">
+          <spring:param name="form" />
+        </spring:url>
+        <a href="${fn:escapeXml(create_url)}" class="button">
+          <spring:url value="/resources/images/add.png" var="create_img_url" />
+		  <spring:message code="button_add" var="add_button" htmlEscape="false" />
+          <spring:message arguments="${typeName}" code="global_menu_new" var="add_message" htmlEscape="false" />
+          <span title="${fn:escapeXml(add_message)}">${fn:escapeXml(add_button)}</span>
+        </a>
+      </span>
+      <c:out value=" " />
+    </c:if>
+	</div>
+  </c:if>
+
+</jsp:root>
\ No newline at end of file
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx b/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx
index 9346612..a9511d7 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/datetime.tagx
@@ -36,7 +36,6 @@
     <div id="_${sec_id}_id">
       <label for="_${sec_field}_id">
         <c:out value="${label}" />
-        :
       </label>
       <c:choose>
         <c:when test="${disableFormBinding}">
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/input.tagx b/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/input.tagx
index aff5ea1..ad87356 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/input.tagx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/input.tagx
@@ -58,7 +58,6 @@
     <div id="_${fn:escapeXml(id)}_id">
       <label for="_${sec_field}_id">
         <c:out value="${fn:escapeXml(label)}" />
-        :
       </label>
       <c:choose>
         <c:when test="${disableFormBinding}">
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/select.tagx b/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/select.tagx
index e454985..7565c9f 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/select.tagx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/select.tagx
@@ -46,7 +46,6 @@
         <c:when test="${not empty items}">
           <label for="_${sec_field}_id">
             <c:out value="${fn:escapeXml(label)}" />
-            :
           </label>
           <c:choose>
             <c:when test="${empty itemValue}">
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx b/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx
index 1b5ba23..365ddb3 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/fields/textarea.tagx
@@ -34,7 +34,6 @@
     <div id="_${fn:escapeXml(id)}_id">
       <label for="_${sec_field}_id">
         <c:out value="${fn:escapeXml(label)}" />
-        :
       </label>
       <form:textarea id="_${sec_field}_id" path="${sec_field}" disabled="${disabled}" />
       <br />
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/update.tagx b/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/update.tagx
index d54ec35..3b9a2e4 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/update.tagx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/tags/form/update.tagx
@@ -34,8 +34,9 @@
         <jsp:doBody />
         <div class="submit" id="${fn:escapeXml(id)}_submit">
           <spring:message code="button_save" var="save_button" htmlEscape="false" />
+          <spring:message code="button_reset" var="reset_button" htmlEscape="false" />
           <script type="text/javascript">Spring.addDecoration(new Spring.ValidateAllDecoration({elementId:'proceed', event:'onclick'}));</script>
-          <input id="proceed" type="submit" value="${fn:escapeXml(save_button)}" />
+          <input id="proceed" type="submit" value="${fn:escapeXml(save_button)}" /> <input id="reset" type="reset" value="${fn:escapeXml(reset_button)}" />
         </div>
         <form:hidden id="_${fn:escapeXml(idField)}_id" path="${fn:escapeXml(idField)}" />
         <c:if test="${versionField ne 'none'}">
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunithierarchys/create.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunithierarchys/create.jspx
index b3bcafc..c8a22b6 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunithierarchys/create.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunithierarchys/create.jspx
@@ -1,19 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_ee_itcollege_example_entities_AdminUnitHierarchy" modelAttribute="adminUnitHierarchy" path="/adminunithierarchys" render="${empty dependencies}" z="U0/8mynSx1b7puMBptN9rAfdaIE=">
-        <field:textarea field="comment" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_comment" required="true" z="g/JAxfWC9I/xhiiv8RQ7izn/JWY="/>
-        <field:datetime dateTimePattern="${adminUnitHierarchy_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_fromDate" required="true" z="23kIKoVS7gYl98Eokh42sxAADKM="/>
-        <field:datetime dateTimePattern="${adminUnitHierarchy_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_untilDate" z="kBr1OPKdp4/Mk08s0DGa/o50vMY="/>
-        <field:input field="openedBy" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_openedBy" z="DVtEQkbJanpQEe7nv7blXDy3eNg="/>
-        <field:datetime dateTimePattern="${adminUnitHierarchy_openeddate_date_format}" field="openedDate" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_openedDate" z="uE3WKdWXl28vaSNRPB7Z41LPUYE="/>
-        <field:input field="changedBy" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_changedBy" z="HnOw3YYTT/+OCDvaETD/B/8oUvo="/>
-        <field:datetime dateTimePattern="${adminUnitHierarchy_changeddate_date_format}" field="changedDate" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_changedDate" z="49fy4BZyAuPfhfskQ+XSAhAZQKY="/>
-        <field:input field="closedBy" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_closedBy" z="IVEiIuvlY+CA6nf1ON4cCXRJ2vw="/>
-        <field:datetime dateTimePattern="${adminUnitHierarchy_closeddate_date_format}" field="closedDate" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_closedDate" z="SVAi1uKxuYngAjLUkhXEmgcEz2c="/>
-        <field:select field="adminUnit" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_adminUnit" itemValue="id" items="${adminunits}" path="/adminunits" z="gDm+A0JGCpCibMGnLRiYlL2H1Fc="/>
-        <field:select field="subUnit" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_subUnit" itemValue="id" items="${adminunits}" path="/adminunits" z="aEW3A1zUVuXBReFo+nSZYqPqT3Y="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_ee_itcollege_example_entities_AdminUnitHierarchy" render="${not empty dependencies}" z="b4ebnuun3itX/gtAtF2yngkRPPc="/>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <form:create id="fc_ee_itcollege_example_entities_AdminUnitHierarchy" modelAttribute="adminUnitHierarchy" path="/adminunithierarchys" render="${empty dependencies}" z="U0/8mynSx1b7puMBptN9rAfdaIE=">
+        <field:textarea field="comment" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_comment" required="true" z="g/JAxfWC9I/xhiiv8RQ7izn/JWY="/>
+        <field:datetime dateTimePattern="${adminUnitHierarchy_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_fromDate" required="true" z="23kIKoVS7gYl98Eokh42sxAADKM="/>
+        <field:datetime dateTimePattern="${adminUnitHierarchy_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_untilDate" z="kBr1OPKdp4/Mk08s0DGa/o50vMY="/>
+        <field:select field="adminUnit" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_adminUnit" itemValue="id" items="${adminunits}" path="/adminunits" z="gDm+A0JGCpCibMGnLRiYlL2H1Fc="/>
+        <field:select field="subUnit" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_subUnit" itemValue="id" items="${adminunits}" path="/adminunits" z="aEW3A1zUVuXBReFo+nSZYqPqT3Y="/>
+    </form:create>
+    <form:dependency dependencies="${dependencies}" id="d_ee_itcollege_example_entities_AdminUnitHierarchy" render="${not empty dependencies}" z="b4ebnuun3itX/gtAtF2yngkRPPc="/>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunithierarchys/list.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunithierarchys/list.jspx
index 895356e..81ecd30 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunithierarchys/list.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunithierarchys/list.jspx
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_ee_itcollege_example_entities_AdminUnitHierarchy" items="${adminunithierarchys}" z="mbznZg9IgzD2GgjIn52zNzA13oU=">
-        <table:table data="${adminunithierarchys}" id="l_ee_itcollege_example_entities_AdminUnitHierarchy" path="/adminunithierarchys" z="iM4bZKMydH5dhpvbc3wJHtRdzks=">
-            <table:column id="c_ee_itcollege_example_entities_AdminUnitHierarchy_openedBy" property="openedBy" z="+/kgsguIYBbpgubEsGfE6QdMXpg="/>
-            <table:column date="true" dateTimePattern="${adminUnitHierarchy_openeddate_date_format}" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_openedDate" property="openedDate" z="PWJUQSP8cmMibtWw9ZfJr/Q1/lc="/>
-            <table:column date="true" dateTimePattern="${adminUnitHierarchy_closeddate_date_format}" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_closedDate" property="closedDate" z="3JmY6jxIdOdum2V5cj/h3ZCEDQU="/>
-            <table:column id="c_ee_itcollege_example_entities_AdminUnitHierarchy_comment" property="comment" z="zm+G7lvRiDY2nXbv9zyz32x3+/o="/>
-            <table:column date="true" dateTimePattern="${adminUnitHierarchy_fromdate_date_format}" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_fromDate" property="fromDate" z="Oy5Lp0/p9AP4LYeDajuwTXNlxDA="/>
-            <table:column date="true" dateTimePattern="${adminUnitHierarchy_untildate_date_format}" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_untilDate" property="untilDate" z="z/PfT5jMVPk+MmOy2sGlU2bTB7s="/>
-        </table:table>
-    </page:list>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <page:list id="pl_ee_itcollege_example_entities_AdminUnitHierarchy" items="${adminunithierarchys}" z="mbznZg9IgzD2GgjIn52zNzA13oU=">
+        <table:table data="${adminunithierarchys}" id="l_ee_itcollege_example_entities_AdminUnitHierarchy" path="/adminunithierarchys" z="iM4bZKMydH5dhpvbc3wJHtRdzks=">
+            <table:column id="c_ee_itcollege_example_entities_AdminUnitHierarchy_comment" property="comment" z="zm+G7lvRiDY2nXbv9zyz32x3+/o="/>
+            <table:column date="true" dateTimePattern="${adminUnitHierarchy_fromdate_date_format}" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_fromDate" property="fromDate" z="Oy5Lp0/p9AP4LYeDajuwTXNlxDA="/>
+            <table:column date="true" dateTimePattern="${adminUnitHierarchy_untildate_date_format}" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_untilDate" property="untilDate" z="z/PfT5jMVPk+MmOy2sGlU2bTB7s="/>
+            <table:column id="c_ee_itcollege_example_entities_AdminUnitHierarchy_adminUnit" property="adminUnit" z="NRo4ezHNn7ZLrIqo6ekOr69bnik="/>
+            <table:column id="c_ee_itcollege_example_entities_AdminUnitHierarchy_subUnit" property="subUnit" z="v6bcj9e+wPxtzvhA4ezRjpyTtbI="/>
+        </table:table>
+    </page:list>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunithierarchys/show.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunithierarchys/show.jspx
index a20ca79..a29dc4d 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunithierarchys/show.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunithierarchys/show.jspx
@@ -1,18 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_ee_itcollege_example_entities_AdminUnitHierarchy" object="${adminunithierarchy}" path="/adminunithierarchys" z="177V/3pVH00DwZedTrcOJBbHPI8=">
-        <field:display field="comment" id="s_ee_itcollege_example_entities_AdminUnitHierarchy_comment" object="${adminunithierarchy}" z="u7gg6QlxjpUMOPQbK1+ZQyYYgzs="/>
-        <field:display date="true" dateTimePattern="${adminUnitHierarchy_fromdate_date_format}" field="fromDate" id="s_ee_itcollege_example_entities_AdminUnitHierarchy_fromDate" object="${adminunithierarchy}" z="lxvsf5uq0OJOr+KGVTvfujeY4xo="/>
-        <field:display date="true" dateTimePattern="${adminUnitHierarchy_untildate_date_format}" field="untilDate" id="s_ee_itcollege_example_entities_AdminUnitHierarchy_untilDate" object="${adminunithierarchy}" z="GpNjcFRPobfv6DE5XwKZALZd72E="/>
-        <field:display field="openedBy" id="s_ee_itcollege_example_entities_AdminUnitHierarchy_openedBy" object="${adminunithierarchy}" z="iHAfW1reas1veYA3C9Cr4XKrKaA="/>
-        <field:display date="true" dateTimePattern="${adminUnitHierarchy_openeddate_date_format}" field="openedDate" id="s_ee_itcollege_example_entities_AdminUnitHierarchy_openedDate" object="${adminunithierarchy}" z="PouI8FqT0IHQgAiVjdAnHi7ium8="/>
-        <field:display field="changedBy" id="s_ee_itcollege_example_entities_AdminUnitHierarchy_changedBy" object="${adminunithierarchy}" z="+f7jUukzZzwk260q7TLZtDXrHrA="/>
-        <field:display date="true" dateTimePattern="${adminUnitHierarchy_changeddate_date_format}" field="changedDate" id="s_ee_itcollege_example_entities_AdminUnitHierarchy_changedDate" object="${adminunithierarchy}" z="lmkMAz4rU0CJfOTIkgaXr+p+vi8="/>
-        <field:display field="closedBy" id="s_ee_itcollege_example_entities_AdminUnitHierarchy_closedBy" object="${adminunithierarchy}" z="YV8AjyrY25Kb1R4KNtgsbs8rGAY="/>
-        <field:display date="true" dateTimePattern="${adminUnitHierarchy_closeddate_date_format}" field="closedDate" id="s_ee_itcollege_example_entities_AdminUnitHierarchy_closedDate" object="${adminunithierarchy}" z="srL0clGTdKZL8PHE/2VaVeos34c="/>
-        <field:display field="adminUnit" id="s_ee_itcollege_example_entities_AdminUnitHierarchy_adminUnit" object="${adminunithierarchy}" z="erX2NcqU+FPQQ/VvXK12+IOi0S0="/>
-        <field:display field="subUnit" id="s_ee_itcollege_example_entities_AdminUnitHierarchy_subUnit" object="${adminunithierarchy}" z="hOwHud2ah+PxGRKcjTOP1fu784s="/>
-    </page:show>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <page:show id="ps_ee_itcollege_example_entities_AdminUnitHierarchy" object="${adminunithierarchy}" path="/adminunithierarchys" z="177V/3pVH00DwZedTrcOJBbHPI8=">
+        <field:display field="comment" id="s_ee_itcollege_example_entities_AdminUnitHierarchy_comment" object="${adminunithierarchy}" z="u7gg6QlxjpUMOPQbK1+ZQyYYgzs="/>
+        <field:display date="true" dateTimePattern="${adminUnitHierarchy_fromdate_date_format}" field="fromDate" id="s_ee_itcollege_example_entities_AdminUnitHierarchy_fromDate" object="${adminunithierarchy}" z="lxvsf5uq0OJOr+KGVTvfujeY4xo="/>
+        <field:display date="true" dateTimePattern="${adminUnitHierarchy_untildate_date_format}" field="untilDate" id="s_ee_itcollege_example_entities_AdminUnitHierarchy_untilDate" object="${adminunithierarchy}" z="GpNjcFRPobfv6DE5XwKZALZd72E="/>
+        <field:display field="adminUnit" id="s_ee_itcollege_example_entities_AdminUnitHierarchy_adminUnit" object="${adminunithierarchy}" z="erX2NcqU+FPQQ/VvXK12+IOi0S0="/>
+        <field:display field="subUnit" id="s_ee_itcollege_example_entities_AdminUnitHierarchy_subUnit" object="${adminunithierarchy}" z="hOwHud2ah+PxGRKcjTOP1fu784s="/>
+    </page:show>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunithierarchys/update.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunithierarchys/update.jspx
index 17f4656..cd290b4 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunithierarchys/update.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunithierarchys/update.jspx
@@ -1,18 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_ee_itcollege_example_entities_AdminUnitHierarchy" modelAttribute="adminUnitHierarchy" path="/adminunithierarchys" versionField="Version" z="eTk7me0w7RdvGeBbSru0YjOE0oQ=">
-        <field:input field="openedBy" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_openedBy" z="DVtEQkbJanpQEe7nv7blXDy3eNg="/>
-        <field:datetime dateTimePattern="${adminUnitHierarchy_openeddate_date_format}" field="openedDate" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_openedDate" z="uE3WKdWXl28vaSNRPB7Z41LPUYE="/>
-        <field:datetime dateTimePattern="${adminUnitHierarchy_closeddate_date_format}" field="closedDate" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_closedDate" z="SVAi1uKxuYngAjLUkhXEmgcEz2c="/>
-        <field:textarea field="comment" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_comment" required="true" z="g/JAxfWC9I/xhiiv8RQ7izn/JWY="/>
-        <field:datetime dateTimePattern="${adminUnitHierarchy_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_fromDate" required="true" z="23kIKoVS7gYl98Eokh42sxAADKM="/>
-        <field:datetime dateTimePattern="${adminUnitHierarchy_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_untilDate" z="kBr1OPKdp4/Mk08s0DGa/o50vMY="/>
-        <field:input field="changedBy" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_changedBy" z="HnOw3YYTT/+OCDvaETD/B/8oUvo="/>
-        <field:datetime dateTimePattern="${adminUnitHierarchy_changeddate_date_format}" field="changedDate" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_changedDate" z="49fy4BZyAuPfhfskQ+XSAhAZQKY="/>
-        <field:input field="closedBy" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_closedBy" z="IVEiIuvlY+CA6nf1ON4cCXRJ2vw="/>
-        <field:select field="adminUnit" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_adminUnit" itemValue="id" items="${adminunits}" path="/adminunits" z="gDm+A0JGCpCibMGnLRiYlL2H1Fc="/>
-        <field:select field="subUnit" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_subUnit" itemValue="id" items="${adminunits}" path="/adminunits" z="aEW3A1zUVuXBReFo+nSZYqPqT3Y="/>
-    </form:update>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <form:update id="fu_ee_itcollege_example_entities_AdminUnitHierarchy" modelAttribute="adminUnitHierarchy" path="/adminunithierarchys" versionField="Version" z="eTk7me0w7RdvGeBbSru0YjOE0oQ=">
+        <field:textarea field="comment" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_comment" required="true" z="g/JAxfWC9I/xhiiv8RQ7izn/JWY="/>
+        <field:datetime dateTimePattern="${adminUnitHierarchy_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_fromDate" required="true" z="23kIKoVS7gYl98Eokh42sxAADKM="/>
+        <field:datetime dateTimePattern="${adminUnitHierarchy_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_untilDate" z="kBr1OPKdp4/Mk08s0DGa/o50vMY="/>
+        <field:select field="adminUnit" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_adminUnit" itemValue="id" items="${adminunits}" path="/adminunits" z="gDm+A0JGCpCibMGnLRiYlL2H1Fc="/>
+        <field:select field="subUnit" id="c_ee_itcollege_example_entities_AdminUnitHierarchy_subUnit" itemValue="id" items="${adminunits}" path="/adminunits" z="aEW3A1zUVuXBReFo+nSZYqPqT3Y="/>
+    </form:update>
+</div>
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..fce6f6e 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
@@ -1,22 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_ee_itcollege_example_entities_AdminUnit" modelAttribute="adminUnit" path="/adminunits" render="${empty dependencies}" z="rAfhmPBjzag+jWy2FRbDTZgocJA=">
-        <field:input field="name" id="c_ee_itcollege_example_entities_AdminUnit_name" max="30" min="2" required="true" z="ZrPcNbVKBQ6FkoMcgODoSHmDCNI="/>
-        <field:input field="code" id="c_ee_itcollege_example_entities_AdminUnit_code" max="10" min="1" required="true" z="EWVqOst6Mx0N1ov75qFng+B9Alk="/>
-        <field:textarea field="comment" id="c_ee_itcollege_example_entities_AdminUnit_comment" z="80b93jgVkf6GEeRJrN9M59EEQB4="/>
-        <field:datetime dateTimePattern="${adminUnit_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_AdminUnit_fromDate" required="true" z="3f4gC0PZSRiZqvHAK9imXU/J028="/>
-        <field:datetime dateTimePattern="${adminUnit_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_AdminUnit_untilDate" z="q3JCJn6TX+UcJrG05y/lLdcwv5g="/>
-        <field:input field="openedBy" id="c_ee_itcollege_example_entities_AdminUnit_openedBy" z="xz+bWfheqlFnAq2f1AlEbQ71v4k="/>
-        <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: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="/>
-        <field:datetime dateTimePattern="${adminUnit_closeddate_date_format}" field="closedDate" id="c_ee_itcollege_example_entities_AdminUnit_closedDate" z="qBOId1aDyAtTU76dYrWTviAMsPY="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_ee_itcollege_example_entities_AdminUnit" render="${not empty dependencies}" z="g4bDpGGfw7L+cy4tnRAx82Ix18w="/>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <form:create id="fc_ee_itcollege_example_entities_AdminUnit" modelAttribute="adminUnit" path="/adminunits" render="${empty dependencies}" z="rAfhmPBjzag+jWy2FRbDTZgocJA=">
+        <field:input field="name" id="c_ee_itcollege_example_entities_AdminUnit_name" max="30" min="2" required="true" z="ZrPcNbVKBQ6FkoMcgODoSHmDCNI="/>
+        <field:input field="code" id="c_ee_itcollege_example_entities_AdminUnit_code" max="10" min="1" required="true" z="EWVqOst6Mx0N1ov75qFng+B9Alk="/>
+        <field:textarea field="comment" id="c_ee_itcollege_example_entities_AdminUnit_comment" z="80b93jgVkf6GEeRJrN9M59EEQB4="/>
+        <field:datetime dateTimePattern="${adminUnit_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_AdminUnit_fromDate" required="true" z="3f4gC0PZSRiZqvHAK9imXU/J028="/>
+        <field:datetime dateTimePattern="${adminUnit_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_AdminUnit_untilDate" z="q3JCJn6TX+UcJrG05y/lLdcwv5g="/>
+        <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: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:create>
+    <form:dependency dependencies="${dependencies}" id="d_ee_itcollege_example_entities_AdminUnit" render="${not empty dependencies}" z="g4bDpGGfw7L+cy4tnRAx82Ix18w="/>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/list.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/list.jspx
index 9a8592e..6594a8b 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/list.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/list.jspx
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_ee_itcollege_example_entities_AdminUnit" items="${adminunits}" z="yd4AnNPEpa0759WEmT05PF2d+dU=">
-        <table:table data="${adminunits}" id="l_ee_itcollege_example_entities_AdminUnit" path="/adminunits" z="eXVbLA3N0OAuOp6kY5YzHyGOVMs=">
-            <table:column id="c_ee_itcollege_example_entities_AdminUnit_name" property="name" z="dYcS+Q/mdRktl6Affw1xmeCYX/s="/>
-            <table:column id="c_ee_itcollege_example_entities_AdminUnit_code" property="code" z="gVokgrQr9DpcdqCmkiK579ktgVo="/>
-            <table:column id="c_ee_itcollege_example_entities_AdminUnit_comment" property="comment" z="Mjm5tLR1UPnKmXxj+i8u3XrnWb0="/>
-            <table:column id="c_ee_itcollege_example_entities_AdminUnit_openedBy" property="openedBy" z="Pvtvx/Cy5CWP7Iv/koMorJSNSlY="/>
-            <table:column date="true" dateTimePattern="${adminUnit_openeddate_date_format}" id="c_ee_itcollege_example_entities_AdminUnit_openedDate" property="openedDate" z="f9vziK1QIKWBoP2ePbxEi0Y+Kks="/>
-            <table:column date="true" dateTimePattern="${adminUnit_closeddate_date_format}" id="c_ee_itcollege_example_entities_AdminUnit_closedDate" property="closedDate" z="7VFfPYPZeAaFQlwhl19JvTJUjkE="/>
-        </table:table>
-    </page:list>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <page:list id="pl_ee_itcollege_example_entities_AdminUnit" items="${adminunits}" z="yd4AnNPEpa0759WEmT05PF2d+dU=">
+        <table:table data="${adminunits}" id="l_ee_itcollege_example_entities_AdminUnit" path="/adminunits" z="eXVbLA3N0OAuOp6kY5YzHyGOVMs=">
+            <table:column id="c_ee_itcollege_example_entities_AdminUnit_name" property="name" z="dYcS+Q/mdRktl6Affw1xmeCYX/s="/>
+            <table:column id="c_ee_itcollege_example_entities_AdminUnit_code" property="code" z="gVokgrQr9DpcdqCmkiK579ktgVo="/>
+            <table:column id="c_ee_itcollege_example_entities_AdminUnit_comment" property="comment" z="Mjm5tLR1UPnKmXxj+i8u3XrnWb0="/>
+            <table:column date="true" dateTimePattern="${adminUnit_fromdate_date_format}" id="c_ee_itcollege_example_entities_AdminUnit_fromDate" property="fromDate" z="Hxtss1HxiPw9CekQcfW5P0hT6XQ="/>
+            <table:column date="true" dateTimePattern="${adminUnit_untildate_date_format}" id="c_ee_itcollege_example_entities_AdminUnit_untilDate" property="untilDate" z="JeP9Sx6Qj7wnUsB0AgwfVcS9j5s="/>
+            <table:column id="c_ee_itcollege_example_entities_AdminUnit_regiments" property="regiments" z="44/2SQ4mSNkTFUFbIDGw5q0hTKE="/>
+        </table:table>
+    </page:list>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/show.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/show.jspx
index 60505eb..9afcf29 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/show.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunits/show.jspx
@@ -1,34 +1,29 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_ee_itcollege_example_entities_AdminUnit" object="${adminunit}" path="/adminunits" z="dKZqf/gGWwXaCy3pWRbHju8NWao=">
-        <field:display field="name" id="s_ee_itcollege_example_entities_AdminUnit_name" object="${adminunit}" z="gxACS5h2jlsLWxIkuAZ9WvueaTM="/>
-        <field:display field="code" id="s_ee_itcollege_example_entities_AdminUnit_code" object="${adminunit}" z="MPJNfy6TP+GEk9bsFZocJYyaxzA="/>
-        <field:display field="comment" id="s_ee_itcollege_example_entities_AdminUnit_comment" object="${adminunit}" z="Ot4PWogA26K8iJePjSydmCsllLo="/>
-        <field:display date="true" dateTimePattern="${adminUnit_fromdate_date_format}" field="fromDate" id="s_ee_itcollege_example_entities_AdminUnit_fromDate" object="${adminunit}" z="e0g65GYjqZKFNyEGSl1T4uChUSw="/>
-        <field:display date="true" dateTimePattern="${adminUnit_untildate_date_format}" field="untilDate" id="s_ee_itcollege_example_entities_AdminUnit_untilDate" object="${adminunit}" z="2pWZCYOTFeos+fqlrPFKzbq+FIQ="/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <page:show id="ps_ee_itcollege_example_entities_AdminUnit" object="${adminunit}" path="/adminunits" z="dKZqf/gGWwXaCy3pWRbHju8NWao=">
+        <field:display field="name" id="s_ee_itcollege_example_entities_AdminUnit_name" object="${adminunit}" z="gxACS5h2jlsLWxIkuAZ9WvueaTM="/>
+        <field:display field="code" id="s_ee_itcollege_example_entities_AdminUnit_code" object="${adminunit}" z="MPJNfy6TP+GEk9bsFZocJYyaxzA="/>
+        <field:display field="comment" id="s_ee_itcollege_example_entities_AdminUnit_comment" object="${adminunit}" z="Ot4PWogA26K8iJePjSydmCsllLo="/>
+        <field:display date="true" dateTimePattern="${adminUnit_fromdate_date_format}" field="fromDate" id="s_ee_itcollege_example_entities_AdminUnit_fromDate" object="${adminunit}" z="e0g65GYjqZKFNyEGSl1T4uChUSw="/>
+        <field:display date="true" dateTimePattern="${adminUnit_untildate_date_format}" field="untilDate" id="s_ee_itcollege_example_entities_AdminUnit_untilDate" object="${adminunit}" z="2pWZCYOTFeos+fqlrPFKzbq+FIQ="/>
         <!--<field:display field="openedBy" id="s_ee_itcollege_example_entities_AdminUnit_openedBy" object="${adminunit}" z="kjUqIEE5140YmYhrEaskz5Ysyss="/>
         <field:display date="true" dateTimePattern="${adminUnit_openeddate_date_format}" field="openedDate" id="s_ee_itcollege_example_entities_AdminUnit_openedDate" object="${adminunit}" z="4vvOMeeEQ5ie9BwjWerlenCkKXM="/>
         <field:display field="changedBy" id="s_ee_itcollege_example_entities_AdminUnit_changedBy" object="${adminunit}" z="nCFczd14pXKuOUXiCERgob6wVPo="/>
         <field:display field="adminUnitType" id="s_ee_itcollege_example_entities_AdminUnit_adminUnitType" object="${adminunit}" z="4Mpk1tvoQDUgiLFbaOxqtelVuzU="/>
         <field:display field="closedBy" id="s_ee_itcollege_example_entities_AdminUnit_closedBy" object="${adminunit}" z="wEQqbJ2TIix+ftgPyqTp0Kq4xuc="/>
         <field:display date="true" dateTimePattern="${adminUnit_closeddate_date_format}" field="closedDate" id="s_ee_itcollege_example_entities_AdminUnit_closedDate" object="${adminunit}" z="Fty1GoKYfEkL82jPjuaD9DEXWyU="/>
-         -->
-        <!-- FIXME: non-translatable text -->
-        <div>Selles üksuses paiknevad väeosad</div>
-        <ul>
-            <c:forEach items="${adminunit.regiments}" var="b">
-                <li>
-                    <c:out value="${b.name}"/>
-                </li>
-            </c:forEach>
-        </ul>
-        <field:display field="openedBy" id="s_ee_itcollege_example_entities_AdminUnit_openedBy" object="${adminunit}" z="kjUqIEE5140YmYhrEaskz5Ysyss="/>
-        <field:display date="true" dateTimePattern="${adminUnit_openeddate_date_format}" field="openedDate" id="s_ee_itcollege_example_entities_AdminUnit_openedDate" object="${adminunit}" z="4vvOMeeEQ5ie9BwjWerlenCkKXM="/>
-        <field:display field="changedBy" id="s_ee_itcollege_example_entities_AdminUnit_changedBy" object="${adminunit}" z="nCFczd14pXKuOUXiCERgob6wVPo="/>
-        <field:display field="closedBy" id="s_ee_itcollege_example_entities_AdminUnit_closedBy" object="${adminunit}" z="wEQqbJ2TIix+ftgPyqTp0Kq4xuc="/>
-        <field:display date="true" dateTimePattern="${adminUnit_closeddate_date_format}" field="closedDate" id="s_ee_itcollege_example_entities_AdminUnit_closedDate" object="${adminunit}" z="Fty1GoKYfEkL82jPjuaD9DEXWyU="/>
-        <field:display field="adminUnitType" id="s_ee_itcollege_example_entities_AdminUnit_adminUnitType" object="${adminunit}" z="4Mpk1tvoQDUgiLFbaOxqtelVuzU="/>
-    </page:show>
-</div>
+         -->
+        <!-- FIXME: non-translatable text -->
+        <div>Selles üksuses paiknevad väeosad</div>
+        <ul>
+            <c:forEach items="${adminunit.regiments}" var="b">
+                <li>
+                    <c:out value="${b.name}"/>
+                </li>
+            </c:forEach>
+        </ul>
+        <field:display field="adminUnitType" id="s_ee_itcollege_example_entities_AdminUnit_adminUnitType" object="${adminunit}" z="4Mpk1tvoQDUgiLFbaOxqtelVuzU="/>
+    </page:show>
+</div>
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..44cc9df 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
@@ -1,21 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_ee_itcollege_example_entities_AdminUnit" modelAttribute="adminUnit" path="/adminunits" versionField="Version" z="CL17lXEd53Gh0bqEKO1frF/Wr50=">
-        <field:input field="openedBy" id="c_ee_itcollege_example_entities_AdminUnit_openedBy" z="xz+bWfheqlFnAq2f1AlEbQ71v4k="/>
-        <field:datetime dateTimePattern="${adminUnit_openeddate_date_format}" field="openedDate" id="c_ee_itcollege_example_entities_AdminUnit_openedDate" z="EI8oaStS18FMuSYgG3PsdXLWeRw="/>
-        <field:datetime dateTimePattern="${adminUnit_closeddate_date_format}" field="closedDate" id="c_ee_itcollege_example_entities_AdminUnit_closedDate" z="qBOId1aDyAtTU76dYrWTviAMsPY="/>
-        <field:input field="name" id="c_ee_itcollege_example_entities_AdminUnit_name" max="30" min="2" required="true" z="ZrPcNbVKBQ6FkoMcgODoSHmDCNI="/>
-        <field:input field="code" id="c_ee_itcollege_example_entities_AdminUnit_code" max="10" min="1" required="true" z="EWVqOst6Mx0N1ov75qFng+B9Alk="/>
-        <field:textarea field="comment" id="c_ee_itcollege_example_entities_AdminUnit_comment" z="80b93jgVkf6GEeRJrN9M59EEQB4="/>
-        <field:datetime dateTimePattern="${adminUnit_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_AdminUnit_fromDate" required="true" z="3f4gC0PZSRiZqvHAK9imXU/J028="/>
-        <field:datetime dateTimePattern="${adminUnit_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_AdminUnit_untilDate" z="q3JCJn6TX+UcJrG05y/lLdcwv5g="/>
-        <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: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>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <form:update id="fu_ee_itcollege_example_entities_AdminUnit" modelAttribute="adminUnit" path="/adminunits" versionField="Version" z="CL17lXEd53Gh0bqEKO1frF/Wr50=">
+        <field:input field="name" id="c_ee_itcollege_example_entities_AdminUnit_name" max="30" min="2" required="true" z="ZrPcNbVKBQ6FkoMcgODoSHmDCNI="/>
+        <field:input field="code" id="c_ee_itcollege_example_entities_AdminUnit_code" max="10" min="1" required="true" z="EWVqOst6Mx0N1ov75qFng+B9Alk="/>
+        <field:textarea field="comment" id="c_ee_itcollege_example_entities_AdminUnit_comment" z="80b93jgVkf6GEeRJrN9M59EEQB4="/>
+        <field:datetime dateTimePattern="${adminUnit_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_AdminUnit_fromDate" required="true" z="3f4gC0PZSRiZqvHAK9imXU/J028="/>
+        <field:datetime dateTimePattern="${adminUnit_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_AdminUnit_untilDate" z="q3JCJn6TX+UcJrG05y/lLdcwv5g="/>
+        <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: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>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypehierarchys/create.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypehierarchys/create.jspx
index 662b6e0..9b05500 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypehierarchys/create.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypehierarchys/create.jspx
@@ -1,17 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_ee_itcollege_example_entities_AdminUnitTypeHierarchy" modelAttribute="adminUnitTypeHierarchy" path="/adminunittypehierarchys" render="${empty dependencies}" z="7UYc4fN1E7jic35TWQ7sonCIT5Q=">
-        <field:textarea field="comment" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_comment" required="true" z="84qt4fYm6jmwPoQqqyxs5N6tF/E="/>
-        <field:input field="openedBy" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_openedBy" z="JNcheVj8DtUAlNY8nsyNqGoiesM="/>
-        <field:datetime dateTimePattern="${adminUnitTypeHierarchy_openeddate_date_format}" field="openedDate" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_openedDate" z="D90u5q4VEgKzTDVpraDuWn1iuO0="/>
-        <field:input field="changedBy" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_changedBy" z="575wCoj4FeEhvET8D6r6DJC5w1k="/>
-        <field:datetime dateTimePattern="${adminUnitTypeHierarchy_changeddate_date_format}" field="changedDate" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_changedDate" z="+3+iFmDCRiEEjdDxJiIa0Pg1OeM="/>
-        <field:input field="closedBy" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_closedBy" z="wziyBeMnehMswVkHJD7o8YjoKuw="/>
-        <field:datetime dateTimePattern="${adminUnitTypeHierarchy_closeddate_date_format}" field="closedDate" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_closedDate" z="KhsuhrdueXwipOzNLwR6V039WD8="/>
-        <field:select field="adminUnitType" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_adminUnitType" itemValue="id" items="${adminunittypes}" path="/adminunittypes" z="7V2UVdIJ5VL6II8+ntD1u81HPGs="/>
-        <field:select field="subAdminUnitType" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_subAdminUnitType" itemValue="id" items="${adminunittypes}" path="/adminunittypes" z="FVfzUFLlNaUUm8xQAZzxbB3WBpA="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_ee_itcollege_example_entities_AdminUnitTypeHierarchy" render="${not empty dependencies}" z="BzQ0N73opzh2LOSFRqmxfOsyPqs="/>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <form:create id="fc_ee_itcollege_example_entities_AdminUnitTypeHierarchy" modelAttribute="adminUnitTypeHierarchy" path="/adminunittypehierarchys" render="${empty dependencies}" z="7UYc4fN1E7jic35TWQ7sonCIT5Q=">
+        <field:textarea field="comment" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_comment" required="true" z="84qt4fYm6jmwPoQqqyxs5N6tF/E="/>
+        <field:select field="adminUnitType" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_adminUnitType" itemValue="id" items="${adminunittypes}" path="/adminunittypes" z="7V2UVdIJ5VL6II8+ntD1u81HPGs="/>
+        <field:select field="subAdminUnitType" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_subAdminUnitType" itemValue="id" items="${adminunittypes}" path="/adminunittypes" z="FVfzUFLlNaUUm8xQAZzxbB3WBpA="/>
+    </form:create>
+    <form:dependency dependencies="${dependencies}" id="d_ee_itcollege_example_entities_AdminUnitTypeHierarchy" render="${not empty dependencies}" z="BzQ0N73opzh2LOSFRqmxfOsyPqs="/>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypehierarchys/list.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypehierarchys/list.jspx
index f09a9cf..a9c4a02 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypehierarchys/list.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypehierarchys/list.jspx
@@ -1,15 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_ee_itcollege_example_entities_AdminUnitTypeHierarchy" items="${adminunittypehierarchys}" z="j5a6ZYOVaFAP7FPK6IOXMfh/244=">
-        <table:table data="${adminunittypehierarchys}" id="l_ee_itcollege_example_entities_AdminUnitTypeHierarchy" path="/adminunittypehierarchys" z="B7Uj6jcgazrBrk37CjIkCTkSxZ0=">
-            <table:column id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_comment" property="comment" z="5NHDF3mxJ+6Qxwsi+pt64q6gB7I="/>
-            <table:column id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_openedBy" property="openedBy" z="dk2h21KjNyLccbgdv2NrBkL5mHQ="/>
-            <table:column date="true" dateTimePattern="${adminUnitTypeHierarchy_openeddate_date_format}" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_openedDate" property="openedDate" z="Ba/Wn1FiUR8OSQGK6kBtFgiUKF4="/>
-            <table:column id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_changedBy" property="changedBy" z="IvKWU/kuUyPj8+osRuxDMlbu1Ww="/>
-            <table:column date="true" dateTimePattern="${adminUnitTypeHierarchy_changeddate_date_format}" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_changedDate" property="changedDate" z="2k4xWq20pJR8xrDskBIRXDm7abc="/>
-            <table:column date="true" dateTimePattern="${adminUnitTypeHierarchy_closeddate_date_format}" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_closedDate" property="closedDate" z="POOFp+QihRpgG69RO1pbf6tK/fw="/>
-        </table:table>
-    </page:list>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <page:list id="pl_ee_itcollege_example_entities_AdminUnitTypeHierarchy" items="${adminunittypehierarchys}" z="j5a6ZYOVaFAP7FPK6IOXMfh/244=">
+        <table:table data="${adminunittypehierarchys}" id="l_ee_itcollege_example_entities_AdminUnitTypeHierarchy" path="/adminunittypehierarchys" z="B7Uj6jcgazrBrk37CjIkCTkSxZ0=">
+            <table:column id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_comment" property="comment" z="5NHDF3mxJ+6Qxwsi+pt64q6gB7I="/>
+            <table:column id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_adminUnitType" property="adminUnitType" z="YqaWwQZV/F1tTb5OIHsgfLhbMQc="/>
+            <table:column id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_subAdminUnitType" property="subAdminUnitType" z="mxMrwd9q2LKhhEaHI5uia2LeR9o="/>
+        </table:table>
+    </page:list>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypehierarchys/show.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypehierarchys/show.jspx
index c749460..bcf77a6 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypehierarchys/show.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypehierarchys/show.jspx
@@ -1,16 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_ee_itcollege_example_entities_AdminUnitTypeHierarchy" object="${adminunittypehierarchy}" path="/adminunittypehierarchys" z="cXQQJYNI6dZLnQWX56UgaG739Vo=">
-        <field:display field="comment" id="s_ee_itcollege_example_entities_AdminUnitTypeHierarchy_comment" object="${adminunittypehierarchy}" z="119an33zYPnD+AF4lPzMm09r0As="/>
-        <field:display field="openedBy" id="s_ee_itcollege_example_entities_AdminUnitTypeHierarchy_openedBy" object="${adminunittypehierarchy}" z="lmzCW+lYxwNFVnJOb8fRmEQTWm0="/>
-        <field:display date="true" dateTimePattern="${adminUnitTypeHierarchy_openeddate_date_format}" field="openedDate" id="s_ee_itcollege_example_entities_AdminUnitTypeHierarchy_openedDate" object="${adminunittypehierarchy}" z="Ygp1MDcHUlaqLruMzMotrsxWfaA="/>
-        <field:display field="changedBy" id="s_ee_itcollege_example_entities_AdminUnitTypeHierarchy_changedBy" object="${adminunittypehierarchy}" z="59XSxzG5JyF+bpuP262y0jIl7wY="/>
-        <field:display date="true" dateTimePattern="${adminUnitTypeHierarchy_changeddate_date_format}" field="changedDate" id="s_ee_itcollege_example_entities_AdminUnitTypeHierarchy_changedDate" object="${adminunittypehierarchy}" z="qn008OZP+tqxIzVLjSk9IxoJmL8="/>
-        <field:display field="closedBy" id="s_ee_itcollege_example_entities_AdminUnitTypeHierarchy_closedBy" object="${adminunittypehierarchy}" z="6U/JVfg6g2kweZ8A8CtyqnWlD+0="/>
-        <field:display date="true" dateTimePattern="${adminUnitTypeHierarchy_closeddate_date_format}" field="closedDate" id="s_ee_itcollege_example_entities_AdminUnitTypeHierarchy_closedDate" object="${adminunittypehierarchy}" z="MzQ/XPyhZSqTM5r+Tv/jeDksyrk="/>
-        <field:display field="adminUnitType" id="s_ee_itcollege_example_entities_AdminUnitTypeHierarchy_adminUnitType" object="${adminunittypehierarchy}" z="UX5HGOnTVNOI79DYoDhI1xlMX9o="/>
-        <field:display field="subAdminUnitType" id="s_ee_itcollege_example_entities_AdminUnitTypeHierarchy_subAdminUnitType" object="${adminunittypehierarchy}" z="3H2NUDqlvuE79SbbZgIkwRZXVw8="/>
-    </page:show>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <page:show id="ps_ee_itcollege_example_entities_AdminUnitTypeHierarchy" object="${adminunittypehierarchy}" path="/adminunittypehierarchys" z="cXQQJYNI6dZLnQWX56UgaG739Vo=">
+        <field:display field="comment" id="s_ee_itcollege_example_entities_AdminUnitTypeHierarchy_comment" object="${adminunittypehierarchy}" z="119an33zYPnD+AF4lPzMm09r0As="/>
+        <field:display field="adminUnitType" id="s_ee_itcollege_example_entities_AdminUnitTypeHierarchy_adminUnitType" object="${adminunittypehierarchy}" z="UX5HGOnTVNOI79DYoDhI1xlMX9o="/>
+        <field:display field="subAdminUnitType" id="s_ee_itcollege_example_entities_AdminUnitTypeHierarchy_subAdminUnitType" object="${adminunittypehierarchy}" z="3H2NUDqlvuE79SbbZgIkwRZXVw8="/>
+    </page:show>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypehierarchys/update.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypehierarchys/update.jspx
index 0a59248..88bbc54 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypehierarchys/update.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypehierarchys/update.jspx
@@ -1,16 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_ee_itcollege_example_entities_AdminUnitTypeHierarchy" modelAttribute="adminUnitTypeHierarchy" path="/adminunittypehierarchys" versionField="Version" z="5y1srjL2vEfBe/xXNoK+Mwm1uTw=">
-        <field:textarea field="comment" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_comment" required="true" z="84qt4fYm6jmwPoQqqyxs5N6tF/E="/>
-        <field:input field="openedBy" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_openedBy" z="JNcheVj8DtUAlNY8nsyNqGoiesM="/>
-        <field:datetime dateTimePattern="${adminUnitTypeHierarchy_openeddate_date_format}" field="openedDate" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_openedDate" z="D90u5q4VEgKzTDVpraDuWn1iuO0="/>
-        <field:input field="changedBy" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_changedBy" z="575wCoj4FeEhvET8D6r6DJC5w1k="/>
-        <field:datetime dateTimePattern="${adminUnitTypeHierarchy_changeddate_date_format}" field="changedDate" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_changedDate" z="+3+iFmDCRiEEjdDxJiIa0Pg1OeM="/>
-        <field:input field="closedBy" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_closedBy" z="wziyBeMnehMswVkHJD7o8YjoKuw="/>
-        <field:datetime dateTimePattern="${adminUnitTypeHierarchy_closeddate_date_format}" field="closedDate" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_closedDate" z="KhsuhrdueXwipOzNLwR6V039WD8="/>
-        <field:select field="adminUnitType" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_adminUnitType" itemValue="id" items="${adminunittypes}" path="/adminunittypes" z="7V2UVdIJ5VL6II8+ntD1u81HPGs="/>
-        <field:select field="subAdminUnitType" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_subAdminUnitType" itemValue="id" items="${adminunittypes}" path="/adminunittypes" z="FVfzUFLlNaUUm8xQAZzxbB3WBpA="/>
-    </form:update>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <form:update id="fu_ee_itcollege_example_entities_AdminUnitTypeHierarchy" modelAttribute="adminUnitTypeHierarchy" path="/adminunittypehierarchys" versionField="Version" z="5y1srjL2vEfBe/xXNoK+Mwm1uTw=">
+        <field:textarea field="comment" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_comment" required="true" z="84qt4fYm6jmwPoQqqyxs5N6tF/E="/>
+        <field:select field="adminUnitType" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_adminUnitType" itemValue="id" items="${adminunittypes}" path="/adminunittypes" z="7V2UVdIJ5VL6II8+ntD1u81HPGs="/>
+        <field:select field="subAdminUnitType" id="c_ee_itcollege_example_entities_AdminUnitTypeHierarchy_subAdminUnitType" itemValue="id" items="${adminunittypes}" path="/adminunittypes" z="FVfzUFLlNaUUm8xQAZzxbB3WBpA="/>
+    </form:update>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypes/create.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypes/create.jspx
index df6dfc0..c5a01ab 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypes/create.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypes/create.jspx
@@ -1,22 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_ee_itcollege_example_entities_AdminUnitType" modelAttribute="adminUnitType" path="/adminunittypes" render="${empty dependencies}" z="ue/yTvBWhfpYnttZO1yHqooF8yY=">
-        <field:input field="name" id="c_ee_itcollege_example_entities_AdminUnitType_name" max="30" min="2" required="true" z="u43KJENmAuCm0GWEWEe7kr4NM2w="/>
-        <field:input field="code" id="c_ee_itcollege_example_entities_AdminUnitType_code" max="10" min="1" required="true" z="uPJ15HtCqBlQShOPB4cZscViOEc="/>
-        <field:textarea field="comment" id="c_ee_itcollege_example_entities_AdminUnitType_comment" required="true" z="BWa9+2LQosziqfcfwbsSROGAFKI="/>
-        <field:datetime dateTimePattern="${adminUnitType_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_AdminUnitType_fromDate" required="true" z="YPEqOeKgbaGNvzaMswo2M4XA6yg="/>
-        <field:datetime dateTimePattern="${adminUnitType_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_AdminUnitType_untilDate" z="rjKnGBHvd4mD4L6IZglbZ1GJdys="/>
-        <field:input field="openedBy" id="c_ee_itcollege_example_entities_AdminUnitType_openedBy" z="1MQEJ+cFDURcTkuTyYOxRMGH9Fw="/>
-        <field:datetime dateTimePattern="${adminUnitType_openeddate_date_format}" field="openedDate" id="c_ee_itcollege_example_entities_AdminUnitType_openedDate" z="18YWFeWfZdygL49iZ9+GID488as="/>
-        <field:input field="changedBy" id="c_ee_itcollege_example_entities_AdminUnitType_changedBy" z="T2307s4oa/kjpWeAYtllEdN9xQg="/>
-        <field:datetime dateTimePattern="${adminUnitType_changeddate_date_format}" field="changedDate" id="c_ee_itcollege_example_entities_AdminUnitType_changedDate" z="uZLf9L1x66p0Q0uiHf2coLmbxF0="/>
-        <field:input field="closedBy" id="c_ee_itcollege_example_entities_AdminUnitType_closedBy" z="cs+2RQxqMOfKM5PuAHe7hWqj8rw="/>
-        <field:datetime dateTimePattern="${adminUnitType_closeddate_date_format}" field="closedDate" id="c_ee_itcollege_example_entities_AdminUnitType_closedDate" z="eKyNI5mq5DwZEepRLb/3BkVCtmU="/>
-        <field:simple field="adminUnits" id="c_ee_itcollege_example_entities_AdminUnitType_adminUnits" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit" z="qIKLXvjsK/ZAz5oUnjFAj7pjtc4="/>
-        <field:simple field="adminUnitTypeHierarchys" id="c_ee_itcollege_example_entities_AdminUnitType_adminUnitTypeHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit Type Hierarchy" z="4xdMFAHevVvjXnXR6L7HtLOUv30="/>
-        <field:simple field="subAdminUnitTypeHierarchys" id="c_ee_itcollege_example_entities_AdminUnitType_subAdminUnitTypeHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit Type Hierarchy" z="TYfCQ3Ps30kzugakWFHD6piLwYM="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_ee_itcollege_example_entities_AdminUnitType" render="${not empty dependencies}" z="noKu2wzS5wAufVlVhVpYONAmWXk="/>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <form:create id="fc_ee_itcollege_example_entities_AdminUnitType" modelAttribute="adminUnitType" path="/adminunittypes" render="${empty dependencies}" z="ue/yTvBWhfpYnttZO1yHqooF8yY=">
+        <field:input field="name" id="c_ee_itcollege_example_entities_AdminUnitType_name" max="30" min="2" required="true" z="u43KJENmAuCm0GWEWEe7kr4NM2w="/>
+        <field:input field="code" id="c_ee_itcollege_example_entities_AdminUnitType_code" max="10" min="1" required="true" z="uPJ15HtCqBlQShOPB4cZscViOEc="/>
+        <field:textarea field="comment" id="c_ee_itcollege_example_entities_AdminUnitType_comment" required="true" z="BWa9+2LQosziqfcfwbsSROGAFKI="/>
+        <field:datetime dateTimePattern="${adminUnitType_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_AdminUnitType_fromDate" required="true" z="YPEqOeKgbaGNvzaMswo2M4XA6yg="/>
+        <field:datetime dateTimePattern="${adminUnitType_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_AdminUnitType_untilDate" z="rjKnGBHvd4mD4L6IZglbZ1GJdys="/>
+        <field:simple field="adminUnitTypeHierarchys" id="c_ee_itcollege_example_entities_AdminUnitType_adminUnitTypeHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit Type Hierarchy" z="4xdMFAHevVvjXnXR6L7HtLOUv30="/>
+        <field:simple field="subAdminUnitTypeHierarchys" id="c_ee_itcollege_example_entities_AdminUnitType_subAdminUnitTypeHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit Type Hierarchy" z="TYfCQ3Ps30kzugakWFHD6piLwYM="/>
+        <field:simple field="adminUnits" id="c_ee_itcollege_example_entities_AdminUnitType_adminUnits" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit" z="qIKLXvjsK/ZAz5oUnjFAj7pjtc4="/>
+    </form:create>
+    <form:dependency dependencies="${dependencies}" id="d_ee_itcollege_example_entities_AdminUnitType" render="${not empty dependencies}" z="noKu2wzS5wAufVlVhVpYONAmWXk="/>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypes/list.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypes/list.jspx
index 7a4bcbb..5dd868e 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypes/list.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypes/list.jspx
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_ee_itcollege_example_entities_AdminUnitType" items="${adminunittypes}" z="/buxhMdF0RGXd8RB1cZ66scRdBE=">
-        <table:table data="${adminunittypes}" id="l_ee_itcollege_example_entities_AdminUnitType" path="/adminunittypes" z="HXbYcjSdUIZYWaxBPqsDUWL/eP4=">
-            <table:column id="c_ee_itcollege_example_entities_AdminUnitType_openedBy" property="openedBy" z="DF21uhs+wJhz7EFAcF8z+7auANE="/>
-            <table:column date="true" dateTimePattern="${adminUnitType_openeddate_date_format}" id="c_ee_itcollege_example_entities_AdminUnitType_openedDate" property="openedDate" z="7H5R11WvE7OV0k5dqprIR6X9FQ0="/>
-            <table:column date="true" dateTimePattern="${adminUnitType_closeddate_date_format}" id="c_ee_itcollege_example_entities_AdminUnitType_closedDate" property="closedDate" z="+a0Z6FZl7jDPdyz+bDJuum8LuIQ="/>
-            <table:column id="c_ee_itcollege_example_entities_AdminUnitType_name" property="name" z="Ct9bT7gLmfcbOGWAT52g48PpE1w="/>
-            <table:column id="c_ee_itcollege_example_entities_AdminUnitType_code" property="code" z="YD2j9ALjsUw0s4Qe9X/O+psfL+k="/>
-            <table:column id="c_ee_itcollege_example_entities_AdminUnitType_comment" property="comment" z="7V6XkwtdZq4Z5CjyK8P+RgQW2v8="/>
-        </table:table>
-    </page:list>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <page:list id="pl_ee_itcollege_example_entities_AdminUnitType" items="${adminunittypes}" z="/buxhMdF0RGXd8RB1cZ66scRdBE=">
+        <table:table data="${adminunittypes}" id="l_ee_itcollege_example_entities_AdminUnitType" path="/adminunittypes" z="HXbYcjSdUIZYWaxBPqsDUWL/eP4=">
+            <table:column id="c_ee_itcollege_example_entities_AdminUnitType_name" property="name" z="Ct9bT7gLmfcbOGWAT52g48PpE1w="/>
+            <table:column id="c_ee_itcollege_example_entities_AdminUnitType_code" property="code" z="YD2j9ALjsUw0s4Qe9X/O+psfL+k="/>
+            <table:column id="c_ee_itcollege_example_entities_AdminUnitType_comment" property="comment" z="7V6XkwtdZq4Z5CjyK8P+RgQW2v8="/>
+            <table:column date="true" dateTimePattern="${adminUnitType_fromdate_date_format}" id="c_ee_itcollege_example_entities_AdminUnitType_fromDate" property="fromDate" z="ohrrIaBkOaIN02F9foczSj8tLEE="/>
+            <table:column date="true" dateTimePattern="${adminUnitType_untildate_date_format}" id="c_ee_itcollege_example_entities_AdminUnitType_untilDate" property="untilDate" z="bQIKxa4qL8OJ3ZMWGGStuTjp++E="/>
+            <table:column id="c_ee_itcollege_example_entities_AdminUnitType_adminUnits" property="adminUnits" z="LFmrf0xR+GQiOQy7vc8NTvL6vdI="/>
+        </table:table>
+    </page:list>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypes/show.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypes/show.jspx
index ceeee90..45b9a79 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypes/show.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypes/show.jspx
@@ -1,18 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_ee_itcollege_example_entities_AdminUnitType" object="${adminunittype}" path="/adminunittypes" z="KMeJUQQigv7LHYYnPkoV5r28qGo=">
-        <field:display field="name" id="s_ee_itcollege_example_entities_AdminUnitType_name" object="${adminunittype}" z="864yeO1VLvUeybmf//nl7i6UCZg="/>
-        <field:display field="code" id="s_ee_itcollege_example_entities_AdminUnitType_code" object="${adminunittype}" z="6IyqlgBt6pmdWRJVCHb+2Qg4wpg="/>
-        <field:display field="comment" id="s_ee_itcollege_example_entities_AdminUnitType_comment" object="${adminunittype}" z="DnxOyqyzfqYMgYuY0Uww1jP9a34="/>
-        <field:display date="true" dateTimePattern="${adminUnitType_fromdate_date_format}" field="fromDate" id="s_ee_itcollege_example_entities_AdminUnitType_fromDate" object="${adminunittype}" z="FqVNPMahMkMdn+hewZanlM+rors="/>
-        <field:display date="true" dateTimePattern="${adminUnitType_untildate_date_format}" field="untilDate" id="s_ee_itcollege_example_entities_AdminUnitType_untilDate" object="${adminunittype}" z="qwoWCBsYJFr2mIqDRL9srTRUfg0="/>
-        <field:display field="openedBy" id="s_ee_itcollege_example_entities_AdminUnitType_openedBy" object="${adminunittype}" z="13oxaf6cXtt+UuTMUrzvsV0SEqc="/>
-        <field:display date="true" dateTimePattern="${adminUnitType_openeddate_date_format}" field="openedDate" id="s_ee_itcollege_example_entities_AdminUnitType_openedDate" object="${adminunittype}" z="4YlJqTUtNJWNBjLg2FiWfdH897M="/>
-        <field:display field="changedBy" id="s_ee_itcollege_example_entities_AdminUnitType_changedBy" object="${adminunittype}" z="Y6o3cMdU2gaJUzAT3jFlzRjieeU="/>
-        <field:display date="true" dateTimePattern="${adminUnitType_changeddate_date_format}" field="changedDate" id="s_ee_itcollege_example_entities_AdminUnitType_changedDate" object="${adminunittype}" z="GTBfeXqzumRqHYpPI1YHCUg5stM="/>
-        <field:display field="closedBy" id="s_ee_itcollege_example_entities_AdminUnitType_closedBy" object="${adminunittype}" z="PDu+x4PMuiFITVvXCYy2CanSpFY="/>
-        <field:display date="true" dateTimePattern="${adminUnitType_closeddate_date_format}" field="closedDate" id="s_ee_itcollege_example_entities_AdminUnitType_closedDate" object="${adminunittype}" z="jkV5qKIKjMuhkQRH4IR6zrYKEzc="/>
-    </page:show>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <page:show id="ps_ee_itcollege_example_entities_AdminUnitType" object="${adminunittype}" path="/adminunittypes" z="KMeJUQQigv7LHYYnPkoV5r28qGo=">
+        <field:display field="name" id="s_ee_itcollege_example_entities_AdminUnitType_name" object="${adminunittype}" z="864yeO1VLvUeybmf//nl7i6UCZg="/>
+        <field:display field="code" id="s_ee_itcollege_example_entities_AdminUnitType_code" object="${adminunittype}" z="6IyqlgBt6pmdWRJVCHb+2Qg4wpg="/>
+        <field:display field="comment" id="s_ee_itcollege_example_entities_AdminUnitType_comment" object="${adminunittype}" z="DnxOyqyzfqYMgYuY0Uww1jP9a34="/>
+        <field:display date="true" dateTimePattern="${adminUnitType_fromdate_date_format}" field="fromDate" id="s_ee_itcollege_example_entities_AdminUnitType_fromDate" object="${adminunittype}" z="FqVNPMahMkMdn+hewZanlM+rors="/>
+        <field:display date="true" dateTimePattern="${adminUnitType_untildate_date_format}" field="untilDate" id="s_ee_itcollege_example_entities_AdminUnitType_untilDate" object="${adminunittype}" z="qwoWCBsYJFr2mIqDRL9srTRUfg0="/>
+    </page:show>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypes/update.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypes/update.jspx
index 00ed467..e29324c 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypes/update.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/adminunittypes/update.jspx
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_ee_itcollege_example_entities_AdminUnitType" modelAttribute="adminUnitType" path="/adminunittypes" versionField="Version" z="CymLoa+nbkIXhVWdc/cu1j7snLc=">
-        <field:input field="openedBy" id="c_ee_itcollege_example_entities_AdminUnitType_openedBy" z="1MQEJ+cFDURcTkuTyYOxRMGH9Fw="/>
-        <field:datetime dateTimePattern="${adminUnitType_openeddate_date_format}" field="openedDate" id="c_ee_itcollege_example_entities_AdminUnitType_openedDate" z="18YWFeWfZdygL49iZ9+GID488as="/>
-        <field:datetime dateTimePattern="${adminUnitType_closeddate_date_format}" field="closedDate" id="c_ee_itcollege_example_entities_AdminUnitType_closedDate" z="eKyNI5mq5DwZEepRLb/3BkVCtmU="/>
-        <field:input field="name" id="c_ee_itcollege_example_entities_AdminUnitType_name" max="30" min="2" required="true" z="u43KJENmAuCm0GWEWEe7kr4NM2w="/>
-        <field:input field="code" id="c_ee_itcollege_example_entities_AdminUnitType_code" max="10" min="1" required="true" z="uPJ15HtCqBlQShOPB4cZscViOEc="/>
-        <field:textarea field="comment" id="c_ee_itcollege_example_entities_AdminUnitType_comment" required="true" z="BWa9+2LQosziqfcfwbsSROGAFKI="/>
-        <field:datetime dateTimePattern="${adminUnitType_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_AdminUnitType_fromDate" required="true" z="YPEqOeKgbaGNvzaMswo2M4XA6yg="/>
-        <field:datetime dateTimePattern="${adminUnitType_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_AdminUnitType_untilDate" z="rjKnGBHvd4mD4L6IZglbZ1GJdys="/>
-        <field:input field="changedBy" id="c_ee_itcollege_example_entities_AdminUnitType_changedBy" z="T2307s4oa/kjpWeAYtllEdN9xQg="/>
-        <field:datetime dateTimePattern="${adminUnitType_changeddate_date_format}" field="changedDate" id="c_ee_itcollege_example_entities_AdminUnitType_changedDate" z="uZLf9L1x66p0Q0uiHf2coLmbxF0="/>
-        <field:input field="closedBy" id="c_ee_itcollege_example_entities_AdminUnitType_closedBy" z="cs+2RQxqMOfKM5PuAHe7hWqj8rw="/>
-        <field:simple field="adminUnits" id="c_ee_itcollege_example_entities_AdminUnitType_adminUnits" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit" z="qIKLXvjsK/ZAz5oUnjFAj7pjtc4="/>
-        <field:simple field="adminUnitTypeHierarchys" id="c_ee_itcollege_example_entities_AdminUnitType_adminUnitTypeHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit Type Hierarchy" z="4xdMFAHevVvjXnXR6L7HtLOUv30="/>
-        <field:simple field="subAdminUnitTypeHierarchys" id="c_ee_itcollege_example_entities_AdminUnitType_subAdminUnitTypeHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit Type Hierarchy" z="TYfCQ3Ps30kzugakWFHD6piLwYM="/>
-    </form:update>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <form:update id="fu_ee_itcollege_example_entities_AdminUnitType" modelAttribute="adminUnitType" path="/adminunittypes" versionField="Version" z="CymLoa+nbkIXhVWdc/cu1j7snLc=">
+        <field:input field="name" id="c_ee_itcollege_example_entities_AdminUnitType_name" max="30" min="2" required="true" z="u43KJENmAuCm0GWEWEe7kr4NM2w="/>
+        <field:input field="code" id="c_ee_itcollege_example_entities_AdminUnitType_code" max="10" min="1" required="true" z="uPJ15HtCqBlQShOPB4cZscViOEc="/>
+        <field:textarea field="comment" id="c_ee_itcollege_example_entities_AdminUnitType_comment" required="true" z="BWa9+2LQosziqfcfwbsSROGAFKI="/>
+        <field:datetime dateTimePattern="${adminUnitType_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_AdminUnitType_fromDate" required="true" z="YPEqOeKgbaGNvzaMswo2M4XA6yg="/>
+        <field:datetime dateTimePattern="${adminUnitType_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_AdminUnitType_untilDate" z="rjKnGBHvd4mD4L6IZglbZ1GJdys="/>
+        <field:simple field="adminUnitTypeHierarchys" id="c_ee_itcollege_example_entities_AdminUnitType_adminUnitTypeHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit Type Hierarchy" z="4xdMFAHevVvjXnXR6L7HtLOUv30="/>
+        <field:simple field="subAdminUnitTypeHierarchys" id="c_ee_itcollege_example_entities_AdminUnitType_subAdminUnitTypeHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit Type Hierarchy" z="TYfCQ3Ps30kzugakWFHD6piLwYM="/>
+        <field:simple field="adminUnits" id="c_ee_itcollege_example_entities_AdminUnitType_adminUnits" messageCode="entity_reference_not_managed" messageCodeAttribute="Admin Unit" z="qIKLXvjsK/ZAz5oUnjFAj7pjtc4="/>
+    </form:update>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/regimenthierarchys/create.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/regimenthierarchys/create.jspx
index 32ca126..e55f615 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/regimenthierarchys/create.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/regimenthierarchys/create.jspx
@@ -1,19 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_ee_itcollege_example_entities_RegimentHierarchy" modelAttribute="regimentHierarchy" path="/regimenthierarchys" render="${empty dependencies}" z="CHIGWxxhzCYaz796kMi63K6RVRM=">
-        <field:textarea field="comment" id="c_ee_itcollege_example_entities_RegimentHierarchy_comment" required="true" z="+LwZsQSUkFQQQLlkknzvw1uUqA0="/>
-        <field:datetime dateTimePattern="${regimentHierarchy_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_RegimentHierarchy_fromDate" required="true" z="xFtLFzSYhzSGlA5haX1E+XHaWO4="/>
-        <field:datetime dateTimePattern="${regimentHierarchy_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_RegimentHierarchy_untilDate" z="WG6GYlQqs3tNgYdkCyhrLySA+DU="/>
-        <field:input field="openedBy" id="c_ee_itcollege_example_entities_RegimentHierarchy_openedBy" z="9FHb0RruEwIkq9017Sbl3p+/Pac="/>
-        <field:datetime dateTimePattern="${regimentHierarchy_openeddate_date_format}" field="openedDate" id="c_ee_itcollege_example_entities_RegimentHierarchy_openedDate" z="Ra1PXaSGif+SRK60RS9EvzWQ50k="/>
-        <field:input field="changedBy" id="c_ee_itcollege_example_entities_RegimentHierarchy_changedBy" z="W67FcbhfpDvTeN+BndMBSPfVMyU="/>
-        <field:datetime dateTimePattern="${regimentHierarchy_changeddate_date_format}" field="changedDate" id="c_ee_itcollege_example_entities_RegimentHierarchy_changedDate" z="41edq6cIFBMuxV+FcV3koGj4hcU="/>
-        <field:input field="closedBy" id="c_ee_itcollege_example_entities_RegimentHierarchy_closedBy" z="ptTS5mcQMncaZt7bZxVAYVX6G50="/>
-        <field:datetime dateTimePattern="${regimentHierarchy_closeddate_date_format}" field="closedDate" id="c_ee_itcollege_example_entities_RegimentHierarchy_closedDate" z="ZKWMdwfiJGX9voyP8wHvx4MvnVY="/>
-        <field:select field="regiment" id="c_ee_itcollege_example_entities_RegimentHierarchy_regiment" itemValue="id" items="${regiments}" path="/regiments" z="V6OMPIqqMqYeV9ZRYu1e2/pLk8w="/>
-        <field:select field="subRegiment" id="c_ee_itcollege_example_entities_RegimentHierarchy_subRegiment" itemValue="id" items="${regiments}" path="/regiments" z="585QbI3Ja0kdEZAY1MTUDmXpnJw="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_ee_itcollege_example_entities_RegimentHierarchy" render="${not empty dependencies}" z="Fb2v7tCNxJlZdZAW58uFqHpvJ9Q="/>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <form:create id="fc_ee_itcollege_example_entities_RegimentHierarchy" modelAttribute="regimentHierarchy" path="/regimenthierarchys" render="${empty dependencies}" z="CHIGWxxhzCYaz796kMi63K6RVRM=">
+        <field:textarea field="comment" id="c_ee_itcollege_example_entities_RegimentHierarchy_comment" required="true" z="+LwZsQSUkFQQQLlkknzvw1uUqA0="/>
+        <field:datetime dateTimePattern="${regimentHierarchy_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_RegimentHierarchy_fromDate" required="true" z="xFtLFzSYhzSGlA5haX1E+XHaWO4="/>
+        <field:datetime dateTimePattern="${regimentHierarchy_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_RegimentHierarchy_untilDate" z="WG6GYlQqs3tNgYdkCyhrLySA+DU="/>
+        <field:select field="regiment" id="c_ee_itcollege_example_entities_RegimentHierarchy_regiment" itemValue="id" items="${regiments}" path="/regiments" z="V6OMPIqqMqYeV9ZRYu1e2/pLk8w="/>
+        <field:select field="subRegiment" id="c_ee_itcollege_example_entities_RegimentHierarchy_subRegiment" itemValue="id" items="${regiments}" path="/regiments" z="585QbI3Ja0kdEZAY1MTUDmXpnJw="/>
+    </form:create>
+    <form:dependency dependencies="${dependencies}" id="d_ee_itcollege_example_entities_RegimentHierarchy" render="${not empty dependencies}" z="Fb2v7tCNxJlZdZAW58uFqHpvJ9Q="/>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/regimenthierarchys/list.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/regimenthierarchys/list.jspx
index 29a4bdc..3b8893e 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/regimenthierarchys/list.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/regimenthierarchys/list.jspx
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_ee_itcollege_example_entities_RegimentHierarchy" items="${regimenthierarchys}" z="pr2saHL/5j9jrcItRK7w3thdTF8=">
-        <table:table data="${regimenthierarchys}" id="l_ee_itcollege_example_entities_RegimentHierarchy" path="/regimenthierarchys" z="r9B8oqA2vafUUZs22+BGT4HixIA=">
-            <table:column id="c_ee_itcollege_example_entities_RegimentHierarchy_openedBy" property="openedBy" z="6oJqUm9zkIX6kSlkj0Lx5Q7pvVk="/>
-            <table:column date="true" dateTimePattern="${regimentHierarchy_openeddate_date_format}" id="c_ee_itcollege_example_entities_RegimentHierarchy_openedDate" property="openedDate" z="9BJ/OIXE+v/mcAK/npyX6JET8lw="/>
-            <table:column date="true" dateTimePattern="${regimentHierarchy_closeddate_date_format}" id="c_ee_itcollege_example_entities_RegimentHierarchy_closedDate" property="closedDate" z="zzm7tV6FN3vUoQu6Hcjfc7yXIhc="/>
-            <table:column id="c_ee_itcollege_example_entities_RegimentHierarchy_comment" property="comment" z="ENs0Hno+NqSZQnRvrKI8qALUP4M="/>
-            <table:column date="true" dateTimePattern="${regimentHierarchy_fromdate_date_format}" id="c_ee_itcollege_example_entities_RegimentHierarchy_fromDate" property="fromDate" z="/CWCkbhJQNFg7kIDkP+2plXmLHw="/>
-            <table:column date="true" dateTimePattern="${regimentHierarchy_untildate_date_format}" id="c_ee_itcollege_example_entities_RegimentHierarchy_untilDate" property="untilDate" z="UNjSH+Oo4b8HaP42GxLMs99/CA8="/>
-        </table:table>
-    </page:list>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <page:list id="pl_ee_itcollege_example_entities_RegimentHierarchy" items="${regimenthierarchys}" z="pr2saHL/5j9jrcItRK7w3thdTF8=">
+        <table:table data="${regimenthierarchys}" id="l_ee_itcollege_example_entities_RegimentHierarchy" path="/regimenthierarchys" z="r9B8oqA2vafUUZs22+BGT4HixIA=">
+            <table:column id="c_ee_itcollege_example_entities_RegimentHierarchy_comment" property="comment" z="ENs0Hno+NqSZQnRvrKI8qALUP4M="/>
+            <table:column date="true" dateTimePattern="${regimentHierarchy_fromdate_date_format}" id="c_ee_itcollege_example_entities_RegimentHierarchy_fromDate" property="fromDate" z="/CWCkbhJQNFg7kIDkP+2plXmLHw="/>
+            <table:column date="true" dateTimePattern="${regimentHierarchy_untildate_date_format}" id="c_ee_itcollege_example_entities_RegimentHierarchy_untilDate" property="untilDate" z="UNjSH+Oo4b8HaP42GxLMs99/CA8="/>
+            <table:column id="c_ee_itcollege_example_entities_RegimentHierarchy_regiment" property="regiment" z="vuzNXnFmIQ1iJmK1iuPaQszPmKA="/>
+            <table:column id="c_ee_itcollege_example_entities_RegimentHierarchy_subRegiment" property="subRegiment" z="SC19QwXGnJOM7LX6zHPlZdC5zYE="/>
+        </table:table>
+    </page:list>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/regimenthierarchys/show.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/regimenthierarchys/show.jspx
index c378899..b6e9945 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/regimenthierarchys/show.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/regimenthierarchys/show.jspx
@@ -1,18 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_ee_itcollege_example_entities_RegimentHierarchy" object="${regimenthierarchy}" path="/regimenthierarchys" z="7B0GZUoWccowkaUYyT3CM9M2A4g=">
-        <field:display field="comment" id="s_ee_itcollege_example_entities_RegimentHierarchy_comment" object="${regimenthierarchy}" z="qYjhx3Com0xzux5fqjr5LePdVJg="/>
-        <field:display date="true" dateTimePattern="${regimentHierarchy_fromdate_date_format}" field="fromDate" id="s_ee_itcollege_example_entities_RegimentHierarchy_fromDate" object="${regimenthierarchy}" z="Orlmb+tzo9sfhVC29P7hnjyoxwY="/>
-        <field:display date="true" dateTimePattern="${regimentHierarchy_untildate_date_format}" field="untilDate" id="s_ee_itcollege_example_entities_RegimentHierarchy_untilDate" object="${regimenthierarchy}" z="U8C75RtXPthA1+sr29ScZF1kj/Y="/>
-        <field:display field="openedBy" id="s_ee_itcollege_example_entities_RegimentHierarchy_openedBy" object="${regimenthierarchy}" z="D7JqN2mWihnG9m2Bxl6sOxK/ves="/>
-        <field:display date="true" dateTimePattern="${regimentHierarchy_openeddate_date_format}" field="openedDate" id="s_ee_itcollege_example_entities_RegimentHierarchy_openedDate" object="${regimenthierarchy}" z="6PJzBfsw3WY+JTrw4VFMOPxgOl0="/>
-        <field:display field="changedBy" id="s_ee_itcollege_example_entities_RegimentHierarchy_changedBy" object="${regimenthierarchy}" z="eaU55plJrAv73bjqVT9JxWu9UHg="/>
-        <field:display date="true" dateTimePattern="${regimentHierarchy_changeddate_date_format}" field="changedDate" id="s_ee_itcollege_example_entities_RegimentHierarchy_changedDate" object="${regimenthierarchy}" z="zY9XiC6DDaab1ESeUjkNZCdbWIo="/>
-        <field:display field="closedBy" id="s_ee_itcollege_example_entities_RegimentHierarchy_closedBy" object="${regimenthierarchy}" z="/A/V9uH2DD8URnujXNmL9FyBjnA="/>
-        <field:display date="true" dateTimePattern="${regimentHierarchy_closeddate_date_format}" field="closedDate" id="s_ee_itcollege_example_entities_RegimentHierarchy_closedDate" object="${regimenthierarchy}" z="yQJNuigA5HcIT/U172XJ5EkKKw8="/>
-        <field:display field="regiment" id="s_ee_itcollege_example_entities_RegimentHierarchy_regiment" object="${regimenthierarchy}" z="cK429MrEa0jlS0zRJLIRdosn1x4="/>
-        <field:display field="subRegiment" id="s_ee_itcollege_example_entities_RegimentHierarchy_subRegiment" object="${regimenthierarchy}" z="vxsrByzwC3own02t0ruC/9uOKS8="/>
-    </page:show>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <page:show id="ps_ee_itcollege_example_entities_RegimentHierarchy" object="${regimenthierarchy}" path="/regimenthierarchys" z="7B0GZUoWccowkaUYyT3CM9M2A4g=">
+        <field:display field="comment" id="s_ee_itcollege_example_entities_RegimentHierarchy_comment" object="${regimenthierarchy}" z="qYjhx3Com0xzux5fqjr5LePdVJg="/>
+        <field:display date="true" dateTimePattern="${regimentHierarchy_fromdate_date_format}" field="fromDate" id="s_ee_itcollege_example_entities_RegimentHierarchy_fromDate" object="${regimenthierarchy}" z="Orlmb+tzo9sfhVC29P7hnjyoxwY="/>
+        <field:display date="true" dateTimePattern="${regimentHierarchy_untildate_date_format}" field="untilDate" id="s_ee_itcollege_example_entities_RegimentHierarchy_untilDate" object="${regimenthierarchy}" z="U8C75RtXPthA1+sr29ScZF1kj/Y="/>
+        <field:display field="regiment" id="s_ee_itcollege_example_entities_RegimentHierarchy_regiment" object="${regimenthierarchy}" z="cK429MrEa0jlS0zRJLIRdosn1x4="/>
+        <field:display field="subRegiment" id="s_ee_itcollege_example_entities_RegimentHierarchy_subRegiment" object="${regimenthierarchy}" z="vxsrByzwC3own02t0ruC/9uOKS8="/>
+    </page:show>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/regimenthierarchys/update.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/regimenthierarchys/update.jspx
index b8005bc..9fe2239 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/regimenthierarchys/update.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/regimenthierarchys/update.jspx
@@ -1,18 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_ee_itcollege_example_entities_RegimentHierarchy" modelAttribute="regimentHierarchy" path="/regimenthierarchys" versionField="Version" z="79lsQIQxWCcy+33AlA3NkifCiEE=">
-        <field:input field="openedBy" id="c_ee_itcollege_example_entities_RegimentHierarchy_openedBy" z="9FHb0RruEwIkq9017Sbl3p+/Pac="/>
-        <field:datetime dateTimePattern="${regimentHierarchy_openeddate_date_format}" field="openedDate" id="c_ee_itcollege_example_entities_RegimentHierarchy_openedDate" z="Ra1PXaSGif+SRK60RS9EvzWQ50k="/>
-        <field:datetime dateTimePattern="${regimentHierarchy_closeddate_date_format}" field="closedDate" id="c_ee_itcollege_example_entities_RegimentHierarchy_closedDate" z="ZKWMdwfiJGX9voyP8wHvx4MvnVY="/>
-        <field:textarea field="comment" id="c_ee_itcollege_example_entities_RegimentHierarchy_comment" required="true" z="+LwZsQSUkFQQQLlkknzvw1uUqA0="/>
-        <field:datetime dateTimePattern="${regimentHierarchy_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_RegimentHierarchy_fromDate" required="true" z="xFtLFzSYhzSGlA5haX1E+XHaWO4="/>
-        <field:datetime dateTimePattern="${regimentHierarchy_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_RegimentHierarchy_untilDate" z="WG6GYlQqs3tNgYdkCyhrLySA+DU="/>
-        <field:input field="changedBy" id="c_ee_itcollege_example_entities_RegimentHierarchy_changedBy" z="W67FcbhfpDvTeN+BndMBSPfVMyU="/>
-        <field:datetime dateTimePattern="${regimentHierarchy_changeddate_date_format}" field="changedDate" id="c_ee_itcollege_example_entities_RegimentHierarchy_changedDate" z="41edq6cIFBMuxV+FcV3koGj4hcU="/>
-        <field:input field="closedBy" id="c_ee_itcollege_example_entities_RegimentHierarchy_closedBy" z="ptTS5mcQMncaZt7bZxVAYVX6G50="/>
-        <field:select field="regiment" id="c_ee_itcollege_example_entities_RegimentHierarchy_regiment" itemValue="id" items="${regiments}" path="/regiments" z="V6OMPIqqMqYeV9ZRYu1e2/pLk8w="/>
-        <field:select field="subRegiment" id="c_ee_itcollege_example_entities_RegimentHierarchy_subRegiment" itemValue="id" items="${regiments}" path="/regiments" z="585QbI3Ja0kdEZAY1MTUDmXpnJw="/>
-    </form:update>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <form:update id="fu_ee_itcollege_example_entities_RegimentHierarchy" modelAttribute="regimentHierarchy" path="/regimenthierarchys" versionField="Version" z="79lsQIQxWCcy+33AlA3NkifCiEE=">
+        <field:textarea field="comment" id="c_ee_itcollege_example_entities_RegimentHierarchy_comment" required="true" z="+LwZsQSUkFQQQLlkknzvw1uUqA0="/>
+        <field:datetime dateTimePattern="${regimentHierarchy_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_RegimentHierarchy_fromDate" required="true" z="xFtLFzSYhzSGlA5haX1E+XHaWO4="/>
+        <field:datetime dateTimePattern="${regimentHierarchy_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_RegimentHierarchy_untilDate" z="WG6GYlQqs3tNgYdkCyhrLySA+DU="/>
+        <field:select field="regiment" id="c_ee_itcollege_example_entities_RegimentHierarchy_regiment" itemValue="id" items="${regiments}" path="/regiments" z="V6OMPIqqMqYeV9ZRYu1e2/pLk8w="/>
+        <field:select field="subRegiment" id="c_ee_itcollege_example_entities_RegimentHierarchy_subRegiment" itemValue="id" items="${regiments}" path="/regiments" z="585QbI3Ja0kdEZAY1MTUDmXpnJw="/>
+    </form:update>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/regiments/create.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/regiments/create.jspx
index f08d0ab..47b69a2 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/regiments/create.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/regiments/create.jspx
@@ -1,22 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:create id="fc_ee_itcollege_example_entities_Regiment" modelAttribute="regiment" path="/regiments" render="${empty dependencies}" z="GU0nh/cGLPaX4tMlrdcbunbQ46Q=">
-        <field:input field="code" id="c_ee_itcollege_example_entities_Regiment_code" required="true" z="6dbLw7Z53gOtTn/7Ftt0a66jFVU="/>
-        <field:input field="name" id="c_ee_itcollege_example_entities_Regiment_name" max="30" min="2" required="true" z="qkaXnR6/9ekShbXZ1552mwQfurs="/>
-        <field:textarea field="comment" id="c_ee_itcollege_example_entities_Regiment_comment" z="uj8G9Xu9yXdJ7kLpWqEM2vMD6C8="/>
-        <field:select field="adminUnit" id="c_ee_itcollege_example_entities_Regiment_adminUnit" itemValue="id" items="${adminunits}" path="/adminunits" z="0IOVn/JQVj44voSCgFLGw9J5/vU="/>
-        <field:simple field="regimentHierarchys" id="c_ee_itcollege_example_entities_Regiment_regimentHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Regiment Hierarchy" z="xjuWzGZkCu8pvHTEpFArAtko3Rk="/>
-        <field:datetime dateTimePattern="${regiment_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_Regiment_fromDate" required="true" z="GsKuVqhWOLrth5Mbn5r1KVzjpyE="/>
-        <field:datetime dateTimePattern="${regiment_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_Regiment_untilDate" z="cCP1VvBVbLEr1DOvJw2c789fA1Y="/>
-        <field:simple field="subRegimentHierarchys" id="c_ee_itcollege_example_entities_Regiment_subRegimentHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Regiment Hierarchy" z="zVITIaUZeYnZTxyNRiIHVdnNPMo="/>
-        <field:input field="openedBy" id="c_ee_itcollege_example_entities_Regiment_openedBy" z="E538RL4aX8kPXxIQAA8ZemZu4EU="/>
-        <field:datetime dateTimePattern="${regiment_openeddate_date_format}" field="openedDate" id="c_ee_itcollege_example_entities_Regiment_openedDate" z="BP4J5uT6Svn1DZR5V648djBN7rA="/>
-        <field:input field="changedBy" id="c_ee_itcollege_example_entities_Regiment_changedBy" z="Yd0an2WmqqZGOxsd3WgZgWplxbA="/>
-        <field:datetime dateTimePattern="${regiment_changeddate_date_format}" field="changedDate" id="c_ee_itcollege_example_entities_Regiment_changedDate" z="Tw9JQw6gG9L2pertKUuprvBwEEg="/>
-        <field:input field="closedBy" id="c_ee_itcollege_example_entities_Regiment_closedBy" z="UXyb80KKvb2IH8j4bIVRIQZRLSg="/>
-        <field:datetime dateTimePattern="${regiment_closeddate_date_format}" field="closedDate" id="c_ee_itcollege_example_entities_Regiment_closedDate" z="CVgZPy1z/Grvn8aQ0QoG7hgAzIc="/>
-    </form:create>
-    <form:dependency dependencies="${dependencies}" id="d_ee_itcollege_example_entities_Regiment" render="${not empty dependencies}" z="nM7vIUYTPq0tqKQdJC3XpPG8rrc="/>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <div class="right-outer">
+        <field:customTable columnLabels="Alluvad" columnMaxLengths="25" columnProperties="childName" columnTypes="string" data="${regiment.subRegimentHierarchys}" id="c_ee_itcollege_example_entities_Regiment_subRegimentHierarchys" path="/regimenthierarchys" update="false" z="user-managed"/>
+    </div>
+    <form:create id="fc_ee_itcollege_example_entities_Regiment" modelAttribute="regiment" path="/regiments" render="${empty dependencies}" z="GU0nh/cGLPaX4tMlrdcbunbQ46Q=">
+        <div class="left">
+            <field:input field="code" id="c_ee_itcollege_example_entities_Regiment_code" required="true" z="6dbLw7Z53gOtTn/7Ftt0a66jFVU="/>
+            <field:input field="name" id="c_ee_itcollege_example_entities_Regiment_name" max="30" min="2" required="true" z="qkaXnR6/9ekShbXZ1552mwQfurs="/>
+            <field:textarea field="comment" id="c_ee_itcollege_example_entities_Regiment_comment" z="uj8G9Xu9yXdJ7kLpWqEM2vMD6C8="/>
+            <field:datetime dateTimePattern="${regiment_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_Regiment_fromDate" required="true" z="GsKuVqhWOLrth5Mbn5r1KVzjpyE="/>
+            <field:datetime dateTimePattern="${regiment_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_Regiment_untilDate" z="cCP1VvBVbLEr1DOvJw2c789fA1Y="/>
+            <field:select field="adminUnit" id="c_ee_itcollege_example_entities_Regiment_adminUnit" itemValue="id" items="${adminunits}" path="/adminunits" z="0IOVn/JQVj44voSCgFLGw9J5/vU="/>
+            <field:select field="regimentHierarchys" id="c_ee_itcollege_example_entities_Regiment_regimentHierarchys" itemValue="id" items="${regimenthierarchys}" path="/regimenthierarchys" z="user-managed"/>
+        </div>
+    </form:create>
+    <form:dependency dependencies="${dependencies}" id="d_ee_itcollege_example_entities_Regiment" render="${not empty dependencies}" z="nM7vIUYTPq0tqKQdJC3XpPG8rrc="/>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/regiments/list.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/regiments/list.jspx
index a0b6bb1..0a35618 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/regiments/list.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/regiments/list.jspx
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:list id="pl_ee_itcollege_example_entities_Regiment" items="${regiments}" z="KD+vvFElno7COFnqu91oPGhdGg4=">
-        <table:table data="${regiments}" id="l_ee_itcollege_example_entities_Regiment" path="/regiments" z="o/werlzr11S4a1x7jrEyHno32EY=">
-            <table:column id="c_ee_itcollege_example_entities_Regiment_name" property="name" z="DtaGXsi/ivYz4ZEe0s1Vmewf0fk="/>
-            <table:column id="c_ee_itcollege_example_entities_Regiment_code" property="code" z="XyrGd6SnO3n2WXQsu5ypM04YQoU="/>
-            <table:column id="c_ee_itcollege_example_entities_Regiment_comment" property="comment" z="HfJdbi7NuJWACEiuWdHnv545m6Y="/>
-            <table:column id="c_ee_itcollege_example_entities_Regiment_openedBy" property="openedBy" z="BpP+ElYGZ2QTOtfVmZWEw3pN1/I="/>
-            <table:column date="true" dateTimePattern="${regiment_openeddate_date_format}" id="c_ee_itcollege_example_entities_Regiment_openedDate" property="openedDate" z="7j5IkE2zkLFrWhI+PAceVEyDLEU="/>
-            <table:column date="true" dateTimePattern="${regiment_closeddate_date_format}" id="c_ee_itcollege_example_entities_Regiment_closedDate" property="closedDate" z="sQ75Sv8h/Omze7velSUj+o/LLaY="/>
-        </table:table>
-    </page:list>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <page:list id="pl_ee_itcollege_example_entities_Regiment" items="${regiments}" z="KD+vvFElno7COFnqu91oPGhdGg4=">
+        <table:table data="${regiments}" id="l_ee_itcollege_example_entities_Regiment" path="/regiments" z="o/werlzr11S4a1x7jrEyHno32EY=">
+            <table:column id="c_ee_itcollege_example_entities_Regiment_name" property="name" z="DtaGXsi/ivYz4ZEe0s1Vmewf0fk="/>
+            <table:column id="c_ee_itcollege_example_entities_Regiment_code" property="code" z="XyrGd6SnO3n2WXQsu5ypM04YQoU="/>
+            <table:column id="c_ee_itcollege_example_entities_Regiment_comment" property="comment" z="HfJdbi7NuJWACEiuWdHnv545m6Y="/>
+            <table:column date="true" dateTimePattern="${regiment_fromdate_date_format}" id="c_ee_itcollege_example_entities_Regiment_fromDate" property="fromDate" z="dSROAqw52N7WpEvhfP+mw0RJTgs="/>
+            <table:column date="true" dateTimePattern="${regiment_untildate_date_format}" id="c_ee_itcollege_example_entities_Regiment_untilDate" property="untilDate" z="ei75MgJy4azyk0CmQ76tr4NWUFo="/>
+            <table:column id="c_ee_itcollege_example_entities_Regiment_adminUnit" property="adminUnit" z="Z4yXXaHsxgQ13T5e5swP7UGJ+w8="/>
+        </table:table>
+    </page:list>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/regiments/show.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/regiments/show.jspx
index 2e52ccb..ab5297e 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/regiments/show.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/regiments/show.jspx
@@ -1,19 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <page:show id="ps_ee_itcollege_example_entities_Regiment" object="${regiment}" path="/regiments" z="FJ1oQjDm9G1qElWPQEb7WOAQgYM=">
-        <field:display field="name" id="s_ee_itcollege_example_entities_Regiment_name" object="${regiment}" z="OMDk7R6frIIXWnkr3BQyhGJD6gg="/>
-        <field:display field="code" id="s_ee_itcollege_example_entities_Regiment_code" object="${regiment}" z="yrUZqZRzWe+WIHPDEIMC112Ony4="/>
-        <field:display field="comment" id="s_ee_itcollege_example_entities_Regiment_comment" object="${regiment}" z="IWLLp1C/ciL9ukgx7thrMjJ8Hnc="/>
-        <field:display date="true" dateTimePattern="${regiment_fromdate_date_format}" field="fromDate" id="s_ee_itcollege_example_entities_Regiment_fromDate" object="${regiment}" z="rLK7uH0hBOZPFhx86JbQbUc4wK4="/>
-        <field:display date="true" dateTimePattern="${regiment_untildate_date_format}" field="untilDate" id="s_ee_itcollege_example_entities_Regiment_untilDate" object="${regiment}" z="9ACcA6NU/Yw6B8D0yAwfq0CoSoE="/>
-        <field:display field="openedBy" id="s_ee_itcollege_example_entities_Regiment_openedBy" object="${regiment}" z="ioaf6mWpC3PyNxcKo2cXdOUmZpQ="/>
-        <field:display date="true" dateTimePattern="${regiment_openeddate_date_format}" field="openedDate" id="s_ee_itcollege_example_entities_Regiment_openedDate" object="${regiment}" z="4asEuDIPP70TaoS5hcXnpD5/JYc="/>
-        <field:display field="changedBy" id="s_ee_itcollege_example_entities_Regiment_changedBy" object="${regiment}" z="RpiTrTcNFnJfKYekxYuShhclHm0="/>
-        <field:display date="true" dateTimePattern="${regiment_changeddate_date_format}" field="changedDate" id="s_ee_itcollege_example_entities_Regiment_changedDate" object="${regiment}" z="7xPiDQRVo8HF5ztCxKFxD5dAIxE="/>
-        <field:display field="closedBy" id="s_ee_itcollege_example_entities_Regiment_closedBy" object="${regiment}" z="kwBetd9/yMDV00o+7f7cAGRzo9Y="/>
-        <field:display date="true" dateTimePattern="${regiment_closeddate_date_format}" field="closedDate" id="s_ee_itcollege_example_entities_Regiment_closedDate" object="${regiment}" z="czWbaRkaKuMD/dxz0/C0sQ4iV4s="/>
-        <field:display field="adminUnit" id="s_ee_itcollege_example_entities_Regiment_adminUnit" object="${regiment}" z="RsLeSxl8u813YsDLhagdQWkWqnE="/>
-    </page:show>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <page:show id="ps_ee_itcollege_example_entities_Regiment" object="${regiment}" path="/regiments" z="FJ1oQjDm9G1qElWPQEb7WOAQgYM=">
+        <field:display field="name" id="s_ee_itcollege_example_entities_Regiment_name" object="${regiment}" z="OMDk7R6frIIXWnkr3BQyhGJD6gg="/>
+        <field:display field="code" id="s_ee_itcollege_example_entities_Regiment_code" object="${regiment}" z="yrUZqZRzWe+WIHPDEIMC112Ony4="/>
+        <field:display field="comment" id="s_ee_itcollege_example_entities_Regiment_comment" object="${regiment}" z="IWLLp1C/ciL9ukgx7thrMjJ8Hnc="/>
+        <field:display date="true" dateTimePattern="${regiment_fromdate_date_format}" field="fromDate" id="s_ee_itcollege_example_entities_Regiment_fromDate" object="${regiment}" z="rLK7uH0hBOZPFhx86JbQbUc4wK4="/>
+        <field:display date="true" dateTimePattern="${regiment_untildate_date_format}" field="untilDate" id="s_ee_itcollege_example_entities_Regiment_untilDate" object="${regiment}" z="9ACcA6NU/Yw6B8D0yAwfq0CoSoE="/>
+        <field:display field="adminUnit" id="s_ee_itcollege_example_entities_Regiment_adminUnit" object="${regiment}" z="RsLeSxl8u813YsDLhagdQWkWqnE="/>
+    </page:show>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/WEB-INF/views/regiments/update.jspx b/javaee-project-team21/src/main/webapp/WEB-INF/views/regiments/update.jspx
index acca3a8..af8f8b8 100644
--- a/javaee-project-team21/src/main/webapp/WEB-INF/views/regiments/update.jspx
+++ b/javaee-project-team21/src/main/webapp/WEB-INF/views/regiments/update.jspx
@@ -1,21 +1,54 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
-    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
-    <jsp:output omit-xml-declaration="yes"/>
-    <form:update id="fu_ee_itcollege_example_entities_Regiment" modelAttribute="regiment" path="/regiments" versionField="Version" z="7EkzBIFNAWnjk+VgZEfPxtJhtnI=">
-        <field:input field="name" id="c_ee_itcollege_example_entities_Regiment_name" max="30" min="2" required="true" z="qkaXnR6/9ekShbXZ1552mwQfurs="/>
-        <field:input field="code" id="c_ee_itcollege_example_entities_Regiment_code" required="true" z="6dbLw7Z53gOtTn/7Ftt0a66jFVU="/>
-        <field:textarea field="comment" id="c_ee_itcollege_example_entities_Regiment_comment" z="uj8G9Xu9yXdJ7kLpWqEM2vMD6C8="/>
-        <field:datetime dateTimePattern="${regiment_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_Regiment_fromDate" required="true" z="GsKuVqhWOLrth5Mbn5r1KVzjpyE="/>
-        <field:datetime dateTimePattern="${regiment_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_Regiment_untilDate" z="cCP1VvBVbLEr1DOvJw2c789fA1Y="/>
-        <field:input field="openedBy" id="c_ee_itcollege_example_entities_Regiment_openedBy" z="E538RL4aX8kPXxIQAA8ZemZu4EU="/>
-        <field:datetime dateTimePattern="${regiment_openeddate_date_format}" field="openedDate" id="c_ee_itcollege_example_entities_Regiment_openedDate" z="BP4J5uT6Svn1DZR5V648djBN7rA="/>
-        <field:input field="changedBy" id="c_ee_itcollege_example_entities_Regiment_changedBy" z="Yd0an2WmqqZGOxsd3WgZgWplxbA="/>
-        <field:datetime dateTimePattern="${regiment_changeddate_date_format}" field="changedDate" id="c_ee_itcollege_example_entities_Regiment_changedDate" z="Tw9JQw6gG9L2pertKUuprvBwEEg="/>
-        <field:input field="closedBy" id="c_ee_itcollege_example_entities_Regiment_closedBy" z="UXyb80KKvb2IH8j4bIVRIQZRLSg="/>
-        <field:datetime dateTimePattern="${regiment_closeddate_date_format}" field="closedDate" id="c_ee_itcollege_example_entities_Regiment_closedDate" z="CVgZPy1z/Grvn8aQ0QoG7hgAzIc="/>
-        <field:select field="adminUnit" id="c_ee_itcollege_example_entities_Regiment_adminUnit" itemValue="id" items="${adminunits}" path="/adminunits" z="0IOVn/JQVj44voSCgFLGw9J5/vU="/>
-        <field:simple field="regimentHierarchys" id="c_ee_itcollege_example_entities_Regiment_regimentHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Regiment Hierarchy" z="xjuWzGZkCu8pvHTEpFArAtko3Rk="/>
-        <field:simple field="subRegimentHierarchys" id="c_ee_itcollege_example_entities_Regiment_subRegimentHierarchys" messageCode="entity_reference_not_managed" messageCodeAttribute="Regiment Hierarchy" z="zVITIaUZeYnZTxyNRiIHVdnNPMo="/>
-    </form:update>
-</div>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:form="urn:jsptagdir:/WEB-INF/tags/form" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags" version="2.0">
+    <jsp:directive.page contentType="text/html;charset=UTF-8"/>
+    <jsp:output omit-xml-declaration="yes"/>
+    <div class="right-outer">
+        <spring:message code="label_ee_itcollege_example_entities_regiment_subregimenthierarchys" htmlEscape="false" var="child"/>
+        <field:customTable columnLabels="${child}" columnMaxLengths="25" columnProperties="childName" columnTypes="string" data="${regiment.subRegimentHierarchys}" id="c_ee_itcollege_example_entities_Regiment_subRegimentHierarchys" path="/regimenthierarchys" update="false" z="user-managed"/>
+    </div>
+    <form:update id="fu_ee_itcollege_example_entities_Regiment" modelAttribute="regiment" path="/regiments" versionField="Version" z="7EkzBIFNAWnjk+VgZEfPxtJhtnI=">
+        <div class="left">
+            <field:input field="code" id="c_ee_itcollege_example_entities_Regiment_code" required="true" z="6dbLw7Z53gOtTn/7Ftt0a66jFVU="/>
+            <field:input field="name" id="c_ee_itcollege_example_entities_Regiment_name" max="30" min="2" required="true" z="qkaXnR6/9ekShbXZ1552mwQfurs="/>
+            <field:textarea field="comment" id="c_ee_itcollege_example_entities_Regiment_comment" z="uj8G9Xu9yXdJ7kLpWqEM2vMD6C8="/>
+            <field:datetime dateTimePattern="${regiment_fromdate_date_format}" field="fromDate" id="c_ee_itcollege_example_entities_Regiment_fromDate" required="true" z="GsKuVqhWOLrth5Mbn5r1KVzjpyE="/>
+            <field:datetime dateTimePattern="${regiment_untildate_date_format}" field="untilDate" id="c_ee_itcollege_example_entities_Regiment_untilDate" z="cCP1VvBVbLEr1DOvJw2c789fA1Y="/>
+            <spring:message code="label_ee_itcollege_example_entities_regiment_adminunit" htmlEscape="false" var="label"/>
+            <c:if test="${not empty regiment['adminUnit']}">
+                <div id="locationdisplay">
+                    <label>
+                        <c:out value="${label}"/>
+                    </label>
+                    <div>
+                        <spring:message code="button_change" htmlEscape="false" var="change_button"/>
+                        <spring:eval expression="regiment['adminUnit']['name']"/>
+                        <a class="button" href="#" id="changelocation">
+                            <c:out value="${change_button}"/>
+                        </a>
+                    </div>
+                </div>
+            </c:if>
+            <c:if test="${regiment['adminUnit'] eq null}">
+                <div id="locationselect">
+                    <field:select field="adminUnit" id="c_ee_itcollege_example_entities_Regiment_adminUnit" itemValue="id" items="${adminunits}" path="/adminunits" z="0IOVn/JQVj44voSCgFLGw9J5/vU="/>
+                </div>
+            </c:if>
+            <c:if test="${not empty regiment['adminUnit']}">
+                <div id="locationselect" style="display: none;">
+                    <field:select field="adminUnit" id="c_ee_itcollege_example_entities_Regiment_adminUnit" itemValue="id" items="${adminunits}" path="/adminunits" z="0IOVn/JQVj44voSCgFLGw9J5/vU="/>
+                </div>
+            </c:if>
+            <field:select field="regimentHierarchys" id="c_ee_itcollege_example_entities_Regiment_regimentHierarchys" itemValue="id" items="${regimenthierarchys}" path="/regimenthierarchys" z="user-managed"/>
+        </div>
+    </form:update>
+    <c:if test="${not empty regiment['adminUnit']}">
+        <script type="text/javascript">
+		document.getElementById('changelocation').addEventListener("click", function(e)
+   		{
+	   		e.preventDefault();
+	   		document.getElementById('locationdisplay').style.display = 'none';
+	   		document.getElementById('locationselect').style.display = '';
+		}, false);
+	</script>
+    </c:if>
+</div>
diff --git a/javaee-project-team21/src/main/webapp/styles/standard.css b/javaee-project-team21/src/main/webapp/styles/standard.css
index 9f79bb0..d17f67f 100644
--- a/javaee-project-team21/src/main/webapp/styles/standard.css
+++ b/javaee-project-team21/src/main/webapp/styles/standard.css
@@ -328,7 +328,7 @@ fieldset th {
 	border:none;
 }
 
-.submit input {
+.submit input, button {
 	border: 1px solid #BBBBBB;
 	color:#777777;
 	padding:2px 7px;
@@ -370,4 +370,69 @@ fieldset th {
 .flag {
 	height: 11px;
 	width: 16px;
+}
+
+.left, .right-outer
+{
+	width: 50%;
+	display: inline-block;
+	vertical-align: top;
+}
+
+.right-outer
+{
+	margin-left: -50%;
+	margin-top: 30px;
+	float: right;
+}
+
+.submit
+{
+	text-align: right;
+	clear: both;
+	width: 100%;
+}
+
+.dijitTextBox
+{
+	width: 12em;
+}
+
+.dijitTextArea
+{
+	max-width: 11.5em;
+}
+
+.table-new
+{
+	text-align: right;
+	margin: 10px 0;
+}
+
+.table-new a, #changelocation
+{
+	color: #666;
+	text-decoration: none;
+	background: #f7f7f7;
+	padding: 4px 7px;
+	border: 1px solid #999;
+	text-transform: uppercase;
+}
+
+#changelocation
+{
+	float: right;
+	margin-right: 20px;
+}
+
+#locationdisplay
+{
+	overflow: auto;
+	margin-bottom: 10px;
+}
+
+#locationdisplay > div
+{
+	font-size: 14px;
+	font-weight: bold;
 }
\ No newline at end of file