diff --git a/app/src/main/java/de/mlte/soundboard/EditActivity.kt b/app/src/main/java/de/mlte/soundboard/EditActivity.kt
index e59cf46..6f787a8 100644
--- a/app/src/main/java/de/mlte/soundboard/EditActivity.kt
+++ b/app/src/main/java/de/mlte/soundboard/EditActivity.kt
@@ -29,12 +29,13 @@ class EditActivity : AppCompatActivity() {
 
         val okButton = findViewById<Button>(R.id.okButton)
         okButton.setOnClickListener {
-            val intent = Intent()
-            intent.putExtra("caption", captionEditText.text.toString())
+            val data = Intent()
+            data.putExtra("index", intent.getIntExtra("index", -1))
+            data.putExtra("caption", captionEditText.text.toString())
             if (currentUri != null) {
-                intent.putExtra("uri", currentUri)
+                data.putExtra("uri", currentUri)
             }
-            setResult(Activity.RESULT_OK, intent)
+            setResult(Activity.RESULT_OK, data)
             finish()
         }
 
diff --git a/app/src/main/java/de/mlte/soundboard/MainActivity.kt b/app/src/main/java/de/mlte/soundboard/MainActivity.kt
index 2143daa..c8fd101 100644
--- a/app/src/main/java/de/mlte/soundboard/MainActivity.kt
+++ b/app/src/main/java/de/mlte/soundboard/MainActivity.kt
@@ -1,6 +1,5 @@
 package de.mlte.soundboard
 
-import android.animation.ObjectAnimator
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
@@ -9,10 +8,7 @@ import android.net.Uri
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.LayoutInflater
-import android.view.animation.LinearInterpolator
-import android.widget.FrameLayout
 import android.widget.GridLayout
-import android.widget.ProgressBar
 import android.widget.TextView
 import java.io.BufferedInputStream
 import java.io.BufferedOutputStream
@@ -44,92 +40,101 @@ class MainActivity : AppCompatActivity() {
                 val soundButton = SoundButton(this, col, row)
                 buttons.add(soundButton)
                 parent.addView(soundButton)
+            }
+        }
 
-                soundButton.btn.setOnClickListener {
-                    if (playing) {
-                        player?.let { mp ->
-                            if (mp.isPlaying) {
-                                mp.stop()
-                            }
+        buttons.forEachIndexed { index, soundButton ->
+            soundButton.btn.setOnClickListener {
+                if (playing) {
+                    player?.let { mp ->
+                        if (mp.isPlaying) {
+                            mp.stop()
+                        }
+                        mp.reset()
+                        mp.release()
+                    }
+                    for (button in buttons) {
+                        button.objectAnimator.cancel()
+                        button.progressBar.progress = 0
+                    }
+                    playing = false
+                } else {
+                    val file = getFileStreamPath("audio" + index)
+                    if (file.exists()) {
+                        val mp = MediaPlayer.create(this, Uri.fromFile(file))
+                        mp.setOnCompletionListener {
+                            soundButton.progressBar.progress = 0
                             mp.reset()
                             mp.release()
+                            playing = false
                         }
-                        for (button in buttons) {
-                            button.objectAnimator.cancel()
-                            button.progressBar.progress = 0
-                        }
-                        playing = false
-                    } else {
-                        val file = getFileStreamPath("audio")
-                        if (file.exists()) {
-                            val mp = MediaPlayer.create(this, Uri.fromFile(file))
-                            mp.setOnCompletionListener {
-                                soundButton.progressBar.progress = 0
-                                mp.reset()
-                                mp.release()
-                                playing = false
-                            }
-                            mp.start()
-                            player = mp
-                            playing = true
+                        mp.start()
+                        player = mp
+                        playing = true
 
-                            soundButton.progressBar.progress = 0
-                            soundButton.objectAnimator.setDuration(mp.duration.toLong()).start()
-                        }
+                        soundButton.progressBar.progress = 0
+                        soundButton.objectAnimator.setDuration(mp.duration.toLong()).start()
                     }
                 }
+            }
 
-                soundButton.btn.setOnLongClickListener {
-                    val intent = Intent(baseContext, EditActivity::class.java)
-                    intent.putExtra("caption", soundButton.btn.text)
-                    startActivityForResult(intent, 1234)
+            soundButton.btn.setOnLongClickListener {
+                val intent = Intent(baseContext, EditActivity::class.java)
+                intent.putExtra("index", index)
+                intent.putExtra("caption", soundButton.btn.text)
+                startActivityForResult(intent, 1234)
 
-                    true
-                }
+                true
             }
         }
     }
 
     private fun loadPreferences() {
         val preferences = getPreferences(Context.MODE_PRIVATE)
-        val caption = preferences.getString("caption", "")
-        val btn = findViewById<TextView>(R.id.text_view_button)
-        btn.setText(caption)
+        buttons.forEachIndexed { index, soundButton ->
+            val caption = preferences.getString("caption" + index, "")
+            soundButton.btn.text = caption
+        }
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
         if (requestCode == 1234 && resultCode == Activity.RESULT_OK && data != null) {
-            val btn = findViewById<TextView>(R.id.text_view_button)
-            val caption = data.getStringExtra("caption")
-            if (caption != null) {
-                btn.setText(caption)
+            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)
+                }
+                val uri = data.getParcelableExtra<Uri>("uri")
+                savePreferences(caption, uri, index)
             }
-            val uri = data.getParcelableExtra<Uri>("uri")
-            savePreferences(caption, uri)
         }
     }
 
-    private fun savePreferences(caption: String, uri: Uri?) {
-        val btn = findViewById<TextView>(R.id.text_view_button)
-        val editor = getPreferences(Context.MODE_PRIVATE).edit()
-        editor.putString("caption", btn.text.toString())
-        editor.commit()
-
-        uri?.let { uri ->
-            grantUriPermission(getPackageName(), uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            val output = BufferedOutputStream(openFileOutput("audio", Context.MODE_PRIVATE))
-            val input = BufferedInputStream(getContentResolver().openInputStream(uri))
-            try {
-                val buf = ByteArray(1024)
-                input.read(buf)
-                do {
-                    output.write(buf)
-                } while (input.read(buf) !== -1)
-            } finally {
-                input.close()
-                output.close()
+    private fun savePreferences(caption: String, uri: Uri?, index: Int) {
+        if (index > -1 && index < buttons.size) {
+            val btn = buttons[index].btn
+            val editor = getPreferences(Context.MODE_PRIVATE).edit()
+            editor.putString("caption" + index, btn.text.toString())
+            editor.commit()
+
+            uri?.let { uri ->
+                grantUriPermission(getPackageName(), uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                val output = BufferedOutputStream(openFileOutput("audio" + index, Context.MODE_PRIVATE))
+                val input = BufferedInputStream(getContentResolver().openInputStream(uri))
+                try {
+                    val buf = ByteArray(1024)
+                    input.read(buf)
+                    do {
+                        output.write(buf)
+                    } while (input.read(buf) !== -1)
+                } finally {
+                    input.close()
+                    output.close()
+                }
             }
         }
     }