diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a5fb8300d..9d283ab86 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -153,13 +153,26 @@
 			</intent-filter>
 		</activity>
 		<activity android:name="org.geometerplus.android.fbreader.PluginListActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
-		<activity android:name="org.geometerplus.android.fbreader.style.StyleListActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
-		<activity android:name="org.geometerplus.android.fbreader.style.EditStyleActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize">
+
+		<activity android:name="org.geometerplus.android.fbreader.bookmark.BookmarksActivity" android:launchMode="singleTask" android:process=":bookmarks" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize">
+			<intent-filter>
+				<action android:name="android.intent.action.SEARCH"/>
+			</intent-filter>
+			<meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>
+			<intent-filter>
+				<action android:name="android.fbreader.action.BOOKMARKS"/>
+				<category android:name="android.intent.category.DEFAULT"/>
+			</intent-filter>
+		</activity>
+		<activity android:name="org.geometerplus.android.fbreader.bookmark.EditBookmarkActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
+		<activity android:name="org.geometerplus.android.fbreader.bookmark.StyleListActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
+		<activity android:name="org.geometerplus.android.fbreader.bookmark.EditStyleActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize">
 			<intent-filter>
 				<action android:name="android.fbreader.action.EDIT_STYLES"/>
 				<category android:name="android.intent.category.DEFAULT"/>
 			</intent-filter>
 		</activity>
+
 		<activity android:name="org.geometerplus.android.fbreader.image.ImageViewActivity" android:process=":imageView" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize"/>
 		<service android:name="org.geometerplus.android.fbreader.libraryService.LibraryService" android:launchMode="singleTask" android:process=":libraryService">
 			<intent-filter>
@@ -199,17 +212,6 @@
 			</intent-filter>
 		</activity>
 		<activity android:name="org.geometerplus.android.fbreader.TOCActivity" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize"/>
-		<activity android:name="org.geometerplus.android.fbreader.BookmarksActivity" android:launchMode="singleTask" android:process=":bookmarks" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize">
-			<intent-filter>
-				<action android:name="android.intent.action.SEARCH"/>
-			</intent-filter>
-			<meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>
-			<intent-filter>
-				<action android:name="android.fbreader.action.BOOKMARKS"/>
-				<category android:name="android.intent.category.DEFAULT"/>
-			</intent-filter>
-		</activity>
-		<activity android:name="org.geometerplus.android.fbreader.BookmarkEditActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
 		<activity android:name="org.geometerplus.android.fbreader.preferences.PreferenceActivity" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize" android:process=":preferences">
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW"/>
diff --git a/AndroidManifest.xml.pattern b/AndroidManifest.xml.pattern
index 6e11c61c4..f9326cfc9 100644
--- a/AndroidManifest.xml.pattern
+++ b/AndroidManifest.xml.pattern
@@ -153,13 +153,26 @@
 			</intent-filter>
 		</activity>
 		<activity android:name="org.geometerplus.android.fbreader.PluginListActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
-		<activity android:name="org.geometerplus.android.fbreader.style.StyleListActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
-		<activity android:name="org.geometerplus.android.fbreader.style.EditStyleActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize">
+
+		<activity android:name="org.geometerplus.android.fbreader.bookmark.BookmarksActivity" android:launchMode="singleTask" android:process=":bookmarks" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize">
+			<intent-filter>
+				<action android:name="android.intent.action.SEARCH"/>
+			</intent-filter>
+			<meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>
+			<intent-filter>
+				<action android:name="android.fbreader.action.BOOKMARKS"/>
+				<category android:name="android.intent.category.DEFAULT"/>
+			</intent-filter>
+		</activity>
+		<activity android:name="org.geometerplus.android.fbreader.bookmark.EditBookmarkActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
+		<activity android:name="org.geometerplus.android.fbreader.bookmark.StyleListActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
+		<activity android:name="org.geometerplus.android.fbreader.bookmark.EditStyleActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize">
 			<intent-filter>
 				<action android:name="android.fbreader.action.EDIT_STYLES"/>
 				<category android:name="android.intent.category.DEFAULT"/>
 			</intent-filter>
 		</activity>
+
 		<activity android:name="org.geometerplus.android.fbreader.image.ImageViewActivity" android:process=":imageView" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize"/>
 		<service android:name="org.geometerplus.android.fbreader.libraryService.LibraryService" android:launchMode="singleTask" android:process=":libraryService">
 			<intent-filter>
@@ -199,17 +212,6 @@
 			</intent-filter>
 		</activity>
 		<activity android:name="org.geometerplus.android.fbreader.TOCActivity" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize"/>
-		<activity android:name="org.geometerplus.android.fbreader.BookmarksActivity" android:launchMode="singleTask" android:process=":bookmarks" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize">
-			<intent-filter>
-				<action android:name="android.intent.action.SEARCH"/>
-			</intent-filter>
-			<meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>
-			<intent-filter>
-				<action android:name="android.fbreader.action.BOOKMARKS"/>
-				<category android:name="android.intent.category.DEFAULT"/>
-			</intent-filter>
-		</activity>
-		<activity android:name="org.geometerplus.android.fbreader.BookmarkEditActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize"/>
 		<activity android:name="org.geometerplus.android.fbreader.preferences.PreferenceActivity" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize" android:process=":preferences">
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW"/>
diff --git a/res/layout/edit_bookmark.xml b/res/layout/edit_bookmark.xml
index f514db0d6..b1134c523 100644
--- a/res/layout/edit_bookmark.xml
+++ b/res/layout/edit_bookmark.xml
@@ -3,12 +3,12 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
-	android:orientation="vertical"
+	android:orientation="horizontal"
 >
 	<EditText
 		android:id="@+id/bookmark_text_editor"
-		android:layout_width="200dip"
-		android:layout_height="100dip"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
 		android:layout_marginLeft="5dip"
 		android:layout_marginRight="5dip"
 		android:layout_marginTop="5dip"
@@ -19,19 +19,31 @@
 	<LinearLayout
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:orientation="horizontal"
+		android:orientation="vertical"
 	>
 		<Button
-			android:layout_width="0dip"
-			android:layout_height="fill_parent"
+			android:layout_height="0dip"
+			android:layout_width="fill_parent"
 			android:layout_weight="1"
-			android:text="ok"
+			android:text="style"
 		/>
 		<Button
-			android:layout_width="0dip"
-			android:layout_height="fill_parent"
+			android:layout_height="0dip"
+			android:layout_width="fill_parent"
+			android:layout_weight="1"
+			android:text="delete"
+		/>
+		<Button
+			android:layout_height="0dip"
+			android:layout_width="fill_parent"
 			android:layout_weight="1"
 			android:text="cancel"
 		/>
+		<Button
+			android:layout_height="0dip"
+			android:layout_width="fill_parent"
+			android:layout_weight="1"
+			android:text="ok"
+		/>
 	</LinearLayout>
 </LinearLayout>
diff --git a/src/org/geometerplus/android/fbreader/SelectionBookmarkAction.java b/src/org/geometerplus/android/fbreader/SelectionBookmarkAction.java
index 33f5734cd..22683001e 100644
--- a/src/org/geometerplus/android/fbreader/SelectionBookmarkAction.java
+++ b/src/org/geometerplus/android/fbreader/SelectionBookmarkAction.java
@@ -33,7 +33,7 @@ import org.geometerplus.fbreader.book.Bookmark;
 import org.geometerplus.fbreader.fbreader.FBReaderApp;
 
 import org.geometerplus.android.fbreader.api.FBReaderIntents;
-import org.geometerplus.android.fbreader.style.StyleListActivity;
+import org.geometerplus.android.fbreader.bookmark.StyleListActivity;
 
 public class SelectionBookmarkAction extends FBAndroidAction {
 	SelectionBookmarkAction(FBReader baseApplication, FBReaderApp fbreader) {
diff --git a/src/org/geometerplus/android/fbreader/BookmarksActivity.java b/src/org/geometerplus/android/fbreader/bookmark/BookmarksActivity.java
similarity index 99%
rename from src/org/geometerplus/android/fbreader/BookmarksActivity.java
rename to src/org/geometerplus/android/fbreader/bookmark/BookmarksActivity.java
index 7c581257e..9dc486d36 100644
--- a/src/org/geometerplus/android/fbreader/BookmarksActivity.java
+++ b/src/org/geometerplus/android/fbreader/bookmark/BookmarksActivity.java
@@ -229,7 +229,7 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
 				gotoBookmark(bookmark);
 				return true;
 			case EDIT_ITEM_ID:
-				final Intent intent = new Intent(this, BookmarkEditActivity.class);
+				final Intent intent = new Intent(this, EditBookmarkActivity.class);
 				OrientationUtil.startActivityForResult(this, intent, 1);
 				// TODO: implement
 				return true;
diff --git a/src/org/geometerplus/android/fbreader/BookmarkEditActivity.java b/src/org/geometerplus/android/fbreader/bookmark/EditBookmarkActivity.java
similarity index 97%
rename from src/org/geometerplus/android/fbreader/BookmarkEditActivity.java
rename to src/org/geometerplus/android/fbreader/bookmark/EditBookmarkActivity.java
index 7a27753b2..3f06c0ac2 100644
--- a/src/org/geometerplus/android/fbreader/BookmarkEditActivity.java
+++ b/src/org/geometerplus/android/fbreader/bookmark/EditBookmarkActivity.java
@@ -52,7 +52,7 @@ class SimpleContainer extends ViewGroup {
 	}
 }
 
-public class BookmarkEditActivity extends Activity {
+public class EditBookmarkActivity extends Activity {
 	@Override
 	public void onCreate(Bundle bundle) {
 		super.onCreate(bundle);
diff --git a/src/org/geometerplus/android/fbreader/style/EditStyleActivity.java b/src/org/geometerplus/android/fbreader/bookmark/EditStyleActivity.java
similarity index 98%
rename from src/org/geometerplus/android/fbreader/style/EditStyleActivity.java
rename to src/org/geometerplus/android/fbreader/bookmark/EditStyleActivity.java
index 6bbc097ab..bf8b28c70 100644
--- a/src/org/geometerplus/android/fbreader/style/EditStyleActivity.java
+++ b/src/org/geometerplus/android/fbreader/bookmark/EditStyleActivity.java
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.android.fbreader.style;
+package org.geometerplus.android.fbreader.bookmark;
 
 import android.content.Context;
 import android.os.Bundle;
diff --git a/src/org/geometerplus/android/fbreader/style/StyleListActivity.java b/src/org/geometerplus/android/fbreader/bookmark/StyleListActivity.java
similarity index 99%
rename from src/org/geometerplus/android/fbreader/style/StyleListActivity.java
rename to src/org/geometerplus/android/fbreader/bookmark/StyleListActivity.java
index db058bbf4..e11aa05ef 100644
--- a/src/org/geometerplus/android/fbreader/style/StyleListActivity.java
+++ b/src/org/geometerplus/android/fbreader/bookmark/StyleListActivity.java
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.android.fbreader.style;
+package org.geometerplus.android.fbreader.bookmark;
 
 import java.util.ArrayList;
 import java.util.List;