diff --git a/android/jni/com/mapswithme/maps/editor/Editor.cpp b/android/jni/com/mapswithme/maps/editor/Editor.cpp
index 526489d7fb..e7e21702cf 100644
--- a/android/jni/com/mapswithme/maps/editor/Editor.cpp
+++ b/android/jni/com/mapswithme/maps/editor/Editor.cpp
@@ -56,71 +56,148 @@ Java_com_mapswithme_maps_editor_Editor_nativeInit(JNIEnv * env, jclass)
 }
 
 JNIEXPORT jstring JNICALL
-Java_com_mapswithme_maps_editor_Editor_nativeGetMetadata(JNIEnv * env, jclass, jint type)
+Java_com_mapswithme_maps_editor_Editor_nativeGetOpeningHours(JNIEnv * env, jclass)
 {
-  // TODO(yunikkk): Switch to osm::Props enum instead of metadata, and use separate getters instead a generic one.
-  return jni::ToJavaString(env, g_editableMapObject.GetMetadata().Get(static_cast<feature::Metadata::EType>(type)));
+  return jni::ToJavaString(env, g_editableMapObject.GetOpeningHours());
 }
 
 JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_editor_Editor_nativeSetMetadata(JNIEnv * env, jclass clazz, jint type, jstring value)
+Java_com_mapswithme_maps_editor_Editor_nativeSetOpeningHours(JNIEnv * env, jclass, jstring value)
 {
-  // TODO(yunikkk): I would recommend to use separate setters/getters for each metadata field.
-  string const v = jni::ToNativeString(env, value);
-  using feature::Metadata;
-  switch (type)
-  {
-  case Metadata::FMD_OPEN_HOURS: g_editableMapObject.SetOpeningHours(v); break;
-  case Metadata::FMD_PHONE_NUMBER: g_editableMapObject.SetPhone(v); break;
-  case Metadata::FMD_FAX_NUMBER: g_editableMapObject.SetFax(v); break;
-  case Metadata::FMD_STARS:
-    {
-      // TODO(yunikkk): Pass stars in a separate integer setter.
-      int stars;
-      if (strings::to_int(v, stars))
-        g_editableMapObject.SetStars(stars);
-      break;
-    }
-  case Metadata::FMD_OPERATOR: g_editableMapObject.SetOperator(v); break;
-  case Metadata::FMD_URL:  // We don't allow url in UI. Website should be used instead.
-  case Metadata::FMD_WEBSITE: g_editableMapObject.SetWebsite(v); break;
-  case Metadata::FMD_INTERNET: // TODO(yunikkk): use separate setter for Internet.
-    {
-      osm::Internet inet = osm::Internet::Unknown;
-      if (v == DebugPrint(osm::Internet::Wlan))
-        inet = osm::Internet::Wlan;
-      if (v == DebugPrint(osm::Internet::Wired))
-        inet = osm::Internet::Wired;
-      if (v == DebugPrint(osm::Internet::No))
-        inet = osm::Internet::No;
-      if (v == DebugPrint(osm::Internet::Yes))
-        inet = osm::Internet::Yes;
-      g_editableMapObject.SetInternet(inet);
-    }
-    break;
-  case Metadata::FMD_ELE:
-    {
-      double ele;
-      if (strings::to_double(v, ele))
-        g_editableMapObject.SetElevation(ele);
-      break;
-    }
-  case Metadata::FMD_EMAIL: g_editableMapObject.SetEmail(v); break;
-  case Metadata::FMD_POSTCODE: g_editableMapObject.SetPostcode(v); break;
-  case Metadata::FMD_WIKIPEDIA: g_editableMapObject.SetWikipedia(v); break;
-  case Metadata::FMD_FLATS: g_editableMapObject.SetFlats(v); break;
-  case Metadata::FMD_BUILDING_LEVELS: g_editableMapObject.SetBuildingLevels(v); break;
-  case Metadata::FMD_TURN_LANES:
-  case Metadata::FMD_TURN_LANES_FORWARD:
-  case Metadata::FMD_TURN_LANES_BACKWARD:
-  case Metadata::FMD_MAXSPEED:
-  case Metadata::FMD_HEIGHT:
-  case Metadata::FMD_MIN_HEIGHT:
-  case Metadata::FMD_DENOMINATION:
-  case Metadata::FMD_TEST_ID:
-  case Metadata::FMD_COUNT:
-    break;
-  }
+  g_editableMapObject.SetOpeningHours(jni::ToNativeString(env, value));
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeGetPhone(JNIEnv * env, jclass)
+{
+  return jni::ToJavaString(env, g_editableMapObject.GetPhone());
+}
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeSetPhone(JNIEnv * env, jclass, jstring value)
+{
+  g_editableMapObject.SetPhone(jni::ToNativeString(env, value));
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeGetWebsite(JNIEnv * env, jclass)
+{
+  return jni::ToJavaString(env, g_editableMapObject.GetWebsite());
+}
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeSetWebsite(JNIEnv * env, jclass, jstring value)
+{
+  g_editableMapObject.SetWebsite(jni::ToNativeString(env, value));
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeGetEmail(JNIEnv * env, jclass)
+{
+  return jni::ToJavaString(env, g_editableMapObject.GetEmail());
+}
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeSetEmail(JNIEnv * env, jclass, jstring value)
+{
+  g_editableMapObject.SetEmail(jni::ToNativeString(env, value));
+}
+
+JNIEXPORT jint JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeGetStars(JNIEnv * env, jclass)
+{
+  return g_editableMapObject.GetStars();
+}
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeSetStars(JNIEnv * env, jclass, jint value)
+{
+  g_editableMapObject.SetStars(value);
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeGetOperator(JNIEnv * env, jclass)
+{
+  return jni::ToJavaString(env, g_editableMapObject.GetOperator());
+}
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeSetOperator(JNIEnv * env, jclass, jstring value)
+{
+  g_editableMapObject.SetOperator(jni::ToNativeString(env, value));
+}
+
+JNIEXPORT jdouble JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeGetElevation(JNIEnv * env, jclass)
+{
+  double elevation;
+  return g_editableMapObject.GetElevation(elevation) ? elevation : -1;
+}
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeSetElevation(JNIEnv * env, jclass, jdouble value)
+{
+  g_editableMapObject.SetElevation(value);
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeGetWikipedia(JNIEnv * env, jclass)
+{
+  return jni::ToJavaString(env, g_editableMapObject.GetWikipedia());
+}
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeSetWikipedia(JNIEnv * env, jclass, jstring value)
+{
+  g_editableMapObject.SetWikipedia(jni::ToNativeString(env, value));
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeGetFlats(JNIEnv * env, jclass)
+{
+  return jni::ToJavaString(env, g_editableMapObject.GetFlats());
+}
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeSetFlats(JNIEnv * env, jclass, jstring value)
+{
+  g_editableMapObject.SetFlats(jni::ToNativeString(env, value));
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeGetBuildingLevels(JNIEnv * env, jclass)
+{
+  return jni::ToJavaString(env, g_editableMapObject.GetBuildingLevels());
+}
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeSetBuildingLevels(JNIEnv * env, jclass, jstring value)
+{
+  g_editableMapObject.SetBuildingLevels(jni::ToNativeString(env, value));
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeGetZipCode(JNIEnv * env, jclass)
+{
+  return jni::ToJavaString(env, g_editableMapObject.GetPostcode());
+}
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeSetZipCode(JNIEnv * env, jclass clazz, jstring value)
+{
+  g_editableMapObject.SetPostcode(jni::ToNativeString(env, value));
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeHasWifi(JNIEnv *, jclass)
+{
+  return g_editableMapObject.GetInternet() == osm::Internet::Wlan;
+}
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeSetHasWifi(JNIEnv *, jclass, jboolean hasWifi)
+{
+  g_editableMapObject.SetInternet(osm::Internet::Wlan);
 }
 
 JNIEXPORT jboolean JNICALL
@@ -168,6 +245,12 @@ Java_com_mapswithme_maps_editor_Editor_nativeIsNameEditable(JNIEnv * env, jclass
   return g_editableMapObject.IsNameEditable();
 }
 
+JNIEXPORT jboolean JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeIsBuilding(JNIEnv * env, jclass clazz)
+{
+  return g_editableMapObject.IsBuilding();
+}
+
 JNIEXPORT jstring JNICALL
 Java_com_mapswithme_maps_editor_Editor_nativeGetDefaultName(JNIEnv * env, jclass)
 {
@@ -220,13 +303,6 @@ Java_com_mapswithme_maps_editor_Editor_nativeGetNearbyStreets(JNIEnv * env, jcla
   return jStreets;
 }
 
-JNIEXPORT jboolean JNICALL
-Java_com_mapswithme_maps_editor_Editor_nativeHasWifi(JNIEnv *, jclass)
-{
-  // TODO(AlexZ): Support 3-state: yes, no, unknown.
-  return g_editableMapObject.GetMetadata().Get(feature::Metadata::FMD_INTERNET) == "wlan";
-}
-
 JNIEXPORT jboolean JNICALL
 Java_com_mapswithme_maps_editor_Editor_nativeHasSomethingToUpload(JNIEnv * env, jclass clazz)
 {
@@ -351,19 +427,19 @@ Java_com_mapswithme_maps_editor_Editor_nativeGetMwmVersion(JNIEnv * env, jclass
   return g_editableMapObject.GetID().GetMwmVersion();
 }
 
-// static void nativeCreateNote(double lat, double lon, String text);
+// static void nativeCreateNote(String text);
 JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon, jstring text)
+Java_com_mapswithme_maps_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, jstring text)
 {
-  Editor::Instance().CreateNote(ms::LatLon(lat, lon), g_editableMapObject.GetID(),
+  Editor::Instance().CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(),
                                 osm::Editor::NoteProblemType::General, jni::ToNativeString(env, text));
 }
 
-// static void nativePlaceDoesNotExist(double lat, double lon);
+// static void nativePlaceDoesNotExist();
 JNIEXPORT void JNICALL
-Java_com_mapswithme_maps_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon)
+Java_com_mapswithme_maps_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass clazz)
 {
-  Editor::Instance().CreateNote(ms::LatLon(lat, lon), g_editableMapObject.GetID(),
+  Editor::Instance().CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(),
                                 osm::Editor::NoteProblemType::PlaceDoesNotExist, "");
 }
 
@@ -373,4 +449,10 @@ Java_com_mapswithme_maps_editor_Editor_nativeIsHouseValid(JNIEnv * env, jclass c
 {
   return osm::EditableMapObject::ValidateHouseNumber(jni::ToNativeString(env, houseNumber));
 }
+
+JNIEXPORT jstring JNICALL
+Java_com_mapswithme_maps_editor_Editor_nativeGetCategory(JNIEnv * env, jclass clazz)
+{
+  return jni::ToJavaString(env, g_editableMapObject.GetLocalizedType());
+}
 } // extern "C"
diff --git a/android/res/drawable-hdpi/ic_operator.png b/android/res/drawable-hdpi/ic_operator.png
new file mode 100644
index 0000000000..78836dc3d6
Binary files /dev/null and b/android/res/drawable-hdpi/ic_operator.png differ
diff --git a/android/res/drawable-mdpi/ic_operator.png b/android/res/drawable-mdpi/ic_operator.png
new file mode 100644
index 0000000000..877028e7aa
Binary files /dev/null and b/android/res/drawable-mdpi/ic_operator.png differ
diff --git a/android/res/drawable-xhdpi/ic_operator.png b/android/res/drawable-xhdpi/ic_operator.png
new file mode 100644
index 0000000000..2606d9bafd
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_operator.png differ
diff --git a/android/res/drawable-xxhdpi/ic_operator.png b/android/res/drawable-xxhdpi/ic_operator.png
new file mode 100644
index 0000000000..a2d3fee3a3
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_operator.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_operator.png b/android/res/drawable-xxxhdpi/ic_operator.png
new file mode 100644
index 0000000000..f8482e4f22
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_operator.png differ
diff --git a/android/res/layout/fragment_editor.xml b/android/res/layout/fragment_editor.xml
index dd781d8967..d31cf4aa7b 100644
--- a/android/res/layout/fragment_editor.xml
+++ b/android/res/layout/fragment_editor.xml
@@ -4,6 +4,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:padding="@dimen/margin_half"
   tools:context=".editor.EditorActivity"
   tools:ignore="DuplicateIds">
 
@@ -12,6 +13,63 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
+    <android.support.v7.widget.CardView
+      android:id="@+id/cv__category"
+      style="@style/MwmWidget.Editor.CardView">
+
+      <RelativeLayout
+        android:id="@+id/category"
+        style="@style/MwmWidget.Editor.MetadataBlock.Clickable"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/editor_height_field"
+        android:layout_marginBottom="0dp"
+        android:padding="@dimen/margin_half_plus">
+
+        <ImageView
+          android:id="@+id/icon"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_centerVertical="true"
+          android:layout_marginEnd="@dimen/margin_half_plus"
+          android:layout_marginLeft="@dimen/margin_quarter"
+          android:layout_marginRight="@dimen/margin_half_plus"
+          android:layout_marginStart="@dimen/margin_quarter"
+          android:tint="?iconTint"
+          tools:src="@drawable/ic_operator"/>
+
+        <Space
+          android:id="@+id/anchor_center"
+          android:layout_width="0dp"
+          android:layout_height="0dp"
+          android:layout_centerVertical="true"/>
+
+        <TextView
+          android:id="@+id/title"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_above="@id/anchor_center"
+          android:layout_marginLeft="@dimen/margin_quarter"
+          android:layout_marginStart="@dimen/margin_quarter"
+          android:layout_toEndOf="@id/icon"
+          android:layout_toRightOf="@id/icon"
+          android:text="@string/editor_edit_place_category_title"
+          android:textAppearance="@style/MwmTextAppearance.Body4"/>
+
+        <TextView
+          android:id="@+id/name"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_alignLeft="@id/title"
+          android:layout_alignStart="@id/title"
+          android:layout_below="@id/title"
+          android:textAppearance="@style/MwmTextAppearance.Body1"
+          tools:text="Ololo"/>
+
+      </RelativeLayout>
+
+    </android.support.v7.widget.CardView>
+
     <android.support.v7.widget.CardView
       android:id="@+id/cv__name"
       style="@style/MwmWidget.Editor.CardView">
@@ -29,7 +87,7 @@
         android:paddingRight="@dimen/margin_base"
         android:paddingStart="@dimen/margin_base">
 
-        <com.mapswithme.maps.widget.CustomTextInputLayout
+        <android.support.design.widget.TextInputLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content">
 
@@ -39,7 +97,7 @@
             android:hint="@string/editor_edit_place_name_hint"
             android:singleLine="true"/>
 
-        </com.mapswithme.maps.widget.CustomTextInputLayout>
+        </android.support.design.widget.TextInputLayout>
 
         <TextView
           android:id="@+id/name_multilang"
@@ -86,7 +144,7 @@
 
           <ImageView
             style="@style/MwmWidget.Editor.MetadataIcon"
-            android:src="@drawable/ic_coordinates"/>
+            android:src="@drawable/ic_address"/>
 
           <TextView
             android:id="@+id/street_title"
@@ -119,28 +177,17 @@
 
         </RelativeLayout>
 
-        <RelativeLayout
-          android:id="@+id/building"
-          style="@style/MwmWidget.Editor.MetadataBlock">
+        <include
+          android:id="@+id/block_building"
+          layout="@layout/item_editor_input"/>
 
-          <com.mapswithme.maps.widget.CustomTextInputLayout
-            android:id="@+id/custom_input"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="54dp"
-            android:layout_marginStart="54dp">
+        <include
+          android:id="@+id/block_zipcode"
+          layout="@layout/item_editor_input"/>
 
-            <EditText
-              android:id="@+id/input"
-              style="@style/MwmWidget.Editor.FieldLayout.EditText"
-              android:hint="@string/house_number"
-              tools:text="79-59"/>
-
-          </com.mapswithme.maps.widget.CustomTextInputLayout>
-
-        </RelativeLayout>
+        <include
+          android:id="@+id/block_levels"
+          layout="@layout/item_editor_input"/>
 
       </LinearLayout>
 
@@ -172,72 +219,21 @@
           android:id="@+id/block_opening_hours"
           layout="@layout/item_opening_hours"/>
 
-        <RelativeLayout
+        <include
           android:id="@+id/block_phone"
-          style="@style/MwmWidget.Editor.MetadataBlock">
+          layout="@layout/item_editor_input"/>
 
-          <ImageView
-            style="@style/MwmWidget.Editor.MetadataIcon"
-            android:src="@drawable/ic_phone"/>
-
-          <com.mapswithme.maps.widget.CustomTextInputLayout
-            style="@style/MwmWidget.Editor.FieldLayout"
-            android:layout_centerVertical="true">
-
-            <EditText
-              android:id="@+id/input"
-              style="@style/MwmWidget.Editor.FieldLayout.EditText"
-              android:hint="@string/phone"
-              android:inputType="phone"
-              tools:text="+937 99 92"/>
-
-          </com.mapswithme.maps.widget.CustomTextInputLayout>
-
-        </RelativeLayout>
-
-        <RelativeLayout
+        <include
           android:id="@+id/block_website"
-          style="@style/MwmWidget.Editor.MetadataBlock">
+          layout="@layout/item_editor_input"/>
 
-          <ImageView
-            style="@style/MwmWidget.Editor.MetadataIcon"
-            android:src="@drawable/ic_website"/>
-
-          <com.mapswithme.maps.widget.CustomTextInputLayout
-            style="@style/MwmWidget.Editor.FieldLayout"
-            android:layout_centerVertical="true">
-
-            <EditText
-              android:id="@+id/input"
-              style="@style/MwmWidget.Editor.FieldLayout.EditText"
-              android:hint="@string/website"
-              tools:text="maps.me"/>
-
-          </com.mapswithme.maps.widget.CustomTextInputLayout>
-
-        </RelativeLayout>
-
-        <RelativeLayout
+        <include
           android:id="@+id/block_email"
-          style="@style/MwmWidget.Editor.MetadataBlock">
+          layout="@layout/item_editor_input"/>
 
-          <ImageView
-            style="@style/MwmWidget.Editor.MetadataIcon"
-            android:src="@drawable/ic_email"/>
-
-          <com.mapswithme.maps.widget.CustomTextInputLayout
-            style="@style/MwmWidget.Editor.FieldLayout"
-            android:layout_centerVertical="true">
-
-            <EditText
-              android:id="@+id/input"
-              style="@style/MwmWidget.Editor.FieldLayout.EditText"
-              android:hint="@string/email"
-              tools:text="bugs@maps.me"/>
-
-          </com.mapswithme.maps.widget.CustomTextInputLayout>
-
-        </RelativeLayout>
+        <include
+          android:id="@+id/block_operator"
+          layout="@layout/item_editor_input"/>
 
         <RelativeLayout
           android:id="@+id/block_cuisine"
@@ -312,6 +308,56 @@
 
     </android.support.v7.widget.CardView>
 
+    <android.support.v7.widget.CardView
+      android:id="@+id/cv__more"
+      style="@style/MwmWidget.Editor.CardView">
+
+      <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="@dimen/margin_base">
+
+        <TextView
+          android:layout_width="match_parent"
+          android:layout_height="32dp"
+          android:text="@string/editor_other_info"
+          android:textAppearance="@style/MwmTextAppearance.Body2"/>
+
+        <com.mapswithme.maps.widget.CustomTextInputLayout
+          android:id="@+id/custom_input"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:gravity="center_vertical"
+          android:minHeight="74dp">
+
+          <EditText
+            android:id="@+id/input"
+            style="@style/MwmWidget.Editor.FieldLayout.EditText"
+            android:hint="@string/editor_detailed_description_hint"/>
+
+        </com.mapswithme.maps.widget.CustomTextInputLayout>
+
+        <TextView
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="@dimen/margin_half"
+          android:text="@string/editor_detailed_description"
+          android:textAppearance="@style/MwmTextAppearance.Body4"/>
+
+        <TextView
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="@dimen/margin_half"
+          android:text="@string/editor_more_about_osm"
+          android:textAppearance="@style/MwmTextAppearance.Body4"
+          android:textColor="?colorAccent"
+          android:textSize="@dimen/text_size_body_4"/>
+
+      </LinearLayout>
+
+    </android.support.v7.widget.CardView>
+
   </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/android/res/layout/fragment_timetable_simple.xml b/android/res/layout/fragment_timetable_simple.xml
index 01f952ab76..045a584034 100644
--- a/android/res/layout/fragment_timetable_simple.xml
+++ b/android/res/layout/fragment_timetable_simple.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.RecyclerView
-  android:id="@+id/recycler"
   xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/recycler"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:background="?windowBackgroundForced"
   android:paddingLeft="@dimen/margin_half"
-  android:paddingRight="@dimen/margin_half"/>
\ No newline at end of file
+  android:paddingRight="@dimen/margin_half"
+  android:scrollbars="vertical"/>
\ No newline at end of file
diff --git a/android/res/layout/item_editor_input.xml b/android/res/layout/item_editor_input.xml
new file mode 100644
index 0000000000..522088237b
--- /dev/null
+++ b/android/res/layout/item_editor_input.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  style="@style/MwmWidget.Editor.MetadataBlock">
+
+  <ImageView
+    android:id="@+id/icon"
+    style="@style/MwmWidget.Editor.MetadataIcon"
+    tools:src="@drawable/ic_phone"/>
+
+  <android.support.design.widget.TextInputLayout
+    android:id="@+id/custom_input"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_centerVertical="true"
+    android:layout_marginLeft="54dp"
+    android:layout_marginStart="54dp">
+
+    <EditText
+      android:id="@+id/input"
+      style="@style/MwmWidget.Editor.FieldLayout.EditText"
+      tools:hint="Hint"
+      tools:text="Input"/>
+
+  </android.support.design.widget.TextInputLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 8c2cf3209a..b79858ccff 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -829,8 +829,8 @@
 	<string name="download_over_mobile_header">Загрузить через сотовую связь?</string>
 	<string name="download_over_mobile_message">На некоторых тарифных планах или в роуминге это может привести к значительным расходам.</string>
 	<string name="error_enter_correct_house_number">Введите корректный номер дома</string>
-	<string name="editor_storey_number">Количество этажей (максимум %1$s)</string>
-	<string name="error_enter_correct_storey_number">Редактируйте здания высотой максимум %1$s этажей.</string>
+	<string name="editor_storey_number">Количество этажей (максимум %d)</string>
+	<string name="error_enter_correct_storey_number">Редактируйте здания высотой максимум %d этажей.</string>
 	<string name="editor_zip_code">Почтовый индекс</string>
 	<string name="error_enter_correct_zip_code">Введите корректный почтовый индекс</string>
 	<string name="editor_operator">Владелец</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 50068ad745..62caa65139 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -833,8 +833,14 @@
 	<string name="download_over_mobile_header">Download by using a cellular network connection?</string>
 	<string name="download_over_mobile_message">This could be considerably expensive with some plans or if roaming.</string>
 	<string name="error_enter_correct_house_number">Enter correct house number</string>
+	<string name="editor_storey_number">Storey number (maximum %d)</string>
+	<string name="error_enter_correct_storey_number">Maximum building levels number is limited to %d.</string>
 	<string name="editor_zip_code">ZIP Code</string>
 	<string name="error_enter_correct_zip_code">Enter correct ZIP Code</string>
 	<string name="editor_operator">Operator</string>
 	<string name="placepage_unknown_place">Unknown Place</string>
+	<string name="editor_other_info">Other information about place</string>
+	<string name="editor_detailed_description_hint">Detailed description</string>
+	<string name="editor_detailed_description">Suggested changes will be send to OpenStreetMap...</string>
+	<string name="editor_more_about_osm">More about OpenStreetMap</string>
 </resources>
diff --git a/android/res/values/styles-editor.xml b/android/res/values/styles-editor.xml
index 94adf3fa12..88509aed45 100644
--- a/android/res/values/styles-editor.xml
+++ b/android/res/values/styles-editor.xml
@@ -12,7 +12,7 @@
   <style name="MwmWidget.Editor.CardView">
     <item name="android:layout_width">match_parent</item>
     <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_marginBottom">@dimen/margin_base</item>
+    <item name="android:layout_marginBottom">@dimen/margin_half</item>
     <item name="cardBackgroundColor">?cardBackground</item>
     <item name="android:padding">@dimen/margin_base</item>
     <item name="cardPreventCornerOverlap">false</item>
@@ -27,6 +27,7 @@
 
   <style name="MwmWidget.Editor.MetadataBlock.Clickable">
     <item name="android:background">?clickableBackground</item>
+    <item name="android:clickable">true</item>
   </style>
 
   <style name="MwmWidget.Editor.MetadataIcon">
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index efc3dc831e..6b1cde5da2 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -1,5 +1,6 @@
 package com.mapswithme.maps;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -323,6 +324,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     return super.getThemeResourceId(theme);
   }
 
+  @SuppressLint("InlinedApi")
   @Override
   public void onCreate(@Nullable Bundle savedInstanceState)
   {
diff --git a/android/src/com/mapswithme/maps/editor/Editor.java b/android/src/com/mapswithme/maps/editor/Editor.java
index d66171b6b2..b09616eaa3 100644
--- a/android/src/com/mapswithme/maps/editor/Editor.java
+++ b/android/src/com/mapswithme/maps/editor/Editor.java
@@ -54,20 +54,33 @@ public final class Editor
   @NonNull
   public static native int[] nativeGetEditableFields();
 
-  public static String getMetadata(Metadata.MetadataType type)
-  {
-    return nativeGetMetadata(type.toInt());
-  }
-  public static void setMetadata(Metadata.MetadataType type, String value)
-  {
-    nativeSetMetadata(type.toInt(), value);
-  }
-  private static native String nativeGetMetadata(int type);
-  private static native void nativeSetMetadata(int type, String value);
+  public static native String nativeGetCategory();
+  public static native String nativeGetOpeningHours();
+  public static native void nativeSetOpeningHours(String openingHours);
+  public static native String nativeGetPhone();
+  public static native void nativeSetPhone(String phone);
+  public static native String nativeGetWebsite();
+  public static native void nativeSetWebsite(String website);
+  public static native String nativeGetEmail();
+  public static native void nativeSetEmail(String email);
+  public static native int nativeGetStars();
+  public static native void nativeSetStars(String stars);
+  public static native String nativeGetOperator();
+  public static native void nativeSetOperator(String operator);
+  public static native String nativeGetWikipedia();
+  public static native void nativeSetWikipedia(String wikipedia);
+  public static native String nativeGetFlats();
+  public static native void nativeSetFlats(String flats);
+  public static native String nativeGetBuildingLevels();
+  public static native void nativeSetBuildingLevels(String levels);
+  public static native String nativeGetZipCode();
+  public static native void nativeSetZipCode(String zipCode);
+  public static native boolean nativeHasWifi();
+  public static native boolean nativeSetHasWifi(boolean hasWifi);
 
   public static native boolean nativeIsAddressEditable();
-
   public static native boolean nativeIsNameEditable();
+  public static native boolean nativeIsBuilding();
 
   @NonNull
   public static native String[] nativeGetNearbyStreets();
@@ -84,9 +97,6 @@ public final class Editor
   public static native String nativeGetHouseNumber();
   public static native void nativeSetHouseNumber(String houseNumber);
 
-  // TODO(AlexZ): Support 3-state: Yes, No, Unknown.
-  public static native boolean nativeHasWifi();
-
   public static native boolean nativeHasSomethingToUpload();
   @WorkerThread
   private static native void nativeUploadChanges(String token, String secret, String appVersion, String appId);
@@ -140,8 +150,8 @@ public final class Editor
   public static native String nativeGetMwmName();
   public static native long nativeGetMwmVersion();
 
-  public static native void nativeCreateNote(double lat, double lon, String text);
-  public static native void nativePlaceDoesNotExist(double lat, double lon);
+  public static native void nativeCreateNote(String text);
+  public static native void nativePlaceDoesNotExist();
 
   public static native boolean nativeIsHouseValid(String houseNumber);
 }
diff --git a/android/src/com/mapswithme/maps/editor/EditorFragment.java b/android/src/com/mapswithme/maps/editor/EditorFragment.java
index dc3cf0f29b..4f98a02281 100644
--- a/android/src/com/mapswithme/maps/editor/EditorFragment.java
+++ b/android/src/com/mapswithme/maps/editor/EditorFragment.java
@@ -1,48 +1,54 @@
 package com.mapswithme.maps.editor;
 
 import android.os.Bundle;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.support.design.widget.TextInputLayout;
 import android.support.v7.widget.SwitchCompat;
+import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseMwmFragment;
-import com.mapswithme.maps.bookmarks.data.Metadata;
+import com.mapswithme.maps.bookmarks.data.Metadata.MetadataType;
 import com.mapswithme.maps.editor.data.TimeFormatUtils;
 import com.mapswithme.maps.editor.data.Timetable;
-import com.mapswithme.maps.widget.CustomTextInputLayout;
 import com.mapswithme.util.InputUtils;
 import com.mapswithme.util.StringUtils;
 import com.mapswithme.util.UiUtils;
 
 public class EditorFragment extends BaseMwmFragment implements View.OnClickListener
 {
-  private View mNameBlock;
-  private View mAddressBlock;
-  private View mMetadataBlock;
-  private EditText mEtName;
-  private TextView mTvLocalizedNames;
-  private TextView mTvStreet;
-  private EditText mEtHouseNumber;
-  private CustomTextInputLayout mInputHouseNumber;
-  private View mPhoneBlock;
-  private EditText mEtPhone;
-  private View mWebBlock;
-  private EditText mEtWebsite;
-  private View mEmailBlock;
-  private EditText mEtEmail;
-  private View mCuisineBlock;
-  private TextView mTvCuisine;
-  private View mWifiBlock;
-  private SwitchCompat mSwWifi;
-  private View mOpeningHoursBlock;
+  private TextView mCategory;
+  private View mCardName;
+  private View mCardAddress;
+  private View mCardMetadata;
+  private EditText mName;
+  private TextView mLocalizedNames;
+  private TextView mStreet;
+  private EditText mHouseNumber;
+  private EditText mZipcode;
+  private View mBlockLevels;
+  private EditText mBuildingLevels;
+  private TextInputLayout mInputHouseNumber;
+  private EditText mPhone;
+  private EditText mWebsite;
+  private EditText mEmail;
+  private TextView mCuisine;
+  private EditText mOperator;
+  private SwitchCompat mWifi;
   private View mEmptyOpeningHours;
   private TextView mOpeningHours;
   private View mEditOpeningHours;
+  private EditText mDescription;
+  private final SparseArray<View> mMetaBlocks = new SparseArray<>(7);
 
   protected EditorHostFragment mParent;
 
@@ -62,12 +68,13 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
     initViews(view);
 
+    mCategory.setText(Editor.nativeGetCategory());
     // TODO(yunikkk): Add multilanguages support.
-    UiUtils.hide(mTvLocalizedNames);
-    mEtName.setText(Editor.nativeGetDefaultName());
-    mTvStreet.setText(Editor.nativeGetStreet());
-    mEtHouseNumber.setText(Editor.nativeGetHouseNumber());
-    mEtHouseNumber.addTextChangedListener(new StringUtils.SimpleTextWatcher()
+    UiUtils.hide(mLocalizedNames);
+    mName.setText(Editor.nativeGetDefaultName());
+    mStreet.setText(Editor.nativeGetStreet());
+    mHouseNumber.setText(Editor.nativeGetHouseNumber());
+    mHouseNumber.addTextChangedListener(new StringUtils.SimpleTextWatcher()
     {
       @Override
       public void onTextChanged(CharSequence s, int start, int before, int count)
@@ -83,13 +90,15 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
         mInputHouseNumber.setError(null);
       }
     });
-    mEtPhone.setText(Editor.getMetadata(Metadata.MetadataType.FMD_PHONE_NUMBER));
-    mEtWebsite.setText(Editor.getMetadata(Metadata.MetadataType.FMD_WEBSITE));
-    mEtEmail.setText(Editor.getMetadata(Metadata.MetadataType.FMD_EMAIL));
-    mTvCuisine.setText(Editor.nativeGetFormattedCuisine());
-    mSwWifi.setChecked(Editor.nativeHasWifi());
+    mZipcode.setText(Editor.nativeGetZipCode());
+    mBuildingLevels.setText(Editor.nativeGetBuildingLevels());
+    mPhone.setText(Editor.nativeGetPhone());
+    mWebsite.setText(Editor.nativeGetWebsite());
+    mEmail.setText(Editor.nativeGetEmail());
+    mCuisine.setText(Editor.nativeGetFormattedCuisine());
+    mOperator.setText(Editor.nativeGetOperator());
+    mWifi.setChecked(Editor.nativeHasWifi());
     refreshOpeningTime();
-
     refreshEditableFields();
   }
 
@@ -105,121 +114,68 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     if (!validateFields())
       return false;
 
-    Editor.setMetadata(Metadata.MetadataType.FMD_PHONE_NUMBER, getPhone());
-    Editor.setMetadata(Metadata.MetadataType.FMD_WEBSITE, getWebsite());
-    Editor.setMetadata(Metadata.MetadataType.FMD_EMAIL, getEmail());
-    Editor.setMetadata(Metadata.MetadataType.FMD_INTERNET, getWifi());
-    Editor.nativeSetDefaultName(getName());
-    Editor.nativeSetHouseNumber(getHouseNumber());
+    Editor.nativeSetDefaultName(mName.getText().toString());
+    Editor.nativeSetHouseNumber(mHouseNumber.getText().toString());
+    Editor.nativeSetZipCode(mZipcode.getText().toString());
+    Editor.nativeSetBuildingLevels(mBuildingLevels.getText().toString());
+    Editor.nativeSetPhone(mPhone.getText().toString());
+    Editor.nativeSetWebsite(mWebsite.getText().toString());
+    Editor.nativeSetEmail(mEmail.getText().toString());
+    Editor.nativeSetHasWifi(mWifi.isChecked());
 
     return true;
   }
 
+  @NonNull
+  protected String getDescription()
+  {
+    return mDescription.getText().toString().trim();
+  }
+
   private boolean validateFields()
   {
-    if (!Editor.nativeIsHouseValid(getHouseNumber()))
+    if (!Editor.nativeIsHouseValid(mHouseNumber.getText().toString()))
     {
-      mEtHouseNumber.requestFocus();
-      InputUtils.showKeyboard(mEtHouseNumber);
+      mHouseNumber.requestFocus();
+      InputUtils.showKeyboard(mHouseNumber);
       return false;
     }
 
     return true;
   }
 
-  public String getName()
-  {
-    // TODO add localized names
-    return mEtName.getText().toString();
-  }
-
-  public String getStreet()
-  {
-    return mTvStreet.getText().toString();
-  }
-
-  public String getHouseNumber()
-  {
-    return mEtHouseNumber.getText().toString();
-  }
-
-  public String getPhone()
-  {
-    return mEtPhone.getText().toString();
-  }
-
-  public String getWebsite()
-  {
-    return mEtWebsite.getText().toString();
-  }
-
-  public String getEmail()
-  {
-    return mEtEmail.getText().toString();
-  }
-
-  public String getCuisine()
-  {
-    return mTvCuisine.getText().toString();
-  }
-
-  public String getWifi()
-  {
-    return mSwWifi.isChecked() ? "wlan" : "";
-  }
-
   private void refreshEditableFields()
   {
-    UiUtils.showIf(Editor.nativeIsNameEditable(), mNameBlock);
-    UiUtils.showIf(Editor.nativeIsAddressEditable(), mAddressBlock);
+    UiUtils.showIf(Editor.nativeIsNameEditable(), mCardName);
+    UiUtils.showIf(Editor.nativeIsAddressEditable(), mCardAddress);
+    UiUtils.showIf(Editor.nativeIsBuilding(), mBlockLevels);
 
     final int[] editableMeta = Editor.nativeGetEditableFields();
     if (editableMeta.length == 0)
     {
-      UiUtils.hide(mMetadataBlock);
+      UiUtils.hide(mCardMetadata);
       return;
     }
 
-    UiUtils.show(mMetadataBlock);
-    UiUtils.hide(mOpeningHoursBlock, mPhoneBlock, mWebBlock, mEmailBlock, mCuisineBlock, mWifiBlock);
+    for (int i = 0; i < mMetaBlocks.size(); i++)
+      UiUtils.hide(mMetaBlocks.valueAt(i));
+
     boolean anyEditableMeta = false;
     for (int type : editableMeta)
     {
-      switch (Metadata.MetadataType.fromInt(type))
-      {
-      case FMD_OPEN_HOURS:
-        anyEditableMeta = true;
-        UiUtils.show(mOpeningHoursBlock);
-        break;
-      case FMD_PHONE_NUMBER:
-        anyEditableMeta = true;
-        UiUtils.show(mPhoneBlock);
-        break;
-      case FMD_WEBSITE:
-        anyEditableMeta = true;
-        UiUtils.show(mWebBlock);
-        break;
-      case FMD_EMAIL:
-        anyEditableMeta = true;
-        UiUtils.show(mEmailBlock);
-        break;
-      case FMD_CUISINE:
-        anyEditableMeta = true;
-        UiUtils.show(mCuisineBlock);
-        break;
-      case FMD_INTERNET:
-        anyEditableMeta = true;
-        UiUtils.show(mWifiBlock);
-        break;
-      }
+      final View metaBlock = mMetaBlocks.get(type);
+      if (metaBlock == null)
+        continue;
+
+      anyEditableMeta = true;
+      UiUtils.show(metaBlock);
     }
-    if (!anyEditableMeta)
-      UiUtils.hide(mMetadataBlock);
+    UiUtils.showIf(anyEditableMeta, mCardMetadata);
   }
 
   private void refreshOpeningTime()
   {
-    final Timetable[] timetables = OpeningHours.nativeTimetablesFromString(Editor.getMetadata(Metadata.MetadataType.FMD_OPEN_HOURS));
+    final Timetable[] timetables = OpeningHours.nativeTimetablesFromString(Editor.nativeGetOpeningHours());
     if (timetables == null)
     {
       UiUtils.show(mEmptyOpeningHours);
@@ -235,39 +191,71 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
   private void initViews(View view)
   {
-    mNameBlock = view.findViewById(R.id.cv__name);
-    mAddressBlock = view.findViewById(R.id.cv__address);
-    mMetadataBlock = view.findViewById(R.id.cv__metadata);
-    mEtName = findInput(view.findViewById(R.id.name));
-    mTvLocalizedNames = (TextView) view.findViewById(R.id.name_multilang);
+    final View categoryBlock = view.findViewById(R.id.category);
+    categoryBlock.setOnClickListener(this);
+    // TODO show icon and fill it when core will implement that
+    UiUtils.hide(categoryBlock.findViewById(R.id.icon));
+    mCategory = (TextView) categoryBlock.findViewById(R.id.name);
+    mCardName = view.findViewById(R.id.cv__name);
+    mCardAddress = view.findViewById(R.id.cv__address);
+    mCardMetadata = view.findViewById(R.id.cv__metadata);
+    mName = findInput(mCardName);
+    mLocalizedNames = (TextView) view.findViewById(R.id.name_multilang);
+    // Address
     view.findViewById(R.id.block_street).setOnClickListener(this);
-    mTvStreet = (TextView) view.findViewById(R.id.street);
-    mEtHouseNumber = findInput(view.findViewById(R.id.building));
-    mInputHouseNumber = (CustomTextInputLayout) view.findViewById(R.id.building).findViewById(R.id.custom_input);
-    mPhoneBlock = view.findViewById(R.id.block_phone);
-    mEtPhone = findInput(mPhoneBlock);
-    mWebBlock = view.findViewById(R.id.block_website);
-    mEtWebsite = findInput(mWebBlock);
-    mEmailBlock = view.findViewById(R.id.block_email);
-    mEtEmail = findInput(mEmailBlock);
-    mCuisineBlock = view.findViewById(R.id.block_cuisine);
-    mCuisineBlock.setOnClickListener(this);
-    mTvCuisine = (TextView) view.findViewById(R.id.cuisine);
-    mWifiBlock = view.findViewById(R.id.block_wifi);
-    mSwWifi = (SwitchCompat) view.findViewById(R.id.sw__wifi);
-    mWifiBlock.setOnClickListener(this);
-    mOpeningHoursBlock = view.findViewById(R.id.block_opening_hours);
-    mEditOpeningHours = mOpeningHoursBlock.findViewById(R.id.edit_opening_hours);
+    mStreet = (TextView) view.findViewById(R.id.street);
+    View blockHouseNumber = view.findViewById(R.id.block_building);
+    mHouseNumber = findInputAndInitBlock(blockHouseNumber, 0, R.string.house_number);
+    mInputHouseNumber = (TextInputLayout) blockHouseNumber.findViewById(R.id.custom_input);
+    View blockZipcode = view.findViewById(R.id.block_zipcode);
+    mZipcode = findInputAndInitBlock(blockZipcode, 0, R.string.editor_zip_code);
+    mBlockLevels = view.findViewById(R.id.block_levels);
+    // TODO set levels limit (25 or more, get it from the core)
+    mBuildingLevels = findInputAndInitBlock(mBlockLevels, 0, R.string.editor_storey_number);
+    // Details
+    View blockPhone = view.findViewById(R.id.block_phone);
+    mPhone = findInputAndInitBlock(blockPhone, R.drawable.ic_phone, R.string.phone);
+    View blockWeb = view.findViewById(R.id.block_website);
+    mWebsite = findInputAndInitBlock(blockWeb, R.drawable.ic_website, R.string.website);
+    View blockEmail = view.findViewById(R.id.block_email);
+    mEmail = findInputAndInitBlock(blockEmail, R.drawable.ic_email, R.string.email);
+    View blockCuisine = view.findViewById(R.id.block_cuisine);
+    blockCuisine.setOnClickListener(this);
+    mCuisine = (TextView) view.findViewById(R.id.cuisine);
+    View blockOperator = view.findViewById(R.id.block_operator);
+    mOperator = findInputAndInitBlock(blockOperator, R.drawable.ic_operator, R.string.editor_operator);
+    View blockWifi = view.findViewById(R.id.block_wifi);
+    mWifi = (SwitchCompat) view.findViewById(R.id.sw__wifi);
+    blockWifi.setOnClickListener(this);
+    View blockOpeningHours = view.findViewById(R.id.block_opening_hours);
+    mEditOpeningHours = blockOpeningHours.findViewById(R.id.edit_opening_hours);
     mEditOpeningHours.setOnClickListener(this);
-    mEmptyOpeningHours = mOpeningHoursBlock.findViewById(R.id.empty_opening_hours);
+    mEmptyOpeningHours = blockOpeningHours.findViewById(R.id.empty_opening_hours);
     mEmptyOpeningHours.setOnClickListener(this);
-    mOpeningHours = (TextView) mOpeningHoursBlock.findViewById(R.id.opening_hours);
+    mOpeningHours = (TextView) blockOpeningHours.findViewById(R.id.opening_hours);
     mOpeningHours.setOnClickListener(this);
+    mDescription = findInput(view.findViewById(R.id.cv__more));
+
+    mMetaBlocks.append(MetadataType.FMD_OPEN_HOURS.toInt(), blockOpeningHours);
+    mMetaBlocks.append(MetadataType.FMD_PHONE_NUMBER.toInt(), blockPhone);
+    mMetaBlocks.append(MetadataType.FMD_WEBSITE.toInt(), blockWeb);
+    mMetaBlocks.append(MetadataType.FMD_EMAIL.toInt(), blockEmail);
+    mMetaBlocks.append(MetadataType.FMD_CUISINE.toInt(), blockCuisine);
+    mMetaBlocks.append(MetadataType.FMD_OPERATOR.toInt(), blockOperator);
+    mMetaBlocks.append(MetadataType.FMD_INTERNET.toInt(), blockWifi);
   }
 
-  private EditText findInput(View view)
+  private EditText findInput(View blockWithInput)
   {
-    return (EditText) view.findViewById(R.id.input);
+    return (EditText) blockWithInput.findViewById(R.id.input);
+  }
+
+  private EditText findInputAndInitBlock(View blockWithInput, @DrawableRes int icon, @StringRes int hint)
+  {
+    ((ImageView) blockWithInput.findViewById(R.id.icon)).setImageResource(icon);
+    final TextInputLayout input = (TextInputLayout) blockWithInput.findViewById(R.id.custom_input);
+    input.setHint(getString(hint));
+    return (EditText) input.findViewById(R.id.input);
   }
 
   @Override
@@ -281,7 +269,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
       mParent.editTimetable();
       break;
     case R.id.block_wifi:
-      mSwWifi.toggle();
+      mWifi.toggle();
       break;
     case R.id.block_street:
       mParent.editStreet();
@@ -289,6 +277,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     case R.id.block_cuisine:
       mParent.editCuisine();
       break;
+    case R.id.category:
+      mParent.editCategory();
     }
   }
 }
diff --git a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java
index 84b8dd2fb5..58b3cbb6fb 100644
--- a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java
+++ b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java
@@ -16,7 +16,6 @@ import com.mapswithme.maps.MwmActivity;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseMwmToolbarFragment;
 import com.mapswithme.maps.base.OnBackPressListener;
-import com.mapswithme.maps.bookmarks.data.Metadata;
 import com.mapswithme.maps.widget.SearchToolbarController;
 import com.mapswithme.maps.widget.ToolbarController;
 import com.mapswithme.util.ConnectionState;
@@ -121,7 +120,7 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
     mMode = Mode.OPENING_HOURS;
     mToolbarController.setTitle(R.string.editor_time_title);
     final Bundle args = new Bundle();
-    args.putString(TimetableFragment.EXTRA_TIME, Editor.getMetadata(Metadata.MetadataType.FMD_OPEN_HOURS));
+    args.putString(TimetableFragment.EXTRA_TIME, Editor.nativeGetOpeningHours());
     final Fragment editorFragment = Fragment.instantiate(getActivity(), TimetableFragment.class.getName(), args);
     getChildFragmentManager().beginTransaction()
                              .replace(R.id.fragment_container, editorFragment, TimetableFragment.class.getName())
@@ -155,6 +154,16 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
                              .commit();
   }
 
+  protected void editCategory()
+  {
+    if (!mIsNewObject)
+      return;
+
+    final Activity host = getActivity();
+    host.finish();
+    startActivity(new Intent(host, FeatureCategoryActivity.class));
+  }
+
   private boolean setEdits()
   {
     return ((EditorFragment) getChildFragmentManager().findFragmentByTag(EditorFragment.class.getName())).setEdits();
@@ -171,11 +180,12 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
         final String timetables = ((TimetableFragment) getChildFragmentManager().findFragmentByTag(TimetableFragment.class.getName())).getTimetable();
         if (OpeningHours.nativeIsTimetableStringValid(timetables))
         {
-          Editor.setMetadata(Metadata.MetadataType.FMD_OPEN_HOURS, timetables);
+          Editor.nativeSetOpeningHours(timetables);
           editMapObject();
         }
         else
         {
+          // TODO (yunikkk) correct translation
           showMistakeDialog(R.string.editor_correct_mistake);
         }
         break;
@@ -191,6 +201,11 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
         if (!setEdits())
           return;
 
+        // Save note
+        final String note = ((EditorFragment) getChildFragmentManager().findFragmentByTag(EditorFragment.class.getName())).getDescription();
+        if (note.length() != 0)
+          Editor.nativeCreateNote(note);
+        // Save object edits
         if (Editor.nativeSaveEditedFeature())
         {
           Statistics.INSTANCE.trackEditorSuccess(mIsNewObject);
diff --git a/android/src/com/mapswithme/maps/editor/ReportActivity.java b/android/src/com/mapswithme/maps/editor/ReportActivity.java
index ba38f2e5a8..11fbced37c 100644
--- a/android/src/com/mapswithme/maps/editor/ReportActivity.java
+++ b/android/src/com/mapswithme/maps/editor/ReportActivity.java
@@ -1,12 +1,8 @@
 package com.mapswithme.maps.editor;
 
-import android.app.Activity;
-import android.content.Intent;
-import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 
 import com.mapswithme.maps.base.BaseMwmFragmentActivity;
-import com.mapswithme.maps.bookmarks.data.MapObject;
 
 public class ReportActivity extends BaseMwmFragmentActivity
 {
@@ -15,12 +11,4 @@ public class ReportActivity extends BaseMwmFragmentActivity
   {
     return ReportFragment.class;
   }
-
-  public static void start(@NonNull Activity activity, MapObject point)
-  {
-    final Intent intent = new Intent(activity, ReportActivity.class)
-                              .putExtra(ReportFragment.EXTRA_LAT, point.getLat())
-                              .putExtra(ReportFragment.EXTRA_LON, point.getLon());
-    activity.startActivity(intent);
-  }
 }
diff --git a/android/src/com/mapswithme/maps/editor/ReportFragment.java b/android/src/com/mapswithme/maps/editor/ReportFragment.java
index 571e6de454..d392cc4f0e 100644
--- a/android/src/com/mapswithme/maps/editor/ReportFragment.java
+++ b/android/src/com/mapswithme/maps/editor/ReportFragment.java
@@ -15,9 +15,6 @@ import com.mapswithme.util.UiUtils;
 
 public class ReportFragment extends BaseMwmToolbarFragment implements View.OnClickListener
 {
-  public static final String EXTRA_LAT = "lat";
-  public static final String EXTRA_LON = "lon";
-
   private View mSimpleProblems;
   private View mAdvancedProblem;
   private View mSave;
@@ -27,9 +24,6 @@ public class ReportFragment extends BaseMwmToolbarFragment implements View.OnCli
   @IntRange(from = 0, to = 3)
   private int mSelectedProblem;
 
-  private double mLat;
-  private double mLon;
-
   @Nullable
   @Override
   public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
@@ -43,10 +37,6 @@ public class ReportFragment extends BaseMwmToolbarFragment implements View.OnCli
     super.onViewCreated(view, savedInstanceState);
     mToolbarController.setTitle(R.string.editor_report_problem_title);
 
-    Bundle args = getArguments();
-    mLat = args.getDouble(EXTRA_LAT);
-    mLon = args.getDouble(EXTRA_LON);
-
     mSave = mToolbarController.findViewById(R.id.save);
     mSave.setOnClickListener(this);
     mSimpleProblems = view.findViewById(R.id.ll__problems);
@@ -67,13 +57,13 @@ public class ReportFragment extends BaseMwmToolbarFragment implements View.OnCli
 
   private void send(String text)
   {
-    Editor.nativeCreateNote(mLat, mLon, text);
+    Editor.nativeCreateNote(text);
     mToolbarController.onUpClick();
   }
 
   private void sendNotExist()
   {
-    Editor.nativePlaceDoesNotExist(mLat, mLon);
+    Editor.nativePlaceDoesNotExist();
     mToolbarController.onUpClick();
   }
 
diff --git a/android/src/com/mapswithme/maps/widget/CustomTextInputLayout.java b/android/src/com/mapswithme/maps/widget/CustomTextInputLayout.java
index 611bbdfb74..59ba1631df 100644
--- a/android/src/com/mapswithme/maps/widget/CustomTextInputLayout.java
+++ b/android/src/com/mapswithme/maps/widget/CustomTextInputLayout.java
@@ -47,7 +47,7 @@ public class CustomTextInputLayout extends TextInputLayout
       // We have to reset the previous hint so that equals check pass
       setHint(null);
 
-      // In case that hint is changed programatically
+      // In case that hint is changed programmatically
       CharSequence currentEditTextHint = getEditText().getHint();
       if (currentEditTextHint != null && currentEditTextHint.length() > 0)
         mHint = currentEditTextHint;
@@ -55,5 +55,4 @@ public class CustomTextInputLayout extends TextInputLayout
       mIsHintSet = true;
     }
   }
-
 }
\ No newline at end of file
diff --git a/iphone/Maps/ar.lproj/Localizable.strings b/iphone/Maps/ar.lproj/Localizable.strings
index b17c6ba1ab..baf7c88fce 100644
--- a/iphone/Maps/ar.lproj/Localizable.strings
+++ b/iphone/Maps/ar.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "أدخل رقم منزل صحيح";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/cs.lproj/Localizable.strings b/iphone/Maps/cs.lproj/Localizable.strings
index 9df5aef623..e5e4af117f 100644
--- a/iphone/Maps/cs.lproj/Localizable.strings
+++ b/iphone/Maps/cs.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Zadejte správné číslo domu";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/da.lproj/Localizable.strings b/iphone/Maps/da.lproj/Localizable.strings
index d9f4e25788..de1a3cfb53 100644
--- a/iphone/Maps/da.lproj/Localizable.strings
+++ b/iphone/Maps/da.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Skriv det rigtige husnummer";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings
index e33287160c..d0262aae45 100644
--- a/iphone/Maps/de.lproj/Localizable.strings
+++ b/iphone/Maps/de.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Richtige Hausnummer eingeben";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "Postleitzahl";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings
index 275180c02b..026985d946 100644
--- a/iphone/Maps/en.lproj/Localizable.strings
+++ b/iphone/Maps/en.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Enter correct house number";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/es.lproj/Localizable.strings b/iphone/Maps/es.lproj/Localizable.strings
index 5a1110fb3c..64b5a62c3d 100644
--- a/iphone/Maps/es.lproj/Localizable.strings
+++ b/iphone/Maps/es.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Introducir el número de domicilio correcto";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/fi.lproj/Localizable.strings b/iphone/Maps/fi.lproj/Localizable.strings
index 96aa0e1970..1dad21013a 100644
--- a/iphone/Maps/fi.lproj/Localizable.strings
+++ b/iphone/Maps/fi.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Syötä oikea talon numero";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/fr.lproj/Localizable.strings b/iphone/Maps/fr.lproj/Localizable.strings
index 9b5e6d2adb..b2efac61a7 100644
--- a/iphone/Maps/fr.lproj/Localizable.strings
+++ b/iphone/Maps/fr.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Saisir un numéro de maison correct";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/hu.lproj/Localizable.strings b/iphone/Maps/hu.lproj/Localizable.strings
index d622f3e304..4c505ad688 100644
--- a/iphone/Maps/hu.lproj/Localizable.strings
+++ b/iphone/Maps/hu.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Helyes házszámot adjon meg";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/id.lproj/Localizable.strings b/iphone/Maps/id.lproj/Localizable.strings
index c833e12b1f..0452852b52 100644
--- a/iphone/Maps/id.lproj/Localizable.strings
+++ b/iphone/Maps/id.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Masukkan nomor rumah yang benar";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/it.lproj/Localizable.strings b/iphone/Maps/it.lproj/Localizable.strings
index 8241325533..ee53f9e59b 100644
--- a/iphone/Maps/it.lproj/Localizable.strings
+++ b/iphone/Maps/it.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Inserisci numero civico corretto";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings
index e8d0bb4576..b47255e841 100644
--- a/iphone/Maps/ja.lproj/Localizable.strings
+++ b/iphone/Maps/ja.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "正しい番地を入力してください";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/ko.lproj/Localizable.strings b/iphone/Maps/ko.lproj/Localizable.strings
index a661a89835..489439414a 100644
--- a/iphone/Maps/ko.lproj/Localizable.strings
+++ b/iphone/Maps/ko.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "올바른 집 번호 입력";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/nb.lproj/Localizable.strings b/iphone/Maps/nb.lproj/Localizable.strings
index 36302dcd79..d51215f61f 100644
--- a/iphone/Maps/nb.lproj/Localizable.strings
+++ b/iphone/Maps/nb.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Skriv riktig husnummer";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/nl.lproj/Localizable.strings b/iphone/Maps/nl.lproj/Localizable.strings
index 3e118b6ff5..17a605bb1c 100644
--- a/iphone/Maps/nl.lproj/Localizable.strings
+++ b/iphone/Maps/nl.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Een juist huisnummer invoeren";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/pl.lproj/Localizable.strings b/iphone/Maps/pl.lproj/Localizable.strings
index 1f36497869..f6885bb632 100644
--- a/iphone/Maps/pl.lproj/Localizable.strings
+++ b/iphone/Maps/pl.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Wprowadź poprawny numer domu";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/pt.lproj/Localizable.strings b/iphone/Maps/pt.lproj/Localizable.strings
index fd196498c9..f884a3025b 100644
--- a/iphone/Maps/pt.lproj/Localizable.strings
+++ b/iphone/Maps/pt.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Introduzir um número de casa correto";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/ro.lproj/Localizable.strings b/iphone/Maps/ro.lproj/Localizable.strings
index 2613ccd0ec..a70e5c83ac 100644
--- a/iphone/Maps/ro.lproj/Localizable.strings
+++ b/iphone/Maps/ro.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Introduceți numărul corect al casei";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings
index 61a00b3406..83f3181ecf 100644
--- a/iphone/Maps/ru.lproj/Localizable.strings
+++ b/iphone/Maps/ru.lproj/Localizable.strings
@@ -1373,9 +1373,9 @@
 
 "error_enter_correct_house_number" = "Введите корректный номер дома";
 
-"editor_storey_number" = "Количество этажей (максимум %1$@)";
+"editor_storey_number" = "Количество этажей (максимум %d)";
 
-"error_enter_correct_storey_number" = "Редактируйте здания высотой максимум %1$@ этажей.";
+"error_enter_correct_storey_number" = "Редактируйте здания высотой максимум %d этажей.";
 
 "editor_zip_code" = "Почтовый индекс";
 
@@ -1384,3 +1384,11 @@
 "editor_operator" = "Владелец";
 
 "placepage_unknown_place" = "Неизвестное место";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/sk.lproj/Localizable.strings b/iphone/Maps/sk.lproj/Localizable.strings
index b9314f7e86..c32033896b 100644
--- a/iphone/Maps/sk.lproj/Localizable.strings
+++ b/iphone/Maps/sk.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Zadajte správne číslo domu";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/sv.lproj/Localizable.strings b/iphone/Maps/sv.lproj/Localizable.strings
index b7049c0885..197cf8c1cd 100644
--- a/iphone/Maps/sv.lproj/Localizable.strings
+++ b/iphone/Maps/sv.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Ange korrekt husnummer";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/th.lproj/Localizable.strings b/iphone/Maps/th.lproj/Localizable.strings
index bc37343329..e222d62b09 100644
--- a/iphone/Maps/th.lproj/Localizable.strings
+++ b/iphone/Maps/th.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "กรอกบ้านเลขที่ให้ถูกต้อง";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/tr.lproj/Localizable.strings b/iphone/Maps/tr.lproj/Localizable.strings
index 4b7b4bb523..1768ef6e1c 100644
--- a/iphone/Maps/tr.lproj/Localizable.strings
+++ b/iphone/Maps/tr.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Doğru ev numarası girin";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/uk.lproj/Localizable.strings b/iphone/Maps/uk.lproj/Localizable.strings
index 92b51cf722..3bd97267f8 100644
--- a/iphone/Maps/uk.lproj/Localizable.strings
+++ b/iphone/Maps/uk.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Введіть правильний номер будинку";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/vi.lproj/Localizable.strings b/iphone/Maps/vi.lproj/Localizable.strings
index afce6d13f9..9e2ae349d7 100644
--- a/iphone/Maps/vi.lproj/Localizable.strings
+++ b/iphone/Maps/vi.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "Nhập số nhà chính xác";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/zh-Hans.lproj/Localizable.strings b/iphone/Maps/zh-Hans.lproj/Localizable.strings
index 75fcdc98bb..e3d69a4458 100644
--- a/iphone/Maps/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hans.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "输入正确的房屋号";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/iphone/Maps/zh-Hant.lproj/Localizable.strings b/iphone/Maps/zh-Hant.lproj/Localizable.strings
index 6b1d0275f7..5a5f8dfdf9 100644
--- a/iphone/Maps/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hant.lproj/Localizable.strings
@@ -1373,7 +1373,9 @@
 
 "error_enter_correct_house_number" = "輸入正確的門牌號碼";
 
+"editor_storey_number" = "Storey number (maximum %d)";
 
+"error_enter_correct_storey_number" = "Maximum building levels number is limited to %d.";
 
 "editor_zip_code" = "ZIP Code";
 
@@ -1382,3 +1384,11 @@
 "editor_operator" = "Operator";
 
 "placepage_unknown_place" = "Unknown Place";
+
+"editor_other_info" = "Other information about place";
+
+"editor_detailed_description_hint" = "Detailed description";
+
+"editor_detailed_description" = "Suggested changes will be send to OpenStreetMap...";
+
+"editor_more_about_osm" = "More about OpenStreetMap";
diff --git a/strings.txt b/strings.txt
index b16df2bbe2..2f351cbf18 100644
--- a/strings.txt
+++ b/strings.txt
@@ -4874,7 +4874,7 @@
     en = Data version: %d
     ru = Версия данных: %d
     de = Datenversion: %d
-	zh-Hant = 資料版本： %d
+    zh-Hant = 資料版本： %d
 
   [are_you_sure]
     tags = android,tizen
@@ -16217,11 +16217,13 @@
 
   [editor_storey_number]
     tags = ios, android
-    ru = Количество этажей (максимум %1$@)
+    en = Storey number (maximum %d)
+    ru = Количество этажей (максимум %d)
 
   [error_enter_correct_storey_number]
     tags = ios, android
-    ru = Редактируйте здания высотой максимум %1$@ этажей.
+    en = Maximum building levels number is limited to %d.
+    ru = Редактируйте здания высотой максимум %d этажей.
   
   [editor_zip_code]
     tags = ios, android
@@ -16244,3 +16246,19 @@
     tags = ios, android
     en = Unknown Place
     ru = Неизвестное место
+
+  [editor_other_info]
+    tags = ios, android
+    en = Other information about place
+
+  [editor_detailed_description_hint]
+    tags = ios, android
+    en = Detailed description
+
+  [editor_detailed_description]
+    tags = ios, android
+    en = Suggested changes will be send to OpenStreetMap...
+
+  [editor_more_about_osm]
+    tags = ios, android
+    en = More about OpenStreetMap