diff --git a/src/main/java/info/bukova/isspst/data/Building.java b/src/main/java/info/bukova/isspst/data/Building.java
index 254cabfb..8bc8beda 100644
--- a/src/main/java/info/bukova/isspst/data/Building.java
+++ b/src/main/java/info/bukova/isspst/data/Building.java
@@ -1,21 +1,13 @@
 package info.bukova.isspst.data;
 
-import java.util.Date;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
 import javax.persistence.Table;
 
 @Entity
 @Table(name="BUILDING")
-public class Building implements DataModel {
+public class Building extends BaseData implements DataModel {
 
-	@Id
-	@Column(name="ID")
-    @GeneratedValue
-	private int id;
 
 	@Column(name="CODE", unique=true)
 	private String code;
@@ -26,19 +18,6 @@ public class Building implements DataModel {
 	@Column(name="DESCRIPTION")
 	private String description;
 	
-	/**
-	 * @return the id
-	 */
-	public int getId() {
-		return id;
-	}
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(int id) {
-		this.id = id;
-	}
 
 	/**
 	 * @return the code
@@ -81,41 +60,4 @@ public class Building implements DataModel {
 	public void setDescription(String description) {
 		this.description = description;
 	}
-
-	@Override
-	public void setCreated(Date created) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public Date getCreated() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public void setModified(Date modified) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public Date getModified() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public boolean isValid() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public void setValid(boolean valid) {
-		// TODO Auto-generated method stub
-		
-	}
-
 }
diff --git a/src/main/webapp/WEB-INF/jdbc.properties b/src/main/webapp/WEB-INF/jdbc.properties
index 658408f0..3483bc97 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?characterEncoding=utf8
+jdbc.databaseurl=jdbc:mysql://127.0.0.1:3306/isspst
 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 c3a8e678..931b4e11 100644
--- a/src/main/webapp/WEB-INF/spring/root-context.xml
+++ b/src/main/webapp/WEB-INF/spring/root-context.xml
@@ -88,6 +88,10 @@
     	<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>
@@ -104,6 +108,10 @@
 		<property name="dao" ref="roleDao"/>
 	</bean>
 	
+	<bean id="buildingService" class="info.bukova.isspst.services.BuildingServiceImpl">
+		<property name="dao" ref="buildingDao"/>
+	</bean>
+	
 	<bean id="adbService" class="info.bukova.isspst.services.addressbook.AdbServiceImpl">
 		<property name="dao" ref="addressDao"/>
 		<property name="validator" ref="validator"/>
diff --git a/src/main/webapp/buildings/building.zul b/src/main/webapp/buildings/building.zul
index e34c7d24..ae8e1c7a 100644
--- a/src/main/webapp/buildings/building.zul
+++ b/src/main/webapp/buildings/building.zul
@@ -3,13 +3,7 @@
 	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 	<window title="${labels.AgendaBuildings}" border="normal" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.BuildingList')">
 
-		<toolbar>
-			<toolbarbutton image="/img/add.png" tooltiptext="${labels.ToolbarRecNew}" id="btnNew" onClick="@command('addNew')" disabled="@load(vm.filter)" />
-			<toolbarbutton image="/img/edit.png" tooltiptext="${labels.ToolbarRecEdit}" id="btnEdit" onClick="@command('edit')" disabled="@load(empty vm.dataBean ? 'true' : 'false')" />
-			<toolbarbutton image="/img/delete.png" tooltiptext="${labels.ToolbarRecDelete}" id="btnDelete" onClick="@command('delObject')" disabled="@load(empty vm.dataBean ? 'true' : 'false')" />
-			<toolbarbutton image="/img/funnel.png" tooltiptext="${labels.ToolbarRecFilter}" id="btnFilter" onClick="@command('filter')" />
-		</toolbar>
-
+		<include src="/app/toolbar.zul"/>
 
 		<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)">
 			<listhead>
diff --git a/src/main/webapp/buildings/buildingForm.zul b/src/main/webapp/buildings/buildingForm.zul
index 45fd5834..bbe86990 100644
--- a/src/main/webapp/buildings/buildingForm.zul
+++ b/src/main/webapp/buildings/buildingForm.zul
@@ -30,13 +30,7 @@
 					</row>
 				</rows>
 			</grid>
-			<hlayout>
-				<div hflex="1"></div>
-				<div>
-					<button label="${labels.ButtonStorno}" onClick="editWin.detach();"/>
-					<button label="${labels.ButtonSave}" onClick="@command('save', window=editWin)"/>
-				</div>
-			</hlayout>
+			<include src="/app/formButtons.zul"/>
 		</vlayout>
 	</window>
 </zk>
\ No newline at end of file