diff --git a/app/src/main/java/de/mlte/soundboard/EditActivity.kt b/app/src/main/java/de/mlte/soundboard/EditActivity.kt
index 6f787a8..6de6c4f 100644
--- a/app/src/main/java/de/mlte/soundboard/EditActivity.kt
+++ b/app/src/main/java/de/mlte/soundboard/EditActivity.kt
@@ -47,6 +47,15 @@ class EditActivity : AppCompatActivity() {
 
             startActivityForResult(intent, 123)
         }
+
+        val deleteButton = findViewById<Button>(R.id.deleteButton)
+        deleteButton.setOnClickListener {
+            val data = Intent()
+            data.putExtra("index", intent.getIntExtra("index", -1))
+            data.putExtra("delete", true)
+            setResult(Activity.RESULT_OK, data)
+            finish()
+        }
     }
 
     var currentUri: Uri? = null
diff --git a/app/src/main/java/de/mlte/soundboard/MainActivity.kt b/app/src/main/java/de/mlte/soundboard/MainActivity.kt
index efab6c0..3190a19 100644
--- a/app/src/main/java/de/mlte/soundboard/MainActivity.kt
+++ b/app/src/main/java/de/mlte/soundboard/MainActivity.kt
@@ -127,7 +127,7 @@ class MainActivity : AppCompatActivity() {
 
         val preferences = getPreferences(Context.MODE_PRIVATE)
         val numButtons = preferences.getInt("numButtons", 0)
-        for (index in 0..numButtons-1) {
+        for (index in 0..numButtons - 1) {
             val soundButton = SoundButton(this)
             addButton(soundButton)
             val caption = preferences.getString("caption" + index, "")
@@ -142,12 +142,19 @@ class MainActivity : AppCompatActivity() {
             val index = data.getIntExtra("index", -1)
             if (index > -1 && index < buttons.size) {
                 val btn = buttons[index].btn
-                val caption = data.getStringExtra("caption")
-                if (caption != null) {
-                    btn.setText(caption)
+                if (data.getBooleanExtra("delete", false)) {
+                    buttons.removeAt(index)
+                    val parent = findViewById<GridLayout>(R.id.grid_layout)
+                    parent.removeView(btn)
+                    organizeButtons()
+                } else {
+                    val caption = data.getStringExtra("caption")
+                    if (caption != null) {
+                        btn.setText(caption)
+                    }
+                    val uri = data.getParcelableExtra<Uri>("uri")
+                    savePreferences(caption, uri, index)
                 }
-                val uri = data.getParcelableExtra<Uri>("uri")
-                savePreferences(caption, uri, index)
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml
index 1f06649..8071275 100644
--- a/app/src/main/res/layout/activity_edit.xml
+++ b/app/src/main/res/layout/activity_edit.xml
@@ -1,76 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:paddingTop="16dp"
     tools:context="de.mlte.soundboard.EditActivity">
 
-    <Button
-        android:id="@+id/okButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="0dp"
-        android:layout_marginEnd="0dp"
-        android:layout_marginStart="0dp"
-        android:layout_marginTop="0dp"
-        android:text="OK"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/captionEditText"
-        tools:layout_editor_absoluteX="116dp"
-        tools:layout_editor_absoluteY="231dp" />
-
     <EditText
         android:id="@+id/captionEditText"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="0dp"
-        android:layout_marginEnd="0dp"
-        android:layout_marginStart="0dp"
-        android:layout_marginTop="0dp"
-        android:ems="10"
         android:inputType="textPersonName"
-        android:text="Name"
-        app:layout_constraintBottom_toTopOf="@+id/okButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/selectButton"
-        tools:layout_editor_absoluteX="76dp"
-        tools:layout_editor_absoluteY="121dp" />
+        android:hint="Name" />
 
     <Button
         android:id="@+id/selectButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="0dp"
-        android:layout_marginEnd="0dp"
-        android:layout_marginStart="0dp"
-        android:layout_marginTop="0dp"
-        android:text="Select File ..."
-        app:layout_constraintBottom_toTopOf="@+id/captionEditText"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.5"
-        tools:layout_editor_absoluteX="94dp"
-        tools:layout_editor_absoluteY="42dp" />
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/captionEditText"
+        android:text="Select File ..." />
 
     <TextView
         android:id="@+id/fileTextView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/selectButton"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/captionEditText"
+        android:layout_toLeftOf="@id/selectButton" />
+
+    <Button
+        android:id="@+id/okButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="0dp"
-        android:layout_marginEnd="0dp"
-        android:layout_marginStart="0dp"
-        android:layout_marginTop="0dp"
-        android:text="TextView"
-        app:layout_constraintBottom_toTopOf="@+id/selectButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="1.0"
-        tools:layout_editor_absoluteX="148dp"
-        tools:layout_editor_absoluteY="30dp" />
-</android.support.constraint.ConstraintLayout>
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/selectButton"
+        android:layout_marginTop="48dp"
+        android:text="OK" />
+
+    <Button
+        android:id="@+id/deleteButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/okButton"
+        android:layout_alignParentStart="false"
+        android:layout_marginRight="8dp"
+        android:layout_toLeftOf="@+id/okButton"
+        android:backgroundTint="@android:color/holo_red_dark"
+        android:text="Delete"
+        android:textColor="@android:color/white" />
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/layout_button.xml b/app/src/main/res/layout/layout_button.xml
index b5fece5..8b0319e 100644
--- a/app/src/main/res/layout/layout_button.xml
+++ b/app/src/main/res/layout/layout_button.xml
@@ -17,7 +17,6 @@
         android:layout_height="match_parent"
         android:gravity="center"
         android:padding="6dp"
-        android:text="Enter"
         android:textColor="@android:color/white"
         android:textSize="16sp"
         android:textStyle="bold" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3ab3e9c..4d44345 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,5 +2,5 @@
 <resources>
     <color name="colorPrimary">#3F51B5</color>
     <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorAccent">#ff4081</color>
 </resources>