diff --git a/src/main/java/info/bukova/isspst/data/Building.java b/src/main/java/info/bukova/isspst/data/Building.java
index 8bc8beda..e3be3304 100644
--- a/src/main/java/info/bukova/isspst/data/Building.java
+++ b/src/main/java/info/bukova/isspst/data/Building.java
@@ -3,6 +3,10 @@ package info.bukova.isspst.data;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotEmpty;
 
 @Entity
 @Table(name="BUILDING")
@@ -22,6 +26,9 @@ public class Building extends BaseData implements DataModel {
 	/**
 	 * @return the code
 	 */
+	@NotBlank(message = "${labels.BuildingsFormCodeConstr}")
+	@NotNull(message = "${labels.BuildingsFormCodeConstr}")
+	@NotEmpty(message = "${labels.BuildingsFormCodeConstr}")
 	public String getCode() {
 		return code;
 	}
diff --git a/src/main/java/info/bukova/isspst/services/BuildingService.java b/src/main/java/info/bukova/isspst/services/buildings/BuildingService.java
similarity index 54%
rename from src/main/java/info/bukova/isspst/services/BuildingService.java
rename to src/main/java/info/bukova/isspst/services/buildings/BuildingService.java
index 919c30d3..1c6cae7d 100644
--- a/src/main/java/info/bukova/isspst/services/BuildingService.java
+++ b/src/main/java/info/bukova/isspst/services/buildings/BuildingService.java
@@ -1,6 +1,7 @@
-package info.bukova.isspst.services;
+package info.bukova.isspst.services.buildings;
 
 import info.bukova.isspst.data.Building;
+import info.bukova.isspst.services.Service;
 
 public interface BuildingService  extends Service<Building> {
 
diff --git a/src/main/java/info/bukova/isspst/services/BuildingServiceImpl.java b/src/main/java/info/bukova/isspst/services/buildings/BuildingServiceImpl.java
similarity index 58%
rename from src/main/java/info/bukova/isspst/services/BuildingServiceImpl.java
rename to src/main/java/info/bukova/isspst/services/buildings/BuildingServiceImpl.java
index 57abc7fe..1683a8c2 100644
--- a/src/main/java/info/bukova/isspst/services/BuildingServiceImpl.java
+++ b/src/main/java/info/bukova/isspst/services/buildings/BuildingServiceImpl.java
@@ -1,6 +1,7 @@
-package info.bukova.isspst.services;
+package info.bukova.isspst.services.buildings;
 
 import info.bukova.isspst.data.Building;
+import info.bukova.isspst.services.AbstractService;
 
 public class BuildingServiceImpl  extends AbstractService<Building> implements BuildingService{
 
diff --git a/src/main/java/info/bukova/isspst/ui/BuildingList.java b/src/main/java/info/bukova/isspst/ui/BuildingList.java
index 94ffe808..6b9d50e9 100644
--- a/src/main/java/info/bukova/isspst/ui/BuildingList.java
+++ b/src/main/java/info/bukova/isspst/ui/BuildingList.java
@@ -1,7 +1,7 @@
 package info.bukova.isspst.ui;
 
 import info.bukova.isspst.data.Building;
-import info.bukova.isspst.services.BuildingService;
+import info.bukova.isspst.services.buildings.BuildingService;
 
 import org.zkoss.bind.annotation.Init;
 import org.zkoss.zk.ui.select.annotation.WireVariable;
diff --git a/src/main/java/info/bukova/isspst/ui/ListViewModel.java b/src/main/java/info/bukova/isspst/ui/ListViewModel.java
index 12e948d2..1464678d 100644
--- a/src/main/java/info/bukova/isspst/ui/ListViewModel.java
+++ b/src/main/java/info/bukova/isspst/ui/ListViewModel.java
@@ -22,7 +22,7 @@ import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.Window;
 
 public class ListViewModel<T extends DataModel> {
-	
+
 	private boolean confirmDelete = false;
 	private boolean filter = false;
 	private Window editWin;
@@ -37,29 +37,29 @@ public class ListViewModel<T extends DataModel> {
 	private boolean sortDesc = true;
 	private boolean newRec = false;
 	private boolean fullFill = false;
-		
+
 	protected Service<T> service;
 	protected Class<T> dataClass;
 	protected String formZul;
 	protected Filter<T> dataFilter;
-	
+
 	public List<T> getDataList() {
 		if (dataList == null) {
 			dataList = new ArrayList<T>();
 			loadFromDbSync();
 		}
-		
+
 		return dataList;
 	}
-	
+
 	public void setDataBean(T data) {
 		this.dataBean = data;
 	}
-	
+
 	public void setDataFilter(Filter<T> dataFilter) {
 		this.dataFilter = dataFilter;
 	}
-	
+
 	public T getFilterTemplate() {
 		if (filterTemplate == null) {
 			try {
@@ -70,18 +70,18 @@ public class ListViewModel<T extends DataModel> {
 				e.printStackTrace();
 			}
 		}
-		
+
 		return filterTemplate;
 	}
-	
+
 	public T getDataBean() {
 		return dataBean;
 	}
-	
+
 	public boolean getConfirmDelete() {
 		return confirmDelete;
 	}
-	
+
 	public boolean getFilter() {
 		return this.filter;
 	}
@@ -89,21 +89,20 @@ public class ListViewModel<T extends DataModel> {
 	public boolean getFullFill() {
 		return fullFill;
 	}
-	
+
 	protected void newRecMode() {
 		newRec = true;
 	}
-	
+
 	protected void setEditBean(T edit) {
 		this.editBean = edit;
 	}
-	
-	
+
 	@Command
-	@NotifyChange({"filter", "dataList", "dataBean"})
+	@NotifyChange({ "filter", "dataList", "dataBean" })
 	public void filter() {
 		filter = !filter;
-		
+
 		if (!filter) {
 			dataList = fullList;
 			dataBean = null;
@@ -113,19 +112,19 @@ public class ListViewModel<T extends DataModel> {
 			dataBean = null;
 		}
 	}
-	
+
 	@Command
 	@NotifyChange("dataList")
 	public void doFilter() {
 		if (dataFilter == null) {
 			return;
 		}
-		
+
 		List<T> result = service.filterList(fullList, dataFilter);
 		selIndex = -1;
 		dataList = result;
 	}
-		
+
 	@Command
 	public void addNew() {
 		try {
@@ -138,66 +137,72 @@ public class ListViewModel<T extends DataModel> {
 			e.printStackTrace();
 		}
 	}
-	
+
 	@Command
 	public void edit() {
 		int index = dataList.indexOf(dataBean);
 		newRec = false;
-		if (index != -1) { 
+		if (index != -1) {
 			selIndex = index;
 		}
 		editBean = service.getById(dataBean.getId());
 		showForm();
 	}
-	
+
 	@Command
 	@NotifyChange("confirmDelete")
 	public void delObject() {
 		confirmDelete = true;
 	}
-	
+
 	@Command
-	@NotifyChange({"dataList", "dataBean"})
+	@NotifyChange({ "dataList", "dataBean" })
 	public void delete() {
-		Messagebox.show("Opravdu smazat?", "Smazat záznam", Messagebox.YES|Messagebox.NO,
-			    Messagebox.QUESTION, new EventListener<Event>() {
-					
+		Messagebox.show("Opravdu smazat?", "Smazat záznam", Messagebox.YES
+				| Messagebox.NO, Messagebox.QUESTION,
+				new EventListener<Event>() {
+
 					@Override
 					public void onEvent(Event evt) throws Exception {
-						if (((Integer)evt.getData()).intValue() == Messagebox.YES) {
+						if (((Integer) evt.getData()).intValue() == Messagebox.YES) {
 							try {
 								service.delete(dataBean);
 								dataList.remove(dataBean);
 								dataBean = null;
-								BindUtils.postNotifyChange(null, null, ListViewModel.this, "dataList");
-								BindUtils.postNotifyChange(null, null, ListViewModel.this, "dataBean");
+								BindUtils.postNotifyChange(null, null,
+										ListViewModel.this, "dataList");
+								BindUtils.postNotifyChange(null, null,
+										ListViewModel.this, "dataBean");
 							} catch (DataIntegrityViolationException e) {
-								Messagebox.show("Chyba při mazání záznamu", "Chyba", Messagebox.OK, Messagebox.ERROR);
+								Messagebox.show("Chyba při mazání záznamu",
+										"Chyba", Messagebox.OK,
+										Messagebox.ERROR);
 							}
 						}
 					}
-				}); 
-				
+				});
+
 		confirmDelete = false;
 	}
-	
-	@NotifyChange({"dataList", "dataBean"})
+
+	@NotifyChange({ "dataList", "dataBean" })
 	private void onDelete() {
 		try {
 			service.delete(dataBean);
 			dataList.remove(dataBean);
 			dataBean = null;
 		} catch (DataIntegrityViolationException e) {
-			Messagebox.show("Chyba při mazání záznamu", "Chyba", Messagebox.OK, Messagebox.ERROR);
+			Messagebox.show("Chyba při mazání záznamu", "Chyba", Messagebox.OK,
+					Messagebox.ERROR);
 		}
 	}
-	
+
 	@GlobalCommand
-	@NotifyChange({"dataList", "dataBean"})
+	@NotifyChange({ "dataList", "dataBean" })
 	public void refresh() {
-		/*if (editBean != null && !editBean.isValid()) {
+		if (editBean != null && !editBean.isValid()) {
 			return;
-		}*/
+		}
 		if (editBean.getCreated() == null) {
 			return;
 		}
@@ -214,9 +219,9 @@ public class ListViewModel<T extends DataModel> {
 			dataList.set(selIndex, editBean);
 		}
 	}
-	
+
 	@GlobalCommand
-	@NotifyChange({"dataList", "dataBean", "fullFill"})
+	@NotifyChange({ "dataList", "dataBean", "fullFill" })
 	public void reload() {
 		dataBean = null;
 		dataList.clear();
@@ -229,66 +234,66 @@ public class ListViewModel<T extends DataModel> {
 		if (editBean != null && !editBean.isValid()) {
 			return;
 		}
-		
-		if (selIndex > dataList.size() -1) {
+
+		if (selIndex > dataList.size() - 1) {
 			selIndex = -1;
 		}
 
 		if (newRec) {
-			selIndex = dataList.size() -1;
+			selIndex = dataList.size() - 1;
 			newRec = false;
 		}
 	}
-	
+
 	@Command
 	@NotifyChange("dataBean")
 	public void onSort(@BindingParam("column") String column) {
 		if (sortCol == null || this.sortCol.equals(column))
 			this.sortDesc = !this.sortDesc;
-		
+
 		this.sortCol = column;
 		selIndex = -1;
 		dataBean = null;
 	}
-		
+
 	public int getSelIndex() {
 		return this.selIndex;
 	}
-	
+
 	@Command
-	@NotifyChange({"dataList", "fullFill"})
+	@NotifyChange({ "dataList", "fullFill" })
 	public void fullFill() {
 		if (fullFill && dataList.isEmpty()) {
 			dataList.addAll(tmpList);
 			fullList = dataList;
 		}
 	}
-	
-//	private void loadFromDb() {
-//		Thread fillThread = new Thread(new Runnable() {
-//			
-//			@Override
-//			public void run() {
-//				tmpList = service.getAll();
-//								
-//				try {
-//					Thread.sleep(200);
-//				} catch (InterruptedException e) {
-//					e.printStackTrace();
-//				}
-//				
-//				fullFill = true;
-//			}
-//		});
-//		
-//		fillThread.start();
-//	}
-	
+
+	// private void loadFromDb() {
+	// Thread fillThread = new Thread(new Runnable() {
+	//
+	// @Override
+	// public void run() {
+	// tmpList = service.getAll();
+	//
+	// try {
+	// Thread.sleep(200);
+	// } catch (InterruptedException e) {
+	// e.printStackTrace();
+	// }
+	//
+	// fullFill = true;
+	// }
+	// });
+	//
+	// fillThread.start();
+	// }
+
 	private void loadFromDbSync() {
 		dataList.addAll(service.getAll());
 		fullList = dataList;
 	}
-	
+
 	protected void showForm() {
 		Map<String, Object> arg = new HashMap<String, Object>();
 		arg.put("selected", editBean);
diff --git a/src/main/webapp/WEB-INF/jdbc.properties b/src/main/webapp/WEB-INF/jdbc.properties
index 3483bc97..306c5336 100644
--- a/src/main/webapp/WEB-INF/jdbc.properties
+++ b/src/main/webapp/WEB-INF/jdbc.properties
@@ -1,5 +1,5 @@
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.dialect=org.hibernate.dialect.MySQLDialect
-jdbc.databaseurl=jdbc:mysql://127.0.0.1:3306/isspst
+jdbc.databaseurl=jdbc:mysql://127.0.0.1:3306/isspst?characterEncoding=UTF-8
 jdbc.username=root
 jdbc.password=xsacfgd
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/spring/root-context.xml b/src/main/webapp/WEB-INF/spring/root-context.xml
index 931b4e11..751fa526 100644
--- a/src/main/webapp/WEB-INF/spring/root-context.xml
+++ b/src/main/webapp/WEB-INF/spring/root-context.xml
@@ -1,131 +1,117 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:security="http://www.springframework.org/schema/security"
-	xmlns:context="http://www.springframework.org/schema/context"
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:security="http://www.springframework.org/schema/security" xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
 		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
 		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-	
+
 	<!-- Root Context: defines shared resources visible to all other web components -->
-	
+
 	<context:annotation-config />
 	<context:component-scan base-package="info.bukova.isspst,org.zkoss.spring.beans.zkcomponents"></context:component-scan>
-	
-	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" 
-		id="propertyConfigurer" 
-		p:location="/WEB-INF/jdbc.properties"/>
-	
+
+	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" id="propertyConfigurer" p:location="/WEB-INF/jdbc.properties" />
+
 	<!-- Database -->
-	<bean id="dataSource"
-        class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"
-        p:driverClassName="${jdbc.driverClassName}"
-        p:url="${jdbc.databaseurl}" p:username="${jdbc.username}"
-        p:password="${jdbc.password}"></bean>
-        
-	<bean id="sessionFactory"
-        class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
-        <property name="dataSource" ref="dataSource"></property>
-        <property name="configLocation">
-            <value>classpath:hibernate.cfg.xml</value>
-        </property>
-        <property name="hibernateProperties">
-            <props>
-                <prop key="hibernate.dialect">${jdbc.dialect}</prop>
-                <prop key="hibernate.show_sql">true</prop>
-                <prop key="hibernate.hbm2ddl.auto">update</prop>
-            </props>
-        </property>
-    </bean>
-    
-    <tx:annotation-driven transaction-manager="transactionManager"/>
-    <bean id="transactionManager"
-        class="org.springframework.orm.hibernate4.HibernateTransactionManager">
-        <property name="sessionFactory" ref="sessionFactory"></property>
-    </bean>
-    
-    <!-- Security -->
-    <security:global-method-security secured-annotations="enabled" />
-    
+	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close" p:driverClassName="${jdbc.driverClassName}" p:url="${jdbc.databaseurl}" p:username="${jdbc.username}" p:password="${jdbc.password}"></bean>
+
+	<bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
+		<property name="dataSource" ref="dataSource"></property>
+		<property name="configLocation">
+			<value>classpath:hibernate.cfg.xml</value>
+		</property>
+		<property name="hibernateProperties">
+			<props>
+				<prop key="hibernate.dialect">${jdbc.dialect}</prop>
+				<prop key="hibernate.show_sql">true</prop>
+				<prop key="hibernate.hbm2ddl.auto">update</prop>
+			</props>
+		</property>
+	</bean>
+
+	<tx:annotation-driven transaction-manager="transactionManager" />
+	<bean id="transactionManager" class="org.springframework.orm.hibernate4.HibernateTransactionManager">
+		<property name="sessionFactory" ref="sessionFactory"></property>
+	</bean>
+
+	<!-- Security -->
+	<security:global-method-security secured-annotations="enabled" />
+
 	<security:http auto-config="true">
-		<security:intercept-url pattern="/app/**" access="ROLE_USER, ROLE_ADMIN"/>
-		<security:intercept-url pattern="/admin/**" access="ROLE_ADMIN"/>
-		<security:form-login login-page="/login.zhtml"
-			authentication-failure-handler-ref="loginFail"/>
-		<security:http-basic/>
-		<security:logout invalidate-session="true"/>
+		<security:intercept-url pattern="/app/**" access="ROLE_USER, ROLE_ADMIN" />
+		<security:intercept-url pattern="/admin/**" access="ROLE_ADMIN" />
+		<security:form-login login-page="/login.zhtml" authentication-failure-handler-ref="loginFail" />
+		<security:http-basic />
+		<security:logout invalidate-session="true" />
 	</security:http>
-	
+
 	<security:authentication-manager>
 		<security:authentication-provider user-service-ref="userService">
 			<security:password-encoder ref="passwordEncoder">
-				<security:salt-source user-property="username"/>
+				<security:salt-source user-property="username" />
 			</security:password-encoder>
 		</security:authentication-provider>
 	</security:authentication-manager>
-	
+
 	<bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-		<property name="targetClass" value="org.springframework.security.core.context.SecurityContextHolder"/>
-		<property name="targetMethod" value="setStrategyName"/>
-		<property name="arguments" value="MODE_INHERITABLETHREADLOCAL"/>
+		<property name="targetClass" value="org.springframework.security.core.context.SecurityContextHolder" />
+		<property name="targetMethod" value="setStrategyName" />
+		<property name="arguments" value="MODE_INHERITABLETHREADLOCAL" />
+	</bean>
+
+	<bean id="passwordEncoder" class="org.springframework.security.authentication.encoding.ShaPasswordEncoder" />
+
+	<bean id="loginFail" class="info.bukova.isspst.LoginFailHandler" />
+
+	<!-- DAO -->
+	<bean id="userDao" class="info.bukova.isspst.dao.jpa.UserDaoJPA">
+		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
+
+	<bean id="roleDao" class="info.bukova.isspst.dao.jpa.RoleDaoJPA">
+		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
+
+	<bean id="buildingDao" class="info.bukova.isspst.dao.jpa.BuildingDaoJPA">
+		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
+
+	<bean id="addressDao" class="info.bukova.isspst.dao.jpa.AddressDaoJPA">
+		<property name="sessionFactory" ref="sessionFactory" />
 	</bean>
-	
-	<bean id="passwordEncoder" class="org.springframework.security.authentication.encoding.ShaPasswordEncoder"/>
-	
-	<bean id="loginFail" class="info.bukova.isspst.LoginFailHandler"/>
-    
-    <!-- DAO -->
-    <bean id="userDao" class="info.bukova.isspst.dao.jpa.UserDaoJPA">
-    	<property name="sessionFactory" ref="sessionFactory"/>
-    </bean>
-    
-    <bean id="roleDao" class="info.bukova.isspst.dao.jpa.RoleDaoJPA">
-    	<property name="sessionFactory" ref="sessionFactory"/>
-    </bean>
-    
-    <bean id="buildingDao" class="info.bukova.isspst.dao.jpa.BuildingDaoJPA">
-    	<property name="sessionFactory" ref="sessionFactory"/>
-    </bean>
-    
-    <bean id="addressDao" class="info.bukova.isspst.dao.jpa.AddressDaoJPA">
-    	<property name="sessionFactory" ref="sessionFactory"/>
-    </bean>
-    
-    <!-- Business logic -->
-    <bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
-    
+
+	<!-- Business logic -->
+	<bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean" />
+
 	<bean id="userService" class="info.bukova.isspst.services.users.UserServiceImpl">
-		<property name="dao" ref="userDao"/>
-		<property name="encoder" ref="passwordEncoder"/>
+		<property name="dao" ref="userDao" />
+		<property name="encoder" ref="passwordEncoder" />
 	</bean>
-	
+
 	<bean id="roleService" class="info.bukova.isspst.services.users.RoleServiceImpl">
-		<property name="dao" ref="roleDao"/>
+		<property name="dao" ref="roleDao" />
 	</bean>
-	
-	<bean id="buildingService" class="info.bukova.isspst.services.BuildingServiceImpl">
-		<property name="dao" ref="buildingDao"/>
+
+	<bean id="buildingService" class="info.bukova.isspst.services.buildings.BuildingServiceImpl">
+		<property name="dao" ref="buildingDao" />
+		<property name="validator" ref="validator" />
 	</bean>
-	
+
 	<bean id="adbService" class="info.bukova.isspst.services.addressbook.AdbServiceImpl">
-		<property name="dao" ref="addressDao"/>
-		<property name="validator" ref="validator"/>
+		<property name="dao" ref="addressDao" />
+		<property name="validator" ref="validator" />
 	</bean>
-	
+
 	<bean id="addressFinderAres" class="info.bukova.isspst.services.addressbook.AddressFinderAres">
-		<property name="aresUrl" value="http://wwwinfo.mfcr.cz/cgi-bin/ares/darv_std.cgi"/>
-		<property name="unmarsheller" ref="unmarshallerAres"/>
+		<property name="aresUrl" value="http://wwwinfo.mfcr.cz/cgi-bin/ares/darv_std.cgi" />
+		<property name="unmarsheller" ref="unmarshallerAres" />
 	</bean>
-	
+
 	<bean id="addressFinderTaxID" class="info.bukova.isspst.services.addressbook.AddressFinderTaxID">
-		<property name="aresDicUrl" value="http://wwwinfo.mfcr.cz/cgi-bin/ares/darv_bas.cgi"/>
+		<property name="aresDicUrl" value="http://wwwinfo.mfcr.cz/cgi-bin/ares/darv_bas.cgi" />
 	</bean>
-	
+
 	<bean id="xmlCtxAres" class="org.castor.spring.xml.XMLContextFactoryBean">
 		<property name="mappingLocations">
 			<list>
@@ -133,9 +119,9 @@
 			</list>
 		</property>
 	</bean>
-	
+
 	<bean id="unmarshallerAres" class="org.castor.spring.xml.CastorUnmarshallerFactoryBean">
-		<property name="xmlContext" ref="xmlCtxAres"/>
+		<property name="xmlContext" ref="xmlCtxAres" />
 	</bean>
-		
+
 </beans>
diff --git a/src/main/webapp/app/formButtons.zul b/src/main/webapp/app/formButtons.zul
index 0c48ea0f..d947ff44 100644
--- a/src/main/webapp/app/formButtons.zul
+++ b/src/main/webapp/app/formButtons.zul
@@ -1,4 +1,9 @@
 <?page title="buttons" contentType="text/html;charset=UTF-8"?>
 <zk>
-<button image="/img/save.png" label="Uložit" onClick="@command('save', window=editWin) @global-command('refresh')" sclass="nicebutton" /><button image="~./zul/img/misc/drag-disallow.png" label="Zrušit" onClick="editWin.detach()" sclass="nicebutton"/>
+	<vlayout>
+		<div hflex="max" align="right">
+			<button image="~./zul/img/misc/drag-disallow.png" label="${labels.ButtonStorno}" onClick="editWin.detach()" sclass="nicebutton" />
+			<button image="/img/save.png" label="${labels.ButtonSave}" onClick="@command('save', window=editWin) @global-command('refresh')" sclass="nicebutton" />
+		</div>
+	</vlayout>
 </zk>
\ No newline at end of file
diff --git a/src/main/webapp/buildings/buildingForm.zul b/src/main/webapp/buildings/buildingForm.zul
index bbe86990..6360ca1d 100644
--- a/src/main/webapp/buildings/buildingForm.zul
+++ b/src/main/webapp/buildings/buildingForm.zul
@@ -8,12 +8,16 @@
 				<columns>
 					<column align="right" hflex="min" />
 					<column />
+					<column />
 				</columns>
 				<rows>
 					<row>
 						<cell sclass="row-title">${labels.BuildingsFormCode} :</cell>
 						<cell>
-							<textbox constraint="no empty: ${labels.BuildingsFormCodeConstr}" width="200px" value="@bind(vm.dataBean.code)" />
+							<textbox width="200px" value="@bind(vm.dataBean.code)" />
+						</cell>
+						<cell>
+							<label visible="true" value="@load(vm.errMessages['code'])" style="color:red" />
 						</cell>
 					</row>
 					<row>
@@ -30,7 +34,7 @@
 					</row>
 				</rows>
 			</grid>
-			<include src="/app/formButtons.zul"/>
+			<include src="/app/formButtons.zul" />
 		</vlayout>
 	</window>
 </zk>
\ No newline at end of file