diff --git a/src/main/java/info/bukova/isspst/dao/BuildingDao.java b/src/main/java/info/bukova/isspst/dao/BuildingDao.java
new file mode 100644
index 00000000..85b20608
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/dao/BuildingDao.java
@@ -0,0 +1,7 @@
+package info.bukova.isspst.dao;
+
+import info.bukova.isspst.data.Building;
+
+public interface BuildingDao extends BaseDao<Building> {
+
+}
\ No newline at end of file
diff --git a/src/main/java/info/bukova/isspst/dao/jpa/BuildingDaoJPA.java b/src/main/java/info/bukova/isspst/dao/jpa/BuildingDaoJPA.java
new file mode 100644
index 00000000..46a84cfe
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/dao/jpa/BuildingDaoJPA.java
@@ -0,0 +1,12 @@
+package info.bukova.isspst.dao.jpa;
+
+import info.bukova.isspst.dao.BuildingDao;
+import info.bukova.isspst.data.Building;
+
+public class BuildingDaoJPA extends BaseDaoJPA<Building> implements BuildingDao {
+
+	@Override
+	public String getEntityName() {
+		return "Building";
+	}
+}
diff --git a/src/main/java/info/bukova/isspst/data/Building.java b/src/main/java/info/bukova/isspst/data/Building.java
new file mode 100644
index 00000000..254cabfb
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/data/Building.java
@@ -0,0 +1,121 @@
+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 {
+
+	@Id
+	@Column(name="ID")
+    @GeneratedValue
+	private int id;
+
+	@Column(name="CODE", unique=true)
+	private String code;
+	
+	@Column(name="NAME")
+	private String name;
+	
+	@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
+	 */
+	public String getCode() {
+		return code;
+	}
+
+	/**
+	 * @param code the code to set
+	 */
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	/**
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * @param name the name to set
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * @return the description
+	 */
+	public String getDescription() {
+		return description;
+	}
+
+	/**
+	 * @param description the description to set
+	 */
+	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/java/info/bukova/isspst/services/BuildingService.java b/src/main/java/info/bukova/isspst/services/BuildingService.java
new file mode 100644
index 00000000..919c30d3
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/services/BuildingService.java
@@ -0,0 +1,7 @@
+package info.bukova.isspst.services;
+
+import info.bukova.isspst.data.Building;
+
+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/BuildingServiceImpl.java
new file mode 100644
index 00000000..57abc7fe
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/services/BuildingServiceImpl.java
@@ -0,0 +1,7 @@
+package info.bukova.isspst.services;
+
+import info.bukova.isspst.data.Building;
+
+public class BuildingServiceImpl  extends AbstractService<Building> implements BuildingService{
+
+}
diff --git a/src/main/java/info/bukova/isspst/ui/BuildingForm.java b/src/main/java/info/bukova/isspst/ui/BuildingForm.java
new file mode 100644
index 00000000..8f2d0907
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/ui/BuildingForm.java
@@ -0,0 +1,14 @@
+package info.bukova.isspst.ui;
+
+import info.bukova.isspst.data.Building;
+
+import org.zkoss.bind.annotation.Init;
+
+public class BuildingForm extends FormViewModel<Building> {
+	
+	@Init(superclass = true)
+	public void init() {
+		
+	}
+
+}
diff --git a/src/main/java/info/bukova/isspst/ui/BuildingList.java b/src/main/java/info/bukova/isspst/ui/BuildingList.java
new file mode 100644
index 00000000..94ffe808
--- /dev/null
+++ b/src/main/java/info/bukova/isspst/ui/BuildingList.java
@@ -0,0 +1,21 @@
+package info.bukova.isspst.ui;
+
+import info.bukova.isspst.data.Building;
+import info.bukova.isspst.services.BuildingService;
+
+import org.zkoss.bind.annotation.Init;
+import org.zkoss.zk.ui.select.annotation.WireVariable;
+
+public class BuildingList extends ListViewModel<Building> {
+	
+	@WireVariable
+	private BuildingService buildingService;
+	
+	@Init
+	public void init() {
+		service = buildingService;
+		dataClass = Building.class;
+		formZul = "buildingForm.zul";
+	}
+
+}
diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml
index 76d3d2d2..848e7cb8 100644
--- a/src/main/resources/hibernate.cfg.xml
+++ b/src/main/resources/hibernate.cfg.xml
@@ -7,5 +7,6 @@
     <session-factory>
         <mapping class="info.bukova.isspst.data.User"></mapping>
         <mapping class="info.bukova.isspst.data.Role"></mapping>
+        <mapping class="info.bukova.isspst.data.Building"></mapping>
     </session-factory>
 </hibernate-configuration>
\ 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 39249fd2..2e95a6b7 100644
--- a/src/main/webapp/WEB-INF/spring/root-context.xml
+++ b/src/main/webapp/WEB-INF/spring/root-context.xml
@@ -89,12 +89,12 @@
     </bean>
     
     <!-- Business logic -->
-	<bean id="userService" class="info.bukova.isspst.services.UserServiceImpl">
+	<bean id="userService" class="info.bukova.isspst.services.users.UserServiceImpl">
 		<property name="dao" ref="userDao"/>
 		<property name="encoder" ref="passwordEncoder"/>
 	</bean>
 	
-	<bean id="roleService" class="info.bukova.isspst.services.RoleServiceImpl">
+	<bean id="roleService" class="info.bukova.isspst.services.users.RoleServiceImpl">
 		<property name="dao" ref="roleDao"/>
 	</bean>
 		
diff --git a/src/main/webapp/WEB-INF/zk-label.properties b/src/main/webapp/WEB-INF/zk-label.properties
new file mode 100644
index 00000000..a072d70c
--- /dev/null
+++ b/src/main/webapp/WEB-INF/zk-label.properties
@@ -0,0 +1,21 @@
+# Default file
+AgendaBuildings=Budovy
+
+BuildingsFormCode=Kód
+BuildingsFormCodeConstr=Zadejte kód budovy...
+BuildingsFormName=Název
+BuildingsFormDescription=Popis
+
+BuildingsGridColumnCode=Kód
+BuildingsGridColumnName=Název
+BuildingsGridColumnDescription=Popis
+
+ButtonStorno=Storno
+ButtonSave=Uložit
+
+FormBuilding=Budova
+
+ToolbarRecNew=Nový záznam
+ToolbarRecEdit=Úprava aktuálního záznamu
+ToolbarRecDelete=Odstranit aktuální záznam
+ToolbarRecFilter=Filtr záznamů
diff --git a/src/main/webapp/app/navigation.zul b/src/main/webapp/app/navigation.zul
index 33b140ac..bf76c9fe 100644
--- a/src/main/webapp/app/navigation.zul
+++ b/src/main/webapp/app/navigation.zul
@@ -29,7 +29,7 @@
 			<menubar orient="vertical">
 				<menuitem label="Uživatelé" href="/admin/users" width="120px"/>
 				<menuitem label="Střediska" href="/admin/users" disabled="${not sec:isAllGranted('ROLE_ADMIN')}"/>
-				<menuitem label="Budovy" href="/admin/users"/>
+				<menuitem label="${labels.AgendaBuildings}" href="/buildings"/>
 				<menuitem label="Místnosti" href="/admin/users"/>
 			</menubar>
 		</tabpanel>
diff --git a/src/main/webapp/app/page.css b/src/main/webapp/app/page.css
index 9996d2b4..2e9c8328 100644
--- a/src/main/webapp/app/page.css
+++ b/src/main/webapp/app/page.css
@@ -1,10 +1,15 @@
-body {
+/*body {
     font-family: sans-serif;
+}*/
+
+#container {
+   min-height:100%;
+   position:relative;
 }
 
 #header{
 	width: auto;
-	height:70px;
+	height:40px;
 	border: 1px solid #ccc;
 	padding:10px;
 }
@@ -23,15 +28,30 @@ body {
 
 #maincolumn{
 	padding:10px;
+	padding-bottom:20px;   /* Height of the footer */
 	margin: 0px 0px 0px 160px;
-	border: 1px solid #ccc;
 }
 
 #footer{
 	clear:both;
-	width:auto;
+	position:absolute;
+   	bottom:0;
+   	width:100%;
+   	height:20px;   /* Height of the footer */
+	
 	border: 1px solid #ccc;
 }
+
+.form-caption	{
+	--1overflow:hidden;
+	font-weight: bold;
+    font-size: 20px;
+}
+/*aaa*/
+.form-caption-content	{
+	float:left;
+}
+
 /*
 a:link,a:visited {
    font-size: 12px;
diff --git a/src/main/webapp/buildings/building.zul b/src/main/webapp/buildings/building.zul
new file mode 100644
index 00000000..e34c7d24
--- /dev/null
+++ b/src/main/webapp/buildings/building.zul
@@ -0,0 +1,30 @@
+<?page title="${labels.AgendaBuildings}" contentType="text/html;charset=UTF-8"?>
+<zk>
+	<?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>
+
+
+		<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)">
+			<listhead>
+				<listheader label="${labels.BuildingsGridColumnCode}" width="10%" />
+				<listheader label="${labels.BuildingsGridColumnName}" width="30%" />
+				<listheader label="${labels.BuildingsGridColumnDescription}" width="60%" />
+			</listhead>
+			<template name="model">
+				<listitem>
+					<listcell label="@load(each.code)" />
+					<listcell label="@load(each.name)" />
+					<listcell label="@load(each.description)" />
+				</listitem>
+			</template>
+		</listbox>
+
+	</window>
+</zk>
\ No newline at end of file
diff --git a/src/main/webapp/buildings/buildingForm.zul b/src/main/webapp/buildings/buildingForm.zul
new file mode 100644
index 00000000..45fd5834
--- /dev/null
+++ b/src/main/webapp/buildings/buildingForm.zul
@@ -0,0 +1,42 @@
+<?page title="${labels.AgendaBuildings}" contentType="text/html;charset=UTF-8"?>
+<!--?link rel="stylesheet" type="text/css" href="/app/page.css"?-->
+<zk>
+	<window id="editWin" closable="true" border="normal" position="center" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.BuildingForm')">
+		<caption src="/img/building.png" zclass="form-caption" label="${labels.FormBuilding}" />
+		<vlayout>
+			<grid hflex="min">
+				<columns>
+					<column align="right" hflex="min" />
+					<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)" />
+						</cell>
+					</row>
+					<row>
+						<cell sclass="row-title">${labels.BuildingsFormName} :</cell>
+						<cell>
+							<textbox width="200px" value="@bind(vm.dataBean.name)" />
+						</cell>
+					</row>
+					<row>
+						<cell sclass="row-title">${labels.BuildingsFormDescription} :</cell>
+						<cell>
+							<textbox width="300px" value="@bind(vm.dataBean.description)" />
+						</cell>
+					</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>
+		</vlayout>
+	</window>
+</zk>
\ No newline at end of file
diff --git a/src/main/webapp/buildings/index.zul b/src/main/webapp/buildings/index.zul
new file mode 100644
index 00000000..d0cb3c94
--- /dev/null
+++ b/src/main/webapp/buildings/index.zul
@@ -0,0 +1,10 @@
+<?page title="${labels.agenda.buildings}" contentType="text/html;charset=UTF-8"?>
+<zk>
+
+<zscript>
+	String gridZul = "building.zul";
+</zscript>
+
+<include src="/app/template.zhtml"/>
+
+</zk>
\ No newline at end of file
diff --git a/src/main/webapp/img/building.png b/src/main/webapp/img/building.png
new file mode 100644
index 00000000..95b75a95
Binary files /dev/null and b/src/main/webapp/img/building.png differ