diff --git a/build.xml b/build.xml
index cc279c8e7..98458ecf5 100644
--- a/build.xml
+++ b/build.xml
@@ -3,6 +3,7 @@
 	<property name = "src.dir" value = "src"/>
 	<property name = "bin.dir" value = "bin"/>
 	<property name = "test.dir" value= "test"/>
+	<property name = "main.jar" value= "FBReader.jar"/>
 
 	<target name = "prepare">
 		<mkdir dir = "${bin.dir}" />
@@ -12,6 +13,10 @@
 		<javac srcdir = "${src.dir}" destdir = "${bin.dir}"/>
 	</target>
 
+	<target name = "build" depends = "compile">
+		<jar destfile = "${main.jar}" manifest = "manifest.mf" basedir = "${bin.dir}"/>
+	</target>
+
 	<target name = "test" depends = "prepare">
 		<javac srcdir = "${test.dir}" destdir = "${bin.dir}">
 			<classpath>
@@ -39,5 +44,9 @@
 		<delete dir = "${bin.dir}"/>
 	</target>
 
+	<target name = "distclean" depends = "clean">
+		<delete file = "${main.jar}"/>
+	</target>
+
 	<target name = "all" depends = "clean"/>
 </project>
diff --git a/src/org/zlibrary/core/application/ZLApplicationWindow.java b/src/org/zlibrary/core/application/ZLApplicationWindow.java
index b4144524b..a97349d0a 100644
--- a/src/org/zlibrary/core/application/ZLApplicationWindow.java
+++ b/src/org/zlibrary/core/application/ZLApplicationWindow.java
@@ -47,7 +47,7 @@ abstract public class ZLApplicationWindow {
 				return;
 			} else {
 				button.press();
-				ButtonGroup group = button.buttonGroup();
+				ButtonGroup group = button.getButtonGroup();
 				Set<ButtonItem> items = group.Items;
 				for (ButtonItem bitem: items) {
 					setToggleButtonState(bitem);
@@ -55,7 +55,7 @@ abstract public class ZLApplicationWindow {
 			}
 			myToggleButtonLock = false;
 		}
-		application().doAction(button.actionId());
+		application().doAction(button.getActionId());
 	}
 	
 	public abstract void setToggleButtonState(ButtonItem item);
@@ -90,7 +90,7 @@ abstract public class ZLApplicationWindow {
 				case ZLApplication::Toolbar::Item::BUTTON:
 					{
 						const ZLApplication::Toolbar::ButtonItem &button = (const ZLApplication::Toolbar::ButtonItem&)**it;
-						int id = button.actionId();
+						int id = button.getActionId();
 	        
 						const bool visible = application().isActionVisible(id);
 						const bool enabled = application().isActionEnabled(id);
@@ -103,7 +103,7 @@ abstract public class ZLApplicationWindow {
 							enableToolbarSpace = true;
 						}
 						if (!enabled && button.isPressed()) {
-							shared_ptr<ZLApplication::Toolbar::ButtonGroup> group = button.buttonGroup();
+							shared_ptr<ZLApplication::Toolbar::ButtonGroup> group = button.getButtonGroup();
 							group->press(0);
 							application().doAction(group->UnselectAllButtonsActionId);
 							myToggleButtonLock = true;