diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2a73a49..ae3a9fb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".ui.activities.StatisticsActivity"/>
+        <activity android:name=".ui.activities.BoundaryEditorActivity"></activity>
+        <activity android:name=".ui.activities.StatisticsActivity" />
         <activity android:name=".ui.activities.CollarDetailActivity" />
         <activity android:name=".ui.activities.CollarListActivity" />
         <activity android:name=".ui.activities.MainActivity">
diff --git a/app/src/main/res/layout/activity_boundary_editor.xml b/app/src/main/res/layout/activity_boundary_editor.xml
new file mode 100644
index 0000000..e13d12f
--- /dev/null
+++ b/app/src/main/res/layout/activity_boundary_editor.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.activities.BoundaryEditorActivity">
+
+    <org.osmdroid.views.MapView
+        android:id="@+id/editorMap"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/saveButtonLayout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+    </org.osmdroid.views.MapView>
+
+    <LinearLayout
+        android:id="@+id/saveButtonLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <Button
+            android:onClick="sendBoundary"
+            android:id="@+id/saveBoundaryButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/saveBoundary" />
+
+        <Button
+            android:onClick="addMarker"
+            android:id="@+id/addVertexButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/addVertex" />
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file