diff --git a/src/main/webapp/admin/users/users.zul b/src/main/webapp/admin/users/users.zul
index b7f4f7e0..49a93ba1 100644
--- a/src/main/webapp/admin/users/users.zul
+++ b/src/main/webapp/admin/users/users.zul
@@ -2,16 +2,10 @@
 <zk>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 <window title="Uživatelé" border="normal" apply="org.zkoss.bind.BindComposer"
-	viewModel="@id('vm') @init('info.bukova.isspst.ui.UsersList')">
-	
-	<toolbar>
-		<toolbarbutton image="/img/add.png" tooltiptext="${labels.New}" id="btnNew" onClick="@command('addNew')" disabled="@load(vm.filter)" />
-		<toolbarbutton image="/img/edit.png" tooltiptext="${labels.Edit}" id="btnEdit" onClick="@command('edit')" disabled="@load(empty vm.dataBean ? 'true' : 'false')"/>
-		<toolbarbutton image="/img/delete.png" tooltiptext="${labels.Delete}" id="btnDelete" onClick="@command('delObject')" disabled="@load(empty vm.dataBean ? 'true' : 'false')"/>
-		<toolbarbutton image="/img/funnel.png" tooltiptext="${labels.Filter}" id="btnFilter" onClick="@command('filter')" />
-	</toolbar>
-	
+	viewModel="@id('vm') @init('info.bukova.isspst.ui.UsersList')" height="570px">
 	
+	<include src="/app/toolbar.zul"/>
+		
 	<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)">
 		<listhead>
 			<listheader label="Login"/>
diff --git a/src/main/webapp/app/page.css b/src/main/webapp/app/page.css
index 9996d2b4..c633edb5 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,13 +28,17 @@ 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;
 }
 /*
diff --git a/src/main/webapp/app/template.zhtml b/src/main/webapp/app/template.zhtml
index a1cd3ab8..22fa7376 100644
--- a/src/main/webapp/app/template.zhtml
+++ b/src/main/webapp/app/template.zhtml
@@ -2,6 +2,7 @@
 <html  xmlns="native" xmlns:u="zul" xmlns:zk="zk">
 	<u:style src="/app/page.css"/>
 		
+	<div id="container">
 	<div id="header">
 		hlavicka
 	</div>
@@ -11,11 +12,13 @@
 	</div>
 
 	<div id="maincolumn">
+		
 		<u:include src="${gridZul}"/>
 	</div>
                 
 	<div id="footer">Footer
 
 	</div>
+	</div>
 
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/app/toolbar.zul b/src/main/webapp/app/toolbar.zul
new file mode 100644
index 00000000..7c4684e0
--- /dev/null
+++ b/src/main/webapp/app/toolbar.zul
@@ -0,0 +1,9 @@
+<?page title="toolbar" contentType="text/html;charset=UTF-8"?>
+<zk>
+	<toolbar>
+		<toolbarbutton image="/img/add.png" tooltiptext="Nový" id="btnNew" onClick="@command('addNew')" disabled="@load(vm.filter)" />
+		<toolbarbutton image="/img/edit.png" tooltiptext="Upravit" id="btnEdit" onClick="@command('edit')" disabled="@load(empty vm.dataBean ? 'true' : 'false')"/>
+		<toolbarbutton image="/img/delete.png" tooltiptext="Smazat" id="btnDelete" onClick="@command('delObject')" disabled="@load(empty vm.dataBean ? 'true' : 'false')"/>
+		<toolbarbutton image="/img/funnel.png" tooltiptext="Filtr" id="btnFilter" onClick="@command('filter')" />
+	</toolbar>
+</zk>
\ No newline at end of file
