diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 90374fab..dd2875db 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -92,6 +92,11 @@
 
         </activity>
 
+        <activity
+            android:name=".presentation.activity.note.PickNoteActivity"
+            android:exported="false">
+        </activity>
+
         <receiver
             android:name=".presentation.widget.WidgetProvider"
             android:exported="false"
diff --git a/app/src/main/java/com/philkes/notallyx/Preferences.kt b/app/src/main/java/com/philkes/notallyx/Preferences.kt
index de6c0393..f0c60ffb 100644
--- a/app/src/main/java/com/philkes/notallyx/Preferences.kt
+++ b/app/src/main/java/com/philkes/notallyx/Preferences.kt
@@ -5,6 +5,8 @@ import android.os.Build
 import android.preference.PreferenceManager
 import androidx.security.crypto.EncryptedSharedPreferences
 import androidx.security.crypto.MasterKey
+import com.philkes.notallyx.data.model.toPreservedByteArray
+import com.philkes.notallyx.data.model.toPreservedString
 import com.philkes.notallyx.presentation.view.misc.AutoBackup
 import com.philkes.notallyx.presentation.view.misc.AutoBackupMax
 import com.philkes.notallyx.presentation.view.misc.AutoBackupPeriodDays
@@ -24,8 +26,6 @@ import com.philkes.notallyx.presentation.view.misc.TextInfo
 import com.philkes.notallyx.presentation.view.misc.TextSize
 import com.philkes.notallyx.presentation.view.misc.Theme
 import com.philkes.notallyx.presentation.view.misc.View
-import com.philkes.notallyx.utils.toPreservedByteArray
-import com.philkes.notallyx.utils.toPreservedString
 import java.security.SecureRandom
 import javax.crypto.Cipher
 
diff --git a/app/src/main/java/com/philkes/notallyx/data/AttachmentDeleteService.kt b/app/src/main/java/com/philkes/notallyx/data/AttachmentDeleteService.kt
index 378a43af..37f0d31a 100644
--- a/app/src/main/java/com/philkes/notallyx/data/AttachmentDeleteService.kt
+++ b/app/src/main/java/com/philkes/notallyx/data/AttachmentDeleteService.kt
@@ -14,10 +14,10 @@ import com.philkes.notallyx.R
 import com.philkes.notallyx.data.model.Attachment
 import com.philkes.notallyx.data.model.Audio
 import com.philkes.notallyx.data.model.FileAttachment
+import com.philkes.notallyx.data.model.isImage
 import com.philkes.notallyx.utils.IO.getExternalAudioDirectory
 import com.philkes.notallyx.utils.IO.getExternalFilesDirectory
 import com.philkes.notallyx.utils.IO.getExternalImagesDirectory
-import com.philkes.notallyx.utils.isImage
 import java.io.File
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
diff --git a/app/src/main/java/com/philkes/notallyx/data/NotallyDatabase.kt b/app/src/main/java/com/philkes/notallyx/data/NotallyDatabase.kt
index a189dc14..048c10a4 100644
--- a/app/src/main/java/com/philkes/notallyx/data/NotallyDatabase.kt
+++ b/app/src/main/java/com/philkes/notallyx/data/NotallyDatabase.kt
@@ -17,9 +17,9 @@ import com.philkes.notallyx.data.dao.LabelDao
 import com.philkes.notallyx.data.model.BaseNote
 import com.philkes.notallyx.data.model.Converters
 import com.philkes.notallyx.data.model.Label
+import com.philkes.notallyx.presentation.observeForeverSkipFirst
 import com.philkes.notallyx.presentation.view.misc.BetterLiveData
 import com.philkes.notallyx.presentation.view.misc.BiometricLock.enabled
-import com.philkes.notallyx.utils.observeForeverSkipFirst
 import com.philkes.notallyx.utils.security.getInitializedCipherForDecryption
 import net.sqlcipher.database.SupportFactory
 
diff --git a/app/src/main/java/com/philkes/notallyx/data/model/ModelExtensions.kt b/app/src/main/java/com/philkes/notallyx/data/model/ModelExtensions.kt
new file mode 100644
index 00000000..1baf6a2c
--- /dev/null
+++ b/app/src/main/java/com/philkes/notallyx/data/model/ModelExtensions.kt
@@ -0,0 +1,62 @@
+package com.philkes.notallyx.data.model
+
+import android.util.Patterns
+
+fun CharSequence?.isWebUrl(): Boolean {
+    return this?.let { Patterns.WEB_URL.matcher(this).matches() } ?: false
+}
+
+private const val NOTE_URL_PREFIX = "note://"
+private val NOTE_URL_POSTFIX_NOTE = "/${Type.NOTE.name}"
+private val NOTE_URL_POSTFIX_LIST = "/${Type.LIST.name}"
+
+fun CharSequence?.isNoteUrl(): Boolean {
+    return this?.let { startsWith(NOTE_URL_PREFIX) } ?: false
+}
+
+fun Long.createNoteUrl(type: Type): String {
+    val postfix =
+        when (type) {
+            Type.LIST -> NOTE_URL_POSTFIX_LIST
+            Type.NOTE -> NOTE_URL_POSTFIX_NOTE
+        }
+    return "$NOTE_URL_PREFIX$this$postfix"
+}
+
+fun String.getNoteIdFromUrl(): Long {
+    return substringAfter(NOTE_URL_PREFIX).substringBefore("/").toLong()
+}
+
+fun String.getNoteTypeFromUrl(): Type {
+    return Type.valueOf(substringAfterLast("/"))
+}
+
+fun String.getUrl(start: Int, end: Int): String {
+    return if (end <= length) {
+        substring(start, end).toUrl()
+    } else substring(start, length).toUrl()
+}
+
+private fun String.toUrl(): String {
+    return when {
+        matches(Patterns.PHONE.toRegex()) -> "tel:$this"
+        matches(Patterns.EMAIL_ADDRESS.toRegex()) -> "mailto:$this"
+        matches(Patterns.DOMAIN_NAME.toRegex()) -> "http://$this"
+        else -> this
+    }
+}
+
+val FileAttachment.isImage: Boolean
+    get() {
+        return mimeType.startsWith("image/")
+    }
+
+val String.toPreservedByteArray: ByteArray
+    get() {
+        return this.toByteArray(Charsets.ISO_8859_1)
+    }
+
+val ByteArray.toPreservedString: String
+    get() {
+        return String(this, Charsets.ISO_8859_1)
+    }
diff --git a/app/src/main/java/com/philkes/notallyx/utils/Extensions.kt b/app/src/main/java/com/philkes/notallyx/presentation/UiExtensions.kt
similarity index 89%
rename from app/src/main/java/com/philkes/notallyx/utils/Extensions.kt
rename to app/src/main/java/com/philkes/notallyx/presentation/UiExtensions.kt
index 2ab2780d..bbc2b26e 100644
--- a/app/src/main/java/com/philkes/notallyx/utils/Extensions.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/UiExtensions.kt
@@ -1,7 +1,9 @@
-package com.philkes.notallyx.utils
+package com.philkes.notallyx.presentation
 
 import android.app.Activity
 import android.app.KeyguardManager
+import android.content.ClipData
+import android.content.ClipboardManager
 import android.content.Context
 import android.content.pm.PackageManager
 import android.content.res.Resources
@@ -24,25 +26,28 @@ import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import android.widget.RadioButton
 import android.widget.RadioGroup
 import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity.INPUT_METHOD_SERVICE
 import androidx.appcompat.app.AppCompatActivity.KEYGUARD_SERVICE
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.philkes.notallyx.R
-import com.philkes.notallyx.data.model.FileAttachment
 import com.philkes.notallyx.data.model.Folder
 import com.philkes.notallyx.data.model.SpanRepresentation
-import com.philkes.notallyx.presentation.activity.note.EditNoteActivity
+import com.philkes.notallyx.data.model.getUrl
 import com.philkes.notallyx.presentation.view.misc.DateFormat
+import com.philkes.notallyx.presentation.view.misc.EditTextWithHistory
 import com.philkes.notallyx.presentation.view.note.listitem.ListManager
 import com.philkes.notallyx.utils.changehistory.ChangeHistory
-import com.philkes.notallyx.utils.changehistory.EditTextChange
+import com.philkes.notallyx.utils.changehistory.EditTextWithHistoryChange
 import java.util.Date
 import kotlin.math.roundToInt
 import org.ocpsoft.prettytime.PrettyTime
@@ -64,7 +69,7 @@ fun String.applySpans(representations: List<SpanRepresentation>): Editable {
                 editable.setSpan(StyleSpan(Typeface.ITALIC), start, end)
             }
             if (link) {
-                val url = linkData ?: getURL(start, end)
+                val url = linkData ?: getUrl(start, end)
                 editable.setSpan(URLSpan(url), start, end)
             }
             if (monospace) {
@@ -81,7 +86,7 @@ fun String.applySpans(representations: List<SpanRepresentation>): Editable {
 }
 
 /**
- * Extension function for Editable to modify or remove spans based on the selection range.
+ * Adjusts or removes spans based on the selection range.
  *
  * @param selectionStart the start index of the selection
  * @param selectionEnd the end index of the selection
@@ -122,12 +127,6 @@ fun Editable.removeSelectionFromSpan(selectionStart: Int, selectionEnd: Int) {
     }
 }
 
-private fun String.getURL(start: Int, end: Int): String {
-    return if (end <= length) {
-        EditNoteActivity.getURLFrom(substring(start, end))
-    } else EditNoteActivity.getURLFrom(substring(start, length))
-}
-
 private fun Spannable.setSpan(span: Any, start: Int, end: Int) {
     if (end <= length) {
         setSpan(span, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
@@ -226,7 +225,7 @@ fun EditText.createListTextWatcherWithHistory(listManager: ListManager, position
         }
     }
 
-fun EditText.createTextWatcherWithHistory(
+fun EditTextWithHistory.createTextWatcherWithHistory(
     changeHistory: ChangeHistory,
     onTextChanged: ((text: CharSequence, start: Int, count: Int) -> Unit)? = null,
     updateModel: (text: Editable) -> Unit,
@@ -235,7 +234,7 @@ fun EditText.createTextWatcherWithHistory(
         private lateinit var currentTextBefore: Editable
 
         override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-            currentTextBefore = this@createTextWatcherWithHistory.text.clone()
+            currentTextBefore = this@createTextWatcherWithHistory.getTextClone()
         }
 
         override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
@@ -248,11 +247,10 @@ fun EditText.createTextWatcherWithHistory(
             updateModel.invoke(textAfter)
 
             changeHistory.push(
-                EditTextChange(
+                EditTextWithHistoryChange(
                     this@createTextWatcherWithHistory,
                     textBefore,
                     textAfter,
-                    this,
                     updateModel,
                 )
             )
@@ -269,11 +267,6 @@ fun View.getQuantityString(id: Int, quantity: Int, vararg formatArgs: Any): Stri
     return context.resources.getQuantityString(id, quantity, *formatArgs)
 }
 
-val FileAttachment.isImage: Boolean
-    get() {
-        return mimeType.startsWith("image/")
-    }
-
 fun Folder.movedToResId(): Int {
     return when (this) {
         Folder.DELETED -> R.plurals.deleted_selected_notes
@@ -287,7 +280,6 @@ fun RadioGroup.checkedTag(): Any {
 }
 
 fun Context.canAuthenticateWithBiometrics(): Int {
-    var canAuthenticate = true
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
             val keyguardManager: KeyguardManager =
@@ -312,16 +304,6 @@ fun Context.canAuthenticateWithBiometrics(): Int {
     return BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE
 }
 
-val String.toPreservedByteArray: ByteArray
-    get() {
-        return this.toByteArray(Charsets.ISO_8859_1)
-    }
-
-val ByteArray.toPreservedString: String
-    get() {
-        return String(this, Charsets.ISO_8859_1)
-    }
-
 fun <T> LiveData<T>.observeForeverSkipFirst(observer: Observer<T>) {
     var isFirstEvent = true
     this.observeForever { value ->
@@ -345,3 +327,23 @@ private fun formatTimestamp(timestamp: Long, dateFormat: String): String {
         else -> java.text.DateFormat.getDateInstance(java.text.DateFormat.FULL).format(date)
     }
 }
+
+fun Activity.copyToClipBoard(text: CharSequence) {
+    val clipboard: ClipboardManager =
+        getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+    val clip = ClipData.newPlainText("label", text)
+    clipboard.setPrimaryClip(clip)
+}
+
+fun ClipboardManager.getLatestText(): CharSequence? {
+    return if (primaryClip!!.itemCount > 0) primaryClip!!.getItemAt(0)!!.text else null
+}
+
+fun MaterialAlertDialogBuilder.showAndFocus(view: View): AlertDialog {
+    val dialog = show()
+    view.requestFocus()
+    if (view is EditText) {
+        dialog.window?.setSoftInputMode(SOFT_INPUT_STATE_VISIBLE)
+    }
+    return dialog
+}
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/ConfigureWidgetActivity.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/ConfigureWidgetActivity.kt
index 355e0946..0b5aff41 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/ConfigureWidgetActivity.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/ConfigureWidgetActivity.kt
@@ -3,30 +3,13 @@ package com.philkes.notallyx.presentation.activity
 import android.appwidget.AppWidgetManager
 import android.content.Intent
 import android.os.Bundle
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import com.philkes.notallyx.Preferences
-import com.philkes.notallyx.R
-import com.philkes.notallyx.data.NotallyDatabase
 import com.philkes.notallyx.data.model.BaseNote
-import com.philkes.notallyx.data.model.Header
-import com.philkes.notallyx.databinding.ActivityConfigureWidgetBinding
-import com.philkes.notallyx.presentation.view.main.BaseNoteAdapter
-import com.philkes.notallyx.presentation.view.misc.View
-import com.philkes.notallyx.presentation.view.note.listitem.ListItemListener
-import com.philkes.notallyx.presentation.viewmodel.BaseNoteModel
+import com.philkes.notallyx.presentation.activity.note.PickNoteActivity
 import com.philkes.notallyx.presentation.widget.WidgetProvider
-import com.philkes.notallyx.utils.IO.getExternalImagesDirectory
-import java.util.Collections
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 
-class ConfigureWidgetActivity : LockedActivity<ActivityConfigureWidgetBinding>(), ListItemListener {
+class ConfigureWidgetActivity : PickNoteActivity() {
 
-    private lateinit var adapter: BaseNoteAdapter
     private val id by lazy {
         intent.getIntExtra(
             AppWidgetManager.EXTRA_APPWIDGET_ID,
@@ -36,58 +19,10 @@ class ConfigureWidgetActivity : LockedActivity<ActivityConfigureWidgetBinding>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityConfigureWidgetBinding.inflate(layoutInflater)
-        setContentView(binding.root)
 
         val result = Intent()
         result.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, id)
         setResult(RESULT_CANCELED, result)
-
-        val preferences = Preferences.getInstance(application)
-
-        adapter =
-            with(preferences) {
-                BaseNoteAdapter(
-                    Collections.emptySet(),
-                    dateFormat.value,
-                    notesSorting.value.first,
-                    textSize.value,
-                    maxItems,
-                    maxLines,
-                    maxTitle,
-                    application.getExternalImagesDirectory(),
-                    this@ConfigureWidgetActivity,
-                )
-            }
-
-        binding.RecyclerView.apply {
-            adapter = this@ConfigureWidgetActivity.adapter
-            setHasFixedSize(true)
-            layoutManager =
-                if (preferences.view.value == View.grid) {
-                    StaggeredGridLayoutManager(2, RecyclerView.VERTICAL)
-                } else LinearLayoutManager(this@ConfigureWidgetActivity)
-        }
-
-        val database = NotallyDatabase.getDatabase(application)
-
-        val pinned = Header(getString(R.string.pinned))
-        val others = Header(getString(R.string.others))
-
-        database.observe(this) {
-            lifecycleScope.launch {
-                val notes =
-                    withContext(Dispatchers.IO) {
-                        val raw = it.getBaseNoteDao().getAllNotes()
-                        BaseNoteModel.transform(raw, pinned, others)
-                    }
-                adapter.submitList(notes)
-            }
-        }
-
-        preferences.notesSorting.observe(this) { (sortBy, sortDirection) ->
-            adapter.setSorting(sortBy, sortDirection)
-        }
     }
 
     override fun onClick(position: Int) {
@@ -105,6 +40,4 @@ class ConfigureWidgetActivity : LockedActivity<ActivityConfigureWidgetBinding>()
             finish()
         }
     }
-
-    override fun onLongClick(position: Int) {}
 }
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/MainActivity.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/MainActivity.kt
index defee25c..fbf1efa9 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/MainActivity.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/MainActivity.kt
@@ -39,14 +39,14 @@ import com.philkes.notallyx.databinding.DialogColorBinding
 import com.philkes.notallyx.presentation.activity.LockedActivity
 import com.philkes.notallyx.presentation.activity.note.EditListActivity
 import com.philkes.notallyx.presentation.activity.note.EditNoteActivity
+import com.philkes.notallyx.presentation.add
+import com.philkes.notallyx.presentation.applySpans
+import com.philkes.notallyx.presentation.movedToResId
 import com.philkes.notallyx.presentation.view.main.ColorAdapter
 import com.philkes.notallyx.presentation.view.misc.MenuDialog
 import com.philkes.notallyx.presentation.view.note.listitem.ListItemListener
 import com.philkes.notallyx.presentation.viewmodel.BaseNoteModel
 import com.philkes.notallyx.utils.Operations
-import com.philkes.notallyx.utils.add
-import com.philkes.notallyx.utils.applySpans
-import com.philkes.notallyx.utils.movedToResId
 import java.io.File
 import kotlinx.coroutines.launch
 
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/DeletedFragment.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/DeletedFragment.kt
index ea00781d..ee43deaf 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/DeletedFragment.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/DeletedFragment.kt
@@ -4,7 +4,7 @@ import android.view.Menu
 import android.view.MenuInflater
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.philkes.notallyx.R
-import com.philkes.notallyx.utils.add
+import com.philkes.notallyx.presentation.add
 
 class DeletedFragment : NotallyFragment() {
 
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt
index dedee67a..5248853a 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/LabelsFragment.kt
@@ -19,12 +19,13 @@ import com.philkes.notallyx.R
 import com.philkes.notallyx.data.model.Label
 import com.philkes.notallyx.databinding.DialogInputBinding
 import com.philkes.notallyx.databinding.FragmentNotesBinding
+import com.philkes.notallyx.presentation.add
+import com.philkes.notallyx.presentation.showAndFocus
 import com.philkes.notallyx.presentation.view.Constants
 import com.philkes.notallyx.presentation.view.main.LabelAdapter
 import com.philkes.notallyx.presentation.view.misc.MenuDialog
 import com.philkes.notallyx.presentation.view.note.listitem.ListItemListener
 import com.philkes.notallyx.presentation.viewmodel.BaseNoteModel
-import com.philkes.notallyx.utils.add
 
 class LabelsFragment : Fragment(), ListItemListener {
 
@@ -113,9 +114,7 @@ class LabelsFragment : Fragment(), ListItemListener {
                     }
                 }
             }
-            .show()
-
-        dialogBinding.EditText.requestFocus()
+            .showAndFocus(dialogBinding.EditText)
     }
 
     private fun confirmDeletion(value: String) {
@@ -152,8 +151,6 @@ class LabelsFragment : Fragment(), ListItemListener {
                     }
                 }
             }
-            .show()
-
-        dialogBinding.EditText.requestFocus()
+            .showAndFocus(dialogBinding.EditText)
     }
 }
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/NotallyFragment.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/NotallyFragment.kt
index d328ae3c..2f3a0321 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/NotallyFragment.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/NotallyFragment.kt
@@ -25,12 +25,12 @@ import com.philkes.notallyx.presentation.activity.note.EditActivity.Companion.FO
 import com.philkes.notallyx.presentation.activity.note.EditActivity.Companion.NOTE_ID
 import com.philkes.notallyx.presentation.activity.note.EditListActivity
 import com.philkes.notallyx.presentation.activity.note.EditNoteActivity
+import com.philkes.notallyx.presentation.movedToResId
 import com.philkes.notallyx.presentation.view.Constants
 import com.philkes.notallyx.presentation.view.main.BaseNoteAdapter
 import com.philkes.notallyx.presentation.view.misc.View as ViewPref
 import com.philkes.notallyx.presentation.view.note.listitem.ListItemListener
 import com.philkes.notallyx.presentation.viewmodel.BaseNoteModel
-import com.philkes.notallyx.utils.movedToResId
 
 abstract class NotallyFragment : Fragment(), ListItemListener {
 
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/NotesFragment.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/NotesFragment.kt
index 44900c36..53bc7109 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/NotesFragment.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/NotesFragment.kt
@@ -4,7 +4,7 @@ import android.view.Menu
 import android.view.MenuInflater
 import androidx.navigation.fragment.findNavController
 import com.philkes.notallyx.R
-import com.philkes.notallyx.utils.add
+import com.philkes.notallyx.presentation.add
 
 class NotesFragment : NotallyFragment() {
 
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/SettingsFragment.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/SettingsFragment.kt
index a699e9b7..7660b6aa 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/SettingsFragment.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/SettingsFragment.kt
@@ -30,6 +30,8 @@ import com.philkes.notallyx.databinding.NotesSortDialogBinding
 import com.philkes.notallyx.databinding.PreferenceBinding
 import com.philkes.notallyx.databinding.PreferenceSeekbarBinding
 import com.philkes.notallyx.databinding.TextInputDialogBinding
+import com.philkes.notallyx.presentation.canAuthenticateWithBiometrics
+import com.philkes.notallyx.presentation.checkedTag
 import com.philkes.notallyx.presentation.view.misc.AutoBackup
 import com.philkes.notallyx.presentation.view.misc.AutoBackupMax
 import com.philkes.notallyx.presentation.view.misc.AutoBackupPeriodDays
@@ -53,8 +55,6 @@ import com.philkes.notallyx.presentation.viewmodel.BaseNoteModel
 import com.philkes.notallyx.utils.Operations
 import com.philkes.notallyx.utils.backup.BackupProgress
 import com.philkes.notallyx.utils.backup.Export.scheduleAutoBackup
-import com.philkes.notallyx.utils.canAuthenticateWithBiometrics
-import com.philkes.notallyx.utils.checkedTag
 import com.philkes.notallyx.utils.security.decryptDatabase
 import com.philkes.notallyx.utils.security.encryptDatabase
 import com.philkes.notallyx.utils.security.showBiometricOrPinPrompt
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditActivity.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditActivity.kt
index b3cba620..7c2a327b 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditActivity.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditActivity.kt
@@ -11,7 +11,6 @@ import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
 import android.text.Editable
-import android.text.TextWatcher
 import android.util.TypedValue
 import android.view.MenuItem
 import android.view.View
@@ -34,6 +33,8 @@ import com.philkes.notallyx.data.model.Type
 import com.philkes.notallyx.databinding.ActivityEditBinding
 import com.philkes.notallyx.databinding.DialogProgressBinding
 import com.philkes.notallyx.presentation.activity.LockedActivity
+import com.philkes.notallyx.presentation.add
+import com.philkes.notallyx.presentation.displayFormattedTimestamp
 import com.philkes.notallyx.presentation.view.Constants
 import com.philkes.notallyx.presentation.view.misc.NotesSorting.autoSortByCreationDate
 import com.philkes.notallyx.presentation.view.misc.NotesSorting.autoSortByModifiedDate
@@ -45,10 +46,7 @@ import com.philkes.notallyx.presentation.view.note.preview.PreviewImageAdapter
 import com.philkes.notallyx.presentation.viewmodel.NotallyModel
 import com.philkes.notallyx.utils.FileError
 import com.philkes.notallyx.utils.Operations
-import com.philkes.notallyx.utils.add
 import com.philkes.notallyx.utils.changehistory.ChangeHistory
-import com.philkes.notallyx.utils.createTextWatcherWithHistory
-import com.philkes.notallyx.utils.displayFormattedTimestamp
 import java.io.File
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -56,7 +54,6 @@ import kotlinx.coroutines.launch
 abstract class EditActivity(private val type: Type) : LockedActivity<ActivityEditBinding>() {
     internal val model: NotallyModel by viewModels()
     internal lateinit var changeHistory: ChangeHistory
-    internal lateinit var enterTitleTextWatcher: TextWatcher
 
     override fun finish() {
         lifecycleScope.launch(Dispatchers.Main) {
@@ -118,6 +115,7 @@ abstract class EditActivity(private val type: Type) : LockedActivity<ActivityEdi
                         model.addImages(uris)
                     }
                 }
+
                 REQUEST_VIEW_IMAGES -> {
                     val list =
                         data?.getParcelableArrayListExtra<FileAttachment>(
@@ -127,6 +125,7 @@ abstract class EditActivity(private val type: Type) : LockedActivity<ActivityEdi
                         model.deleteImages(list)
                     }
                 }
+
                 REQUEST_SELECT_LABELS -> {
                     val list = data?.getStringArrayListExtra(SelectLabelsActivity.SELECTED_LABELS)
                     if (list != null && list != model.labels) {
@@ -134,6 +133,7 @@ abstract class EditActivity(private val type: Type) : LockedActivity<ActivityEdi
                         Operations.bindLabels(binding.LabelGroup, model.labels, model.textSize)
                     }
                 }
+
                 REQUEST_RECORD_AUDIO -> model.addAudio()
                 REQUEST_PLAY_AUDIO -> {
                     val audio = data?.getParcelableExtra<Audio>(PlayAudioActivity.AUDIO)
@@ -141,6 +141,7 @@ abstract class EditActivity(private val type: Type) : LockedActivity<ActivityEdi
                         model.deleteAudio(audio)
                     }
                 }
+
                 REQUEST_ATTACH_FILES -> {
                     val uri = data?.data
                     val clipData = data?.clipData
@@ -242,12 +243,9 @@ abstract class EditActivity(private val type: Type) : LockedActivity<ActivityEdi
     abstract fun configureUI()
 
     open fun setupListeners() {
-        enterTitleTextWatcher = run {
-            binding.EnterTitle.createTextWatcherWithHistory(changeHistory) { text: Editable ->
-                model.title = text.trim().toString()
-            }
+        binding.EnterTitle.initHistory(changeHistory) { text ->
+            model.title = text.trim().toString()
         }
-        binding.EnterTitle.addTextChangedListener(enterTitleTextWatcher)
     }
 
     open fun setStateFromModel() {
@@ -259,20 +257,12 @@ abstract class EditActivity(private val type: Type) : LockedActivity<ActivityEdi
             }
         binding.Date.displayFormattedTimestamp(date, preferences.dateFormat.value, datePrefixResId)
 
-        updateEnterTitle()
+        binding.EnterTitle.setText(model.title)
         Operations.bindLabels(binding.LabelGroup, model.labels, model.textSize)
 
         setColor()
     }
 
-    private fun updateEnterTitle() {
-        binding.EnterTitle.apply {
-            removeTextChangedListener(enterTitleTextWatcher)
-            setText(model.title)
-            addTextChangedListener(enterTitleTextWatcher)
-        }
-    }
-
     private fun handleSharedNote() {
         val title = intent.getStringExtra(Intent.EXTRA_SUBJECT)
 
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditListActivity.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditListActivity.kt
index 9be85e46..af441f0d 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditListActivity.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditListActivity.kt
@@ -6,6 +6,8 @@ import android.view.inputmethod.InputMethodManager
 import com.philkes.notallyx.Preferences
 import com.philkes.notallyx.R
 import com.philkes.notallyx.data.model.Type
+import com.philkes.notallyx.presentation.add
+import com.philkes.notallyx.presentation.setOnNextAction
 import com.philkes.notallyx.presentation.view.misc.ListItemSorting
 import com.philkes.notallyx.presentation.view.note.listitem.ListItemAdapter
 import com.philkes.notallyx.presentation.view.note.listitem.ListManager
@@ -14,9 +16,7 @@ import com.philkes.notallyx.presentation.view.note.listitem.sorting.ListItemSort
 import com.philkes.notallyx.presentation.view.note.listitem.sorting.ListItemSortedList
 import com.philkes.notallyx.presentation.view.note.listitem.sorting.toMutableList
 import com.philkes.notallyx.presentation.widget.WidgetProvider
-import com.philkes.notallyx.utils.add
 import com.philkes.notallyx.utils.changehistory.ChangeHistory
-import com.philkes.notallyx.utils.setOnNextAction
 
 class EditListActivity : EditActivity(Type.LIST) {
 
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditNoteActivity.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditNoteActivity.kt
index 4ba4181b..f472ffd0 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditNoteActivity.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditNoteActivity.kt
@@ -1,42 +1,48 @@
 package com.philkes.notallyx.presentation.activity.note
 
-import android.content.ClipData
+import android.app.Activity
 import android.content.ClipboardManager
-import android.content.Context
 import android.content.Intent
 import android.graphics.Typeface
 import android.net.Uri
-import android.text.Editable
+import android.os.Build
 import android.text.Spanned
-import android.text.TextWatcher
-import android.text.style.CharacterStyle
 import android.text.style.StrikethroughSpan
 import android.text.style.StyleSpan
 import android.text.style.TypefaceSpan
 import android.text.style.URLSpan
-import android.util.Patterns
 import android.view.ActionMode
 import android.view.Menu
 import android.view.MenuItem
-import android.widget.EditText
 import android.widget.Toast
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.philkes.notallyx.R
 import com.philkes.notallyx.data.model.Type
-import com.philkes.notallyx.databinding.TextInputDialogBinding
+import com.philkes.notallyx.data.model.createNoteUrl
+import com.philkes.notallyx.data.model.getNoteIdFromUrl
+import com.philkes.notallyx.data.model.getNoteTypeFromUrl
+import com.philkes.notallyx.data.model.isNoteUrl
+import com.philkes.notallyx.data.model.isWebUrl
+import com.philkes.notallyx.databinding.TextInputDialog2Binding
+import com.philkes.notallyx.presentation.activity.note.PickNoteActivity.Companion.EXCLUDE_NOTE_ID
+import com.philkes.notallyx.presentation.activity.note.PickNoteActivity.Companion.PICKED_NOTE_ID
+import com.philkes.notallyx.presentation.activity.note.PickNoteActivity.Companion.PICKED_NOTE_TITLE
+import com.philkes.notallyx.presentation.activity.note.PickNoteActivity.Companion.PICKED_NOTE_TYPE
+import com.philkes.notallyx.presentation.add
+import com.philkes.notallyx.presentation.copyToClipBoard
+import com.philkes.notallyx.presentation.getLatestText
+import com.philkes.notallyx.presentation.setOnNextAction
+import com.philkes.notallyx.presentation.showAndFocus
+import com.philkes.notallyx.presentation.showKeyboard
+import com.philkes.notallyx.presentation.view.Constants
 import com.philkes.notallyx.presentation.widget.WidgetProvider
 import com.philkes.notallyx.utils.LinkMovementMethod
-import com.philkes.notallyx.utils.add
-import com.philkes.notallyx.utils.changehistory.EditTextChange
-import com.philkes.notallyx.utils.clone
-import com.philkes.notallyx.utils.createTextWatcherWithHistory
-import com.philkes.notallyx.utils.removeSelectionFromSpan
-import com.philkes.notallyx.utils.setOnNextAction
-import com.philkes.notallyx.utils.showKeyboard
+
+private const val UNNAMED_NOTE_PLACEHOLDER = "Unnamed Note"
 
 class EditNoteActivity : EditActivity(Type.NOTE) {
 
-    private lateinit var enterBodyTextWatcher: TextWatcher
+    private lateinit var selectedSpan: URLSpan
 
     override suspend fun saveNote() {
         super.saveNote()
@@ -54,29 +60,40 @@ class EditNoteActivity : EditActivity(Type.NOTE) {
         }
     }
 
-    override fun setupListeners() {
-        super.setupListeners()
-        enterBodyTextWatcher = run {
-            binding.EnterBody.createTextWatcherWithHistory(
-                changeHistory,
-                { text, start, count ->
-                    if (count > 1) {
-                        val changedText = text.substring(start, start + count)
-                        if (Patterns.WEB_URL.matcher(changedText).matches()) {
-                            binding.EnterBody.text?.setSpan(
-                                URLSpan(changedText),
-                                start,
-                                start + count,
-                                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE,
-                            )
-                        }
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (resultCode == RESULT_OK) {
+            when (requestCode) {
+                REQUEST_CODE_PICK_NOTE_NEW -> {
+                    val noteId = data?.getLongExtra(PICKED_NOTE_ID, -1L)!!
+                    if (noteId == -1L) {
+                        return
+                    }
+                    val noteTitle = data.getStringExtra(PICKED_NOTE_TITLE)!!
+                    val noteType = Type.valueOf(data.getStringExtra(PICKED_NOTE_TYPE)!!)
+                    binding.EnterBody.addSpan(noteTitle, URLSpan(noteId.createNoteUrl(noteType)))
+                }
+                REQUEST_CODE_PICK_NOTE_UPDATE -> {
+                    val noteId = data?.getLongExtra(PICKED_NOTE_ID, -1L)!!
+                    if (noteId == -1L) {
+                        return
                     }
-                },
-            ) { text: Editable ->
-                model.body = text.clone()
+                    // TODO: If the linked note title changes the link display text does not change
+                    val noteTitle =
+                        data.getStringExtra(PICKED_NOTE_TITLE)!!.ifEmpty {
+                            UNNAMED_NOTE_PLACEHOLDER
+                        }
+                    val noteType = Type.valueOf(data.getStringExtra(PICKED_NOTE_TYPE)!!)
+                    val noteUrl = noteId.createNoteUrl(noteType)
+                    binding.EnterBody.updateSpan(selectedSpan, URLSpan(noteUrl), noteTitle)
+                }
             }
         }
-        binding.EnterBody.addTextChangedListener(enterBodyTextWatcher)
+    }
+
+    override fun setupListeners() {
+        super.setupListeners()
+        binding.EnterBody.initHistory(changeHistory) { text -> model.body = text }
     }
 
     override fun setStateFromModel() {
@@ -85,11 +102,7 @@ class EditNoteActivity : EditActivity(Type.NOTE) {
     }
 
     private fun updateEditText() {
-        binding.EnterBody.apply {
-            removeTextChangedListener(enterBodyTextWatcher)
-            text = model.body
-            addTextChangedListener(enterBodyTextWatcher)
-        }
+        binding.EnterBody.text = model.body
     }
 
     private fun setupEditor() {
@@ -106,45 +119,27 @@ class EditNoteActivity : EditActivity(Type.NOTE) {
                     // Try block is there because this will crash on MiUI as Xiaomi has a broken
                     // ActionMode implementation
                     try {
-                        if (menu != null) {
-                            menu.apply {
-                                add(R.string.bold, 0) {
-                                    applySpan(StyleSpan(Typeface.BOLD))
-                                    mode?.finish()
-                                }
-                                add(R.string.link, 0) {
-                                    val clipBoardText = getClipboardText()
-                                    if (
-                                        clipBoardText != null &&
-                                            Patterns.WEB_URL.matcher(clipBoardText).matches()
-                                    ) {
-                                        applySpan(URLSpan(clipBoardText.toString()))
-                                    } else {
-                                        Toast.makeText(
-                                                this@EditNoteActivity,
-                                                R.string.invalid_link,
-                                                Toast.LENGTH_LONG,
-                                            )
-                                            .show()
-                                    }
-                                    mode?.finish()
-                                }
-                                add(R.string.italic, 0) {
-                                    applySpan(StyleSpan(Typeface.ITALIC))
-                                    mode?.finish()
-                                }
-                                add(R.string.monospace, 0) {
-                                    applySpan(TypefaceSpan("monospace"))
-                                    mode?.finish()
-                                }
-                                add(R.string.strikethrough, 0) {
-                                    applySpan(StrikethroughSpan())
-                                    mode?.finish()
-                                }
-                                add(R.string.clear_formatting, 0) {
-                                    clearFormatting()
-                                    mode?.finish()
-                                }
+                        menu?.apply {
+                            add(R.string.bold, 0) {
+                                binding.EnterBody.applySpan(StyleSpan(Typeface.BOLD))
+                                mode?.finish()
+                            }
+                            add(R.string.link, 0) { showAddLinkDialog(mode) }
+                            add(R.string.italic, 0) {
+                                binding.EnterBody.applySpan(StyleSpan(Typeface.ITALIC))
+                                mode?.finish()
+                            }
+                            add(R.string.monospace, 0) {
+                                binding.EnterBody.applySpan(TypefaceSpan("monospace"))
+                                mode?.finish()
+                            }
+                            add(R.string.strikethrough, 0) {
+                                binding.EnterBody.applySpan(StrikethroughSpan())
+                                mode?.finish()
+                            }
+                            add(R.string.clear_formatting, 0) {
+                                binding.EnterBody.clearFormatting()
+                                mode?.finish()
                             }
                         }
                     } catch (exception: Exception) {
@@ -153,70 +148,148 @@ class EditNoteActivity : EditActivity(Type.NOTE) {
                     return true
                 }
 
-                fun getClipboardText(): CharSequence? {
-                    val clipboard = baseContext.getSystemService(ClipboardManager::class.java)!!
-                    val clipData = clipboard.primaryClip!!
-                    return if (clipData.itemCount > 0) clipData.getItemAt(0)!!.text else null
+                private fun showAddLinkDialog(mode: ActionMode?) {
+                    val urlFromClipboard =
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                            baseContext
+                                .getSystemService(ClipboardManager::class.java)!!
+                                .getLatestText()
+                                .let { if (it.isWebUrl()) it.toString() else "" }
+                        } else ""
+                    val displayTextBefore = binding.EnterBody.getSelectionText()!!
+                    this@EditNoteActivity.showEditLinkDialog(urlFromClipboard, displayTextBefore) {
+                        urlAfter,
+                        displayTextAfter ->
+                        if (displayTextAfter == displayTextBefore) {
+                            binding.EnterBody.applySpan(URLSpan(urlAfter))
+                        } else {
+                            binding.EnterBody.changeTextWithHistory { text ->
+                                val start = binding.EnterBody.selectionStart
+                                text.replace(
+                                    start,
+                                    binding.EnterBody.selectionEnd,
+                                    displayTextAfter,
+                                )
+                                text.setSpan(
+                                    URLSpan(urlAfter),
+                                    start,
+                                    start + displayTextAfter.length,
+                                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE,
+                                )
+                            }
+                        }
+                        mode?.finish()
+                    }
                 }
 
                 override fun onDestroyActionMode(mode: ActionMode?) {
                     binding.EnterBody.isActionModeOn = false
-                    model.body = binding.EnterBody.text!!.clone()
                 }
             }
 
         binding.ContentLayout.setOnClickListener {
             binding.EnterBody.apply {
                 requestFocus()
-                setSelection(text!!.length)
+                setSelection(length())
+                showKeyboard(this)
+            }
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            binding.EnterBody.customInsertionActionModeCallback =
+                object : ActionMode.Callback {
+                    override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?) = false
+
+                    override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?) = false
+
+                    override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
+                        binding.EnterBody.isActionModeOn = true
+                        // Try block is there because this will crash on MiUI as Xiaomi has a broken
+                        // ActionMode implementation
+                        try {
+                            menu?.apply {
+                                add(R.string.link_note, 0) {
+                                    startPickNote(REQUEST_CODE_PICK_NOTE_NEW)
+                                    mode?.finish()
+                                }
+                            }
+                        } catch (exception: Exception) {
+                            exception.printStackTrace()
+                        }
+                        return true
+                    }
+
+                    override fun onDestroyActionMode(mode: ActionMode?) {
+                        binding.EnterBody.isActionModeOn = false
+                    }
+                }
+        }
+        binding.ContentLayout.setOnClickListener {
+            binding.EnterBody.apply {
+                requestFocus()
+                setSelection(length())
                 showKeyboard(this)
             }
         }
     }
 
+    private fun EditNoteActivity.startPickNote(requestCode: Int) {
+        val intent =
+            Intent(this, PickNoteActivity::class.java).apply { putExtra(EXCLUDE_NOTE_ID, model.id) }
+        startActivityForResult(intent, requestCode)
+    }
+
     private fun setupMovementMethod() {
-        val items =
-            arrayOf(
-                getString(R.string.copy),
-                getString(R.string.edit),
-                getString(R.string.open_link),
-            )
         val movementMethod = LinkMovementMethod { span ->
+            val items =
+                if (span.url.isNoteUrl()) {
+                    arrayOf(
+                        getString(R.string.remove_link),
+                        getString(R.string.change_note),
+                        getString(R.string.open_note),
+                    )
+                } else {
+                    arrayOf(
+                        getString(R.string.remove_link),
+                        getString(R.string.copy),
+                        getString(R.string.edit),
+                        getString(R.string.open_link),
+                    )
+                }
             MaterialAlertDialogBuilder(this)
-                .setTitle(span.url)
+                .setTitle(
+                    if (span.url.isNoteUrl())
+                        "${getString(R.string.note)}: ${
+                            binding.EnterBody.getSpanText(span)
+                        }"
+                    else span.url
+                )
                 .setItems(items) { _, which ->
                     when (which) {
                         0 -> {
-                            val clipboard: ClipboardManager =
-                                getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-                            val clip = ClipData.newPlainText("label", span.url)
-                            clipboard.setPrimaryClip(clip)
-                            Toast.makeText(this, R.string.copied_link, Toast.LENGTH_LONG).show()
+                            binding.EnterBody.removeSpan(span, true)
                         }
                         1 ->
-                            showUrlInputDialog(span.url) { newUrl ->
-                                binding.EnterBody.changeFormatting { _, _, text ->
-                                    newUrl?.let { text.replaceUrlSpan(span, it) }
-                                        ?: clearFormatting(span)
-                                    model.body = text.clone()
-                                    Toast.makeText(this, R.string.updated_link, Toast.LENGTH_LONG)
-                                        .show()
-                                }
+                            if (span.url.isNoteUrl()) {
+                                selectedSpan = span
+                                startPickNote(REQUEST_CODE_PICK_NOTE_UPDATE)
+                            } else {
+                                copyToClipBoard(span.url)
+                                Toast.makeText(this, R.string.copied_link, Toast.LENGTH_LONG).show()
                             }
 
                         2 -> {
-                            if (span.url != null) {
-                                val uri = Uri.parse(span.url)
-
-                                val intent = Intent(Intent.ACTION_VIEW, uri)
-                                try {
-                                    startActivity(intent)
-                                } catch (exception: Exception) {
-                                    Toast.makeText(this, R.string.cant_open_link, Toast.LENGTH_LONG)
-                                        .show()
+                            span.url?.let {
+                                if (it.isNoteUrl()) {
+                                    span.navigateToNote()
+                                } else {
+                                    span.showEditDialog()
                                 }
                             }
                         }
+
+                        3 -> {
+                            openLink(span.url)
+                        }
                     }
                 }
                 .show()
@@ -224,101 +297,75 @@ class EditNoteActivity : EditActivity(Type.NOTE) {
         binding.EnterBody.movementMethod = movementMethod
     }
 
-    private fun Editable.replaceUrlSpan(existingSpan: URLSpan, newUrl: String) {
-        val start = this.getSpanStart(existingSpan)
-        val end = this.getSpanEnd(existingSpan)
-        if (start >= 0 && end >= 0) {
-            this.removeSpan(existingSpan)
-            val newSpan = URLSpan(newUrl)
-            this.setSpan(newSpan, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+    private fun openLink(url: String) {
+        val uri = Uri.parse(url)
+        val intent = Intent(Intent.ACTION_VIEW, uri)
+        try {
+            startActivity(intent)
+        } catch (exception: Exception) {
+            Toast.makeText(this, R.string.cant_open_link, Toast.LENGTH_LONG).show()
         }
     }
 
-    private fun showUrlInputDialog(urlBefore: String, onSuccess: (newUrl: String?) -> Unit) {
-        val layout = TextInputDialogBinding.inflate(layoutInflater)
-        layout.InputText.setText(urlBefore)
-        MaterialAlertDialogBuilder(this)
-            .setView(layout.root)
-            .setTitle(R.string.edit_link)
-            .setPositiveButton(R.string.save) { _, _ ->
-                val userInput = layout.InputText.text.toString()
-                onSuccess.invoke(userInput)
-            }
-            .setNegativeButton(R.string.cancel) { dialog, _ -> dialog.cancel() }
-            .setNeutralButton(R.string.clear) { dialog, _ ->
-                dialog.cancel()
-                onSuccess.invoke(null)
-            }
-            .show()
-        layout.InputText.requestFocus()
-        showKeyboard(layout.InputText)
-    }
-
-    private fun clearFormatting(
-        start: Int = binding.EnterBody.selectionStart,
-        end: Int = binding.EnterBody.selectionEnd,
-    ) {
-        binding.EnterBody.changeFormatting(start, end) { textStart, textEnd, text ->
-            text.removeSelectionFromSpan(textStart, textEnd)
+    private fun URLSpan.navigateToNote() {
+        val noteId = url.getNoteIdFromUrl()
+        val noteType = url.getNoteTypeFromUrl()
+        when (noteType) {
+            Type.NOTE -> goToActivity(EditNoteActivity::class.java, noteId)
+            Type.LIST -> goToActivity(EditListActivity::class.java, noteId)
         }
     }
 
-    private fun clearFormatting(span: CharacterStyle) {
-        binding.EnterBody.apply {
-            val start = text!!.getSpanStart(span)
-            val end = text!!.getSpanEnd(span)
-            changeFormatting(start, end) { textStart, textEnd, text ->
-                text.removeSelectionFromSpan(textStart, textEnd)
+    private fun URLSpan.showEditDialog() {
+        val displayTextBefore = binding.EnterBody.getSpanText(this)
+        showEditLinkDialog(url, displayTextBefore) { urlAfter, displayTextAfter ->
+            if (urlAfter != null) {
+                binding.EnterBody.updateSpan(
+                    this,
+                    URLSpan(urlAfter),
+                    if (displayTextAfter == displayTextBefore) null else displayTextAfter,
+                )
+            } else {
+                binding.EnterBody.removeSpan(this)
             }
         }
     }
 
-    private fun applySpan(
-        span: Any,
-        start: Int = binding.EnterBody.selectionStart,
-        end: Int = binding.EnterBody.selectionEnd,
-    ) {
-        binding.EnterBody.changeFormatting(start, end) { textStart, textEnd, text ->
-            text.setSpan(span, textStart, textEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-        }
+    private fun goToActivity(activity: Class<out Activity>, noteId: Long) {
+        val intent = Intent(this, activity)
+        intent.putExtra(Constants.SelectedBaseNote, noteId)
+        startActivityForResult(intent, -1)
     }
 
-    private fun EditText.changeFormatting(
-        start: Int = selectionStart,
-        end: Int = selectionEnd,
-        change: (start: Int, end: Int, text: Editable) -> Unit,
+    private fun showEditLinkDialog(
+        urlBefore: String,
+        displayTextBefore: String,
+        onSuccess: (urlAfter: String?, displayTextAfter: String) -> Unit,
     ) {
-        ifBothNotNullAndInvalid(start, end) { textStart, textEnd ->
-            val textBefore = text!!.clone()
-            change(textStart, textEnd, text)
-            val textAfter = text!!.clone()
-            changeHistory.push(
-                EditTextChange(this, textBefore, textAfter, enterBodyTextWatcher) { text ->
-                    model.body = text.clone()
-                }
-            )
-        }
-    }
+        val layout = TextInputDialog2Binding.inflate(layoutInflater)
+        layout.InputText1.apply { setText(displayTextBefore) }
+        layout.InputTextLayout1.setHint(R.string.display_text)
+        layout.InputText2.apply { setText(urlBefore) }
 
-    private fun ifBothNotNullAndInvalid(
-        start: Int?,
-        end: Int?,
-        function: (start: Int, end: Int) -> Unit,
-    ) {
-        if (start != null && start != -1 && end != null && end != -1) {
-            function.invoke(start, end)
-        }
+        layout.InputTextLayout2.setHint(R.string.link)
+        MaterialAlertDialogBuilder(this)
+            .setView(layout.root)
+            .setTitle(R.string.edit_link)
+            .setPositiveButton(R.string.save) { _, _ ->
+                val displayTextAfter = layout.InputText1.text.toString()
+                val urlAfter = layout.InputText2.text.toString()
+                onSuccess.invoke(urlAfter, displayTextAfter)
+            }
+            .setNegativeButton(R.string.cancel) { dialog, _ -> dialog.cancel() }
+            .setNeutralButton(R.string.clear) { dialog, _ ->
+                dialog.cancel()
+                onSuccess.invoke(null, displayTextBefore)
+            }
+            .showAndFocus(layout.InputText2)
     }
 
     companion object {
-
-        fun getURLFrom(text: String): String {
-            return when {
-                text.matches(Patterns.PHONE.toRegex()) -> "tel:$text"
-                text.matches(Patterns.EMAIL_ADDRESS.toRegex()) -> "mailto:$text"
-                text.matches(Patterns.DOMAIN_NAME.toRegex()) -> "http://$text"
-                else -> text
-            }
-        }
+        const val REQUEST_CODE_PICK_NOTE_NEW = 50
+        const val REQUEST_CODE_PICK_NOTE_UPDATE = 51
     }
 }
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/PickNoteActivity.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/PickNoteActivity.kt
new file mode 100644
index 00000000..50ad29de
--- /dev/null
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/PickNoteActivity.kt
@@ -0,0 +1,107 @@
+package com.philkes.notallyx.presentation.activity.note
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.StaggeredGridLayoutManager
+import com.philkes.notallyx.Preferences
+import com.philkes.notallyx.R
+import com.philkes.notallyx.data.NotallyDatabase
+import com.philkes.notallyx.data.model.BaseNote
+import com.philkes.notallyx.data.model.Header
+import com.philkes.notallyx.databinding.ActivityPickNoteBinding
+import com.philkes.notallyx.presentation.activity.LockedActivity
+import com.philkes.notallyx.presentation.view.main.BaseNoteAdapter
+import com.philkes.notallyx.presentation.view.misc.View
+import com.philkes.notallyx.presentation.view.note.listitem.ListItemListener
+import com.philkes.notallyx.presentation.viewmodel.BaseNoteModel
+import com.philkes.notallyx.utils.IO.getExternalImagesDirectory
+import java.util.Collections
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+open class PickNoteActivity : LockedActivity<ActivityPickNoteBinding>(), ListItemListener {
+
+    protected lateinit var adapter: BaseNoteAdapter
+
+    private val excludedNoteId by lazy { intent.getLongExtra(EXCLUDE_NOTE_ID, -1L) }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityPickNoteBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        val result = Intent()
+        setResult(RESULT_CANCELED, result)
+
+        val preferences = Preferences.getInstance(application)
+
+        adapter =
+            with(preferences) {
+                BaseNoteAdapter(
+                    Collections.emptySet(),
+                    dateFormat.value,
+                    notesSorting.value.first,
+                    textSize.value,
+                    maxItems,
+                    maxLines,
+                    maxTitle,
+                    application.getExternalImagesDirectory(),
+                    this@PickNoteActivity,
+                )
+            }
+
+        binding.RecyclerView.apply {
+            adapter = this@PickNoteActivity.adapter
+            setHasFixedSize(true)
+            layoutManager =
+                if (preferences.view.value == View.grid) {
+                    StaggeredGridLayoutManager(2, RecyclerView.VERTICAL)
+                } else LinearLayoutManager(this@PickNoteActivity)
+        }
+
+        val database = NotallyDatabase.getDatabase(application)
+
+        val pinned = Header(getString(R.string.pinned))
+        val others = Header(getString(R.string.others))
+
+        database.observe(this) {
+            lifecycleScope.launch {
+                val notes =
+                    withContext(Dispatchers.IO) {
+                        val raw =
+                            it.getBaseNoteDao().getAllNotes().filter { it.id != excludedNoteId }
+                        BaseNoteModel.transform(raw, pinned, others)
+                    }
+                adapter.submitList(notes)
+                binding.EmptyView.visibility =
+                    if (notes.isEmpty()) android.view.View.VISIBLE else android.view.View.GONE
+            }
+        }
+    }
+
+    override fun onClick(position: Int) {
+        if (position != -1) {
+            val note = (adapter.getItem(position) as BaseNote)
+            val success = Intent()
+            success.putExtra(PICKED_NOTE_ID, note.id)
+            success.putExtra(PICKED_NOTE_TITLE, note.title)
+            success.putExtra(PICKED_NOTE_TYPE, note.type.name)
+            setResult(RESULT_OK, success)
+            finish()
+        }
+    }
+
+    override fun onLongClick(position: Int) {}
+
+    companion object {
+        const val EXCLUDE_NOTE_ID = "EXCLUDE_NOTE_ID"
+
+        const val PICKED_NOTE_ID = "PICKED_NOTE_ID"
+        const val PICKED_NOTE_TITLE = "PICKED_NOTE_TITLE"
+        const val PICKED_NOTE_TYPE = "PICKED_NOTE_TYPE"
+    }
+}
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/PlayAudioActivity.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/PlayAudioActivity.kt
index 2bf868a5..5495ad63 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/PlayAudioActivity.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/PlayAudioActivity.kt
@@ -14,8 +14,8 @@ import com.philkes.notallyx.R
 import com.philkes.notallyx.data.model.Audio
 import com.philkes.notallyx.databinding.ActivityPlayAudioBinding
 import com.philkes.notallyx.presentation.activity.LockedActivity
+import com.philkes.notallyx.presentation.add
 import com.philkes.notallyx.utils.IO.getExternalAudioDirectory
-import com.philkes.notallyx.utils.add
 import com.philkes.notallyx.utils.audio.AudioPlayService
 import com.philkes.notallyx.utils.audio.LocalBinder
 import java.io.File
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/SelectLabelsActivity.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/SelectLabelsActivity.kt
index a75d97df..1f247d1a 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/SelectLabelsActivity.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/SelectLabelsActivity.kt
@@ -13,9 +13,10 @@ import com.philkes.notallyx.data.model.Label
 import com.philkes.notallyx.databinding.ActivityLabelBinding
 import com.philkes.notallyx.databinding.DialogInputBinding
 import com.philkes.notallyx.presentation.activity.LockedActivity
+import com.philkes.notallyx.presentation.add
+import com.philkes.notallyx.presentation.showAndFocus
 import com.philkes.notallyx.presentation.view.main.SelectableLabelAdapter
 import com.philkes.notallyx.presentation.viewmodel.LabelModel
-import com.philkes.notallyx.utils.add
 
 class SelectLabelsActivity : LockedActivity<ActivityLabelBinding>() {
 
@@ -70,9 +71,7 @@ class SelectLabelsActivity : LockedActivity<ActivityLabelBinding>() {
                     }
                 }
             }
-            .show()
-
-        binding.EditText.requestFocus()
+            .showAndFocus(binding.EditText)
     }
 
     private fun setupRecyclerView() {
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/ViewImageActivity.kt b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/ViewImageActivity.kt
index 7af99bb4..78a16718 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/activity/note/ViewImageActivity.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/activity/note/ViewImageActivity.kt
@@ -17,10 +17,10 @@ import com.philkes.notallyx.data.model.Converters
 import com.philkes.notallyx.data.model.FileAttachment
 import com.philkes.notallyx.databinding.ActivityViewImageBinding
 import com.philkes.notallyx.presentation.activity.LockedActivity
+import com.philkes.notallyx.presentation.add
 import com.philkes.notallyx.presentation.view.Constants
 import com.philkes.notallyx.presentation.view.note.image.ImageAdapter
 import com.philkes.notallyx.utils.IO.getExternalImagesDirectory
-import com.philkes.notallyx.utils.add
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/view/main/BaseNoteVH.kt b/app/src/main/java/com/philkes/notallyx/presentation/view/main/BaseNoteVH.kt
index 795fc5d7..82910064 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/view/main/BaseNoteVH.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/view/main/BaseNoteVH.kt
@@ -24,15 +24,15 @@ import com.philkes.notallyx.data.model.ListItem
 import com.philkes.notallyx.data.model.SpanRepresentation
 import com.philkes.notallyx.data.model.Type
 import com.philkes.notallyx.databinding.RecyclerBaseNoteBinding
+import com.philkes.notallyx.presentation.applySpans
+import com.philkes.notallyx.presentation.displayFormattedTimestamp
+import com.philkes.notallyx.presentation.dp
+import com.philkes.notallyx.presentation.getQuantityString
 import com.philkes.notallyx.presentation.view.misc.NotesSorting.autoSortByCreationDate
 import com.philkes.notallyx.presentation.view.misc.NotesSorting.autoSortByModifiedDate
 import com.philkes.notallyx.presentation.view.misc.TextSize
 import com.philkes.notallyx.presentation.view.note.listitem.ListItemListener
 import com.philkes.notallyx.utils.Operations
-import com.philkes.notallyx.utils.applySpans
-import com.philkes.notallyx.utils.displayFormattedTimestamp
-import com.philkes.notallyx.utils.dp
-import com.philkes.notallyx.utils.getQuantityString
 import java.io.File
 
 class BaseNoteVH(
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/view/misc/EditTextWithHistory.kt b/app/src/main/java/com/philkes/notallyx/presentation/view/misc/EditTextWithHistory.kt
new file mode 100644
index 00000000..33c08165
--- /dev/null
+++ b/app/src/main/java/com/philkes/notallyx/presentation/view/misc/EditTextWithHistory.kt
@@ -0,0 +1,193 @@
+package com.philkes.notallyx.presentation.view.misc
+
+import android.content.Context
+import android.text.Editable
+import android.text.Spanned
+import android.text.TextWatcher
+import android.text.style.CharacterStyle
+import android.text.style.URLSpan
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatEditText
+import com.philkes.notallyx.data.model.isNoteUrl
+import com.philkes.notallyx.data.model.isWebUrl
+import com.philkes.notallyx.presentation.clone
+import com.philkes.notallyx.presentation.createTextWatcherWithHistory
+import com.philkes.notallyx.presentation.removeSelectionFromSpan
+import com.philkes.notallyx.utils.changehistory.ChangeHistory
+import com.philkes.notallyx.utils.changehistory.EditTextWithHistoryChange
+
+/**
+ * [AppCompatEditText] whose changes (text edits or span changes) are pushed to [changeHistory].
+ * *
+ */
+class EditTextWithHistory(context: Context, attrs: AttributeSet) :
+    AppCompatEditText(context, attrs) {
+
+    var isActionModeOn = false
+    private var changeHistory: ChangeHistory? = null
+    private var updateModel: ((text: Editable) -> Unit)? = null
+    private var textWatcher: TextWatcher? = null
+
+    /**
+     * If this is called every future text or span change is pushed to [changeHistory].
+     *
+     * @param updateModel Function that is called when undo/redo of [changeHistory] is triggered *
+     */
+    fun initHistory(changeHistory: ChangeHistory, updateModel: (text: Editable) -> Unit) {
+        this.textWatcher?.let { removeTextChangedListener(it) }
+        this.changeHistory = changeHistory
+        this.updateModel = updateModel
+        this.textWatcher =
+            createTextWatcherWithHistory(
+                changeHistory,
+                { text, start, count ->
+                    val changedText = text.substring(start, start + count)
+                    if (changedText.isWebUrl() || changedText.isNoteUrl()) {
+                        this.text?.setSpan(
+                            URLSpan(changedText),
+                            start,
+                            start + count,
+                            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE,
+                        )
+                    }
+                },
+            ) { text: Editable ->
+                updateModel(text.clone())
+            }
+        this.textWatcher?.let { addTextChangedListener(it) }
+    }
+
+    override fun onWindowFocusChanged(hasWindowFocus: Boolean) {
+        if (!isActionModeOn) {
+            super.onWindowFocusChanged(hasWindowFocus)
+        }
+    }
+
+    @Deprecated(
+        "You should not access text Editable directly, use other member functions to edit/read text properties.",
+        replaceWith = ReplaceWith("changeText/applyWithoutTextWatcher/..."),
+    )
+    override fun getText(): Editable? {
+        return super.getText()
+    }
+
+    fun getTextClone(): Editable {
+        return super.getText()!!.clone()
+    }
+
+    override fun setText(text: CharSequence?, type: BufferType?) {
+        applyWithoutTextWatcher { super.setText(text, type) }
+    }
+
+    fun applyWithoutTextWatcher(
+        callback: EditTextWithHistory.() -> Unit
+    ): Pair<Editable, Editable> {
+        val textBefore = super.getText()!!.clone()
+        val editTextWatcher = textWatcher
+        editTextWatcher?.let { removeTextChangedListener(it) }
+        callback()
+        editTextWatcher?.let { addTextChangedListener(it) }
+        return Pair(textBefore, super.getText()!!.clone())
+    }
+
+    fun getSpanRange(span: CharacterStyle): Pair<Int, Int> {
+        val text = super.getText()!!
+        return Pair(text.getSpanStart(span), text.getSpanEnd(span))
+    }
+
+    fun getSpanText(span: CharacterStyle): String {
+        val (spanStart, spanEnd) = getSpanRange(span)
+        return super.getText()!!.substring(spanStart, spanEnd)
+    }
+
+    fun getSelectionText(): String? {
+        if (selectionStart == -1 || selectionEnd == -1) {
+            return null
+        }
+        return super.getText()!!.substring(selectionStart, selectionEnd)
+    }
+
+    fun clearFormatting(start: Int = selectionStart, end: Int = selectionEnd) {
+        changeTextWithHistory { text -> text.removeSelectionFromSpan(start, end) }
+    }
+
+    /**
+     * Removes [span] from `text`.
+     *
+     * @param removeText if this is `true` the text of the [span] is removed from `text`.
+     */
+    fun removeSpan(span: CharacterStyle, removeText: Boolean = false) {
+        val (start, end) = getSpanRange(span)
+        changeTextWithHistory { text ->
+            text.removeSelectionFromSpan(start, end)
+            if (removeText) {
+                text.delete(start, end)
+            }
+        }
+    }
+
+    fun addSpan(spanText: String, span: CharacterStyle, position: Int = selectionStart) {
+        changeTextWithHistory { text ->
+            text.insert(position, spanText)
+            text.setSpan(
+                span,
+                position,
+                position + spanText.length,
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE,
+            )
+        }
+    }
+
+    /**
+     * Replaces [oldSpan] with [newSpan].
+     *
+     * @param spanText if this is not `null`, the spans text is also updated,
+     */
+    fun updateSpan(oldSpan: CharacterStyle, newSpan: CharacterStyle, spanText: String?) {
+        val (oldSpanStart, oldSpanEnd) = getSpanRange(oldSpan)
+        changeTextWithHistory { text ->
+            text.removeSpan(oldSpan)
+            if (spanText != null) {
+                text.replace(oldSpanStart, oldSpanEnd, spanText)
+                text.setSpan(
+                    newSpan,
+                    oldSpanStart,
+                    oldSpanStart + spanText.length,
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE,
+                )
+            } else {
+                text.setSpan(newSpan, oldSpanStart, oldSpanEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+            }
+        }
+    }
+
+    fun applySpan(span: CharacterStyle, start: Int = selectionStart, end: Int = selectionEnd) {
+        changeTextWithHistory { text ->
+            text.setSpan(span, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+        }
+    }
+
+    /**
+     * Can be used to change `text` with according [EditTextWithHistoryChange] pushed automatically
+     * to [changeHistory]. This method is used by all other members functions.
+     */
+    fun changeTextWithHistory(callback: (text: Editable) -> Unit) {
+        val (textBefore, textAfter) = changeText(callback)
+        updateModel?.invoke(textAfter.clone())
+        changeHistory?.push(
+            EditTextWithHistoryChange(this, textBefore, textAfter) { text ->
+                updateModel?.invoke(text.clone())
+            }
+        )
+    }
+
+    /**
+     * Can be used to change `text` without triggering the [TextWatcher], which would push a
+     * [EditTextWithHistoryChange] to [changeHistory].
+     *
+     * @return Clones of `text` before the changes and `text` after. *
+     */
+    fun changeText(callback: (text: Editable) -> Unit): Pair<Editable, Editable> {
+        return applyWithoutTextWatcher { callback(super.getText()!!) }
+    }
+}
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/view/misc/OverflowEditText.kt b/app/src/main/java/com/philkes/notallyx/presentation/view/misc/OverflowEditText.kt
deleted file mode 100644
index 6246b4e2..00000000
--- a/app/src/main/java/com/philkes/notallyx/presentation/view/misc/OverflowEditText.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.philkes.notallyx.presentation.view.misc
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.appcompat.widget.AppCompatEditText
-
-/**
- * Implementation that fixes a bug in Lollipop where clicking on the overflow icon in the custom
- * text selection mode causes it to end. For more information, see this ->
- * https://issuetracker.google.com/issues/36937508
- */
-class OverflowEditText(context: Context, attrs: AttributeSet) : AppCompatEditText(context, attrs) {
-
-    var isActionModeOn = false
-
-    override fun onWindowFocusChanged(hasWindowFocus: Boolean) {
-        if (!isActionModeOn) {
-            super.onWindowFocusChanged(hasWindowFocus)
-        }
-    }
-}
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/view/note/listitem/ListItemVH.kt b/app/src/main/java/com/philkes/notallyx/presentation/view/note/listitem/ListItemVH.kt
index d31a42b2..ef1847e6 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/view/note/listitem/ListItemVH.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/view/note/listitem/ListItemVH.kt
@@ -12,11 +12,11 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import com.philkes.notallyx.data.model.ListItem
 import com.philkes.notallyx.databinding.RecyclerListItemBinding
+import com.philkes.notallyx.presentation.createListTextWatcherWithHistory
+import com.philkes.notallyx.presentation.setOnNextAction
 import com.philkes.notallyx.presentation.view.misc.ListItemSorting
 import com.philkes.notallyx.presentation.view.misc.SwipeLayout.SwipeActionsListener
 import com.philkes.notallyx.presentation.view.misc.TextSize
-import com.philkes.notallyx.utils.createListTextWatcherWithHistory
-import com.philkes.notallyx.utils.setOnNextAction
 
 class ListItemVH(
     val binding: RecyclerListItemBinding,
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/BaseNoteModel.kt b/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/BaseNoteModel.kt
index d1de845e..31c5f711 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/BaseNoteModel.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/BaseNoteModel.kt
@@ -32,6 +32,7 @@ import com.philkes.notallyx.data.model.Item
 import com.philkes.notallyx.data.model.Label
 import com.philkes.notallyx.data.model.SearchResult
 import com.philkes.notallyx.data.model.Type
+import com.philkes.notallyx.presentation.applySpans
 import com.philkes.notallyx.presentation.view.misc.AutoBackup
 import com.philkes.notallyx.presentation.view.misc.ListInfo
 import com.philkes.notallyx.presentation.view.misc.SeekbarInfo
@@ -44,7 +45,6 @@ import com.philkes.notallyx.utils.IO.getExternalAudioDirectory
 import com.philkes.notallyx.utils.IO.getExternalFilesDirectory
 import com.philkes.notallyx.utils.IO.getExternalImagesDirectory
 import com.philkes.notallyx.utils.Operations
-import com.philkes.notallyx.utils.applySpans
 import com.philkes.notallyx.utils.backup.BackupProgress
 import com.philkes.notallyx.utils.backup.Export.exportAsZip
 import com.philkes.notallyx.utils.backup.Import.importZip
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/NotallyModel.kt b/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/NotallyModel.kt
index 3db4e146..f851a0d3 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/NotallyModel.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/viewmodel/NotallyModel.kt
@@ -36,13 +36,13 @@ import com.philkes.notallyx.data.model.Folder
 import com.philkes.notallyx.data.model.ListItem
 import com.philkes.notallyx.data.model.SpanRepresentation
 import com.philkes.notallyx.data.model.Type
+import com.philkes.notallyx.presentation.applySpans
 import com.philkes.notallyx.presentation.view.misc.BetterLiveData
 import com.philkes.notallyx.presentation.widget.WidgetProvider
 import com.philkes.notallyx.utils.Cache
 import com.philkes.notallyx.utils.Event
 import com.philkes.notallyx.utils.FileError
 import com.philkes.notallyx.utils.FileProgress
-import com.philkes.notallyx.utils.IO
 import com.philkes.notallyx.utils.IO.copyToFile
 import com.philkes.notallyx.utils.IO.getExternalAudioDirectory
 import com.philkes.notallyx.utils.IO.getExternalFilesDirectory
@@ -50,7 +50,6 @@ import com.philkes.notallyx.utils.IO.getExternalImagesDirectory
 import com.philkes.notallyx.utils.IO.getTempAudioFile
 import com.philkes.notallyx.utils.IO.rename
 import com.philkes.notallyx.utils.Operations
-import com.philkes.notallyx.utils.applySpans
 import java.io.File
 import java.io.FileInputStream
 import java.util.UUID
diff --git a/app/src/main/java/com/philkes/notallyx/presentation/widget/WidgetFactory.kt b/app/src/main/java/com/philkes/notallyx/presentation/widget/WidgetFactory.kt
index 5d178ee9..69ab82ef 100644
--- a/app/src/main/java/com/philkes/notallyx/presentation/widget/WidgetFactory.kt
+++ b/app/src/main/java/com/philkes/notallyx/presentation/widget/WidgetFactory.kt
@@ -13,6 +13,7 @@ import com.philkes.notallyx.R
 import com.philkes.notallyx.data.NotallyDatabase
 import com.philkes.notallyx.data.model.BaseNote
 import com.philkes.notallyx.data.model.Type
+import com.philkes.notallyx.presentation.displayFormattedTimestamp
 import com.philkes.notallyx.presentation.view.misc.TextSize
 import com.philkes.notallyx.presentation.widget.WidgetProvider.Companion.getSelectNoteIntent
 
diff --git a/app/src/main/java/com/philkes/notallyx/utils/changehistory/EditTextChange.kt b/app/src/main/java/com/philkes/notallyx/utils/changehistory/EditTextChange.kt
deleted file mode 100644
index 145a7734..00000000
--- a/app/src/main/java/com/philkes/notallyx/utils/changehistory/EditTextChange.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.philkes.notallyx.utils.changehistory
-
-import android.text.Editable
-import android.text.TextWatcher
-import android.widget.EditText
-
-class EditTextChange(
-    private val editText: EditText,
-    textBefore: Editable,
-    textAfter: Editable,
-    private val listener: TextWatcher,
-    private val updateModel: (newValue: Editable) -> Unit,
-) : ValueChange<Editable>(textAfter, textBefore) {
-
-    private val cursorPosition = editText.selectionStart
-
-    override fun update(value: Editable, isUndo: Boolean) {
-        editText.removeTextChangedListener(listener)
-        updateModel.invoke(value)
-        editText.text = value
-        editText.requestFocus()
-        editText.setSelection(Math.min(value.length, cursorPosition + (if (isUndo) 1 else 0)))
-        editText.addTextChangedListener(listener)
-    }
-}
diff --git a/app/src/main/java/com/philkes/notallyx/utils/changehistory/EditTextWithHistoryChange.kt b/app/src/main/java/com/philkes/notallyx/utils/changehistory/EditTextWithHistoryChange.kt
new file mode 100644
index 00000000..3be2cf6b
--- /dev/null
+++ b/app/src/main/java/com/philkes/notallyx/utils/changehistory/EditTextWithHistoryChange.kt
@@ -0,0 +1,23 @@
+package com.philkes.notallyx.utils.changehistory
+
+import android.text.Editable
+import com.philkes.notallyx.presentation.view.misc.EditTextWithHistory
+
+class EditTextWithHistoryChange(
+    private val editText: EditTextWithHistory,
+    textBefore: Editable,
+    textAfter: Editable,
+    private val updateModel: (newValue: Editable) -> Unit,
+) : ValueChange<Editable>(textAfter, textBefore) {
+
+    private val cursorPosition = editText.selectionStart
+
+    override fun update(value: Editable, isUndo: Boolean) {
+        editText.applyWithoutTextWatcher {
+            text = value
+            updateModel.invoke(value)
+            requestFocus()
+            setSelection(Math.min(value.length, cursorPosition + (if (isUndo) 1 else 0)))
+        }
+    }
+}
diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml
index 446619b0..bd7b74c6 100644
--- a/app/src/main/res/layout/activity_edit.xml
+++ b/app/src/main/res/layout/activity_edit.xml
@@ -62,7 +62,7 @@
                     />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <EditText
+            <com.philkes.notallyx.presentation.view.misc.EditTextWithHistory
                 android:id="@+id/EnterTitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -102,7 +102,7 @@
                 android:layout_height="1dp"
                 android:background="?android:attr/listDivider" />
 
-            <com.philkes.notallyx.presentation.view.misc.OverflowEditText
+            <com.philkes.notallyx.presentation.view.misc.EditTextWithHistory
                 android:id="@+id/EnterBody"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_configure_widget.xml b/app/src/main/res/layout/activity_pick_note.xml
similarity index 79%
rename from app/src/main/res/layout/activity_configure_widget.xml
rename to app/src/main/res/layout/activity_pick_note.xml
index 24f7f116..b42b5e2c 100644
--- a/app/src/main/res/layout/activity_configure_widget.xml
+++ b/app/src/main/res/layout/activity_pick_note.xml
@@ -10,6 +10,14 @@
         android:layout_height="wrap_content"
         app:title="@string/select_note" />
 
+    <TextView
+      android:id="@+id/EmptyView"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:text="@string/empty_list"
+      android:gravity="center"
+      android:visibility="gone"/>
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/RecyclerView"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/text_input_dialog_2.xml b/app/src/main/res/layout/text_input_dialog_2.xml
new file mode 100644
index 00000000..67aa05c6
--- /dev/null
+++ b/app/src/main/res/layout/text_input_dialog_2.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:paddingTop="8dp"
+  android:paddingStart="24dp"
+  android:paddingEnd="24dp"
+  android:orientation="vertical">
+
+    <TextView
+      android:id="@+id/Message"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
+      android:visibility="gone" />
+
+    <com.google.android.material.textfield.TextInputLayout
+      android:id="@+id/InputTextLayout1"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense">
+
+        <EditText
+          android:id="@+id/InputText1"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="12dp"
+          android:paddingBottom="8dp"
+          android:maxLines="1"
+          android:layout_gravity="center_horizontal"
+          android:singleLine="true"
+          android:scrollHorizontally="true"
+          android:textSize="16sp"/>
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+      android:id="@+id/InputTextLayout2"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+      android:layout_marginTop="16dp">
+
+        <EditText
+          android:id="@+id/InputText2"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="12dp"
+          android:paddingBottom="8dp"
+          android:maxLines="1"
+          android:layout_gravity="center_horizontal"
+          android:singleLine="true"
+          android:scrollHorizontally="true"
+          android:textSize="16sp"/>
+    </com.google.android.material.textfield.TextInputLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cc9b868c..0753b284 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -45,6 +45,8 @@
     <string name="clear">Clear</string>
     <string name="continue_">Continue</string>
     <string name="open_link">Open link</string>
+    <string name="open_note">Open Note</string>
+    <string name="display_text">Text to display</string>
     <string name="make_list">Make list</string>
     <string name="take_note">Take note</string>
     <string name="add_label">Add label</string>
@@ -94,6 +96,9 @@
     <string name="drag_handle">Drag Handle</string>
     <string name="bold">Bold</string>
     <string name="link">Link</string>
+    <string name="link_note">Link Note</string>
+    <string name="change_note">Change Note</string>
+    <string name="remove_link">Remove Link</string>
     <string name="italic">Italic</string>
     <string name="strikethrough">Strikethrough</string>
     <string name="clear_formatting">Clear formatting</string>