diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1104ba86..4c267042 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -201,7 +201,7 @@
             android:name=".others.imagesearch.ImageSearchActivity"
             android:parentActivityName=".MainActivity" />
         <activity
-            android:name=".util.MarkdownCreatorActivity"
+            android:name=".util.ActivityMarkdownCreator"
             android:windowSoftInputMode="adjustResize" />
         <activity android:name=".parsers.ParserTestActivity" />
         <activity
diff --git a/app/src/main/java/ani/dantotsu/Functions.kt b/app/src/main/java/ani/dantotsu/Functions.kt
index 04b83f52..abfebb3a 100644
--- a/app/src/main/java/ani/dantotsu/Functions.kt
+++ b/app/src/main/java/ani/dantotsu/Functions.kt
@@ -854,7 +854,7 @@ fun savePrefsToDownloads(
         }
     )
 }
-
+@SuppressLint("StringFormatMatches")
 fun savePrefs(serialized: String, path: String, title: String, context: Context): File? {
     var file = File(path, "$title.ani")
     var counter = 1
@@ -874,6 +874,7 @@ fun savePrefs(serialized: String, path: String, title: String, context: Context)
     }
 }
 
+@SuppressLint("StringFormatMatches")
 fun savePrefs(
     serialized: String,
     path: String,
@@ -920,7 +921,7 @@ fun shareImage(title: String, bitmap: Bitmap, context: Context) {
     intent.putExtra(Intent.EXTRA_STREAM, contentUri)
     context.startActivity(Intent.createChooser(intent, "Share $title"))
 }
-
+@SuppressLint("StringFormatMatches")
 fun saveImage(image: Bitmap, path: String, imageFileName: String): File? {
     val imageFile = File(path, "$imageFileName.png")
     return try {
@@ -1500,7 +1501,6 @@ fun buildMarkwon(
                         }
                         return false
                     }
-
                     override fun onLoadFailed(
                         e: GlideException?,
                         model: Any?,
diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistMutations.kt b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistMutations.kt
index 1ddfbbaa..3d7ac85e 100644
--- a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistMutations.kt
+++ b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistMutations.kt
@@ -93,30 +93,41 @@ class AnilistMutations {
         )
     }
 
-    suspend fun postActivity(text: String, edit : Int? = null): String {
+    suspend fun postActivity(text: String, edit: Int? = null): String {
         val encodedText = text.stringSanitizer()
-        val query = "mutation{SaveTextActivity(${if (edit != null) "id:$edit," else ""} text:$encodedText){siteUrl}}"
+        val query =
+            "mutation{SaveTextActivity(${if (edit != null) "id:$edit," else ""} text:$encodedText){siteUrl}}"
         val result = executeQuery<JsonObject>(query)
         val errors = result?.get("errors")
         return errors?.toString()
             ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
     }
-    suspend fun postMessage(userId: Int, text: String, edit: Int? = null,isPrivate: Boolean = false): String {
-        val encodedText = text.replace("","").stringSanitizer()
-        val query = "mutation{SaveMessageActivity(${if (edit != null) "id:$edit," else ""} recipientId:$userId,message:$encodedText,private:$isPrivate){id}}"
+
+    suspend fun postMessage(
+        userId: Int,
+        text: String,
+        edit: Int? = null,
+        isPrivate: Boolean = false
+    ): String {
+        val encodedText = text.replace("", "").stringSanitizer()
+        val query =
+            "mutation{SaveMessageActivity(${if (edit != null) "id:$edit," else ""} recipientId:$userId,message:$encodedText,private:$isPrivate){id}}"
         val result = executeQuery<JsonObject>(query)
         val errors = result?.get("errors")
         return errors?.toString()
             ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
     }
-    suspend fun postReply(activityId: Int, text: String, edit: Int? = null ): String {
+
+    suspend fun postReply(activityId: Int, text: String, edit: Int? = null): String {
         val encodedText = text.stringSanitizer()
-        val query = "mutation{SaveActivityReply(${if (edit != null) "id:$edit," else ""} activityId:$activityId,text:$encodedText){id}}"
+        val query =
+            "mutation{SaveActivityReply(${if (edit != null) "id:$edit," else ""} activityId:$activityId,text:$encodedText){id}}"
         val result = executeQuery<JsonObject>(query)
         val errors = result?.get("errors")
         return errors?.toString()
             ?: (currContext()?.getString(ani.dantotsu.R.string.success) ?: "Success")
     }
+
     suspend fun postReview(summary: String, body: String, mediaId: Int, score: Int): String {
         val encodedSummary = summary.stringSanitizer()
         val encodedBody = body.stringSanitizer()
@@ -143,7 +154,6 @@ class AnilistMutations {
     }
 
 
-
     private fun String.stringSanitizer(): String {
         val sb = StringBuilder()
         var i = 0
diff --git a/app/src/main/java/ani/dantotsu/home/status/RepliesBottomDialog.kt b/app/src/main/java/ani/dantotsu/home/status/RepliesBottomDialog.kt
index 218bf7fe..44a11baf 100644
--- a/app/src/main/java/ani/dantotsu/home/status/RepliesBottomDialog.kt
+++ b/app/src/main/java/ani/dantotsu/home/status/RepliesBottomDialog.kt
@@ -16,10 +16,9 @@ import ani.dantotsu.databinding.BottomSheetRecyclerBinding
 import ani.dantotsu.profile.ProfileActivity
 import ani.dantotsu.profile.activity.ActivityReplyItem
 import ani.dantotsu.snackString
-import ani.dantotsu.util.MarkdownCreatorActivity
+import ani.dantotsu.util.ActivityMarkdownCreator
 import com.xwray.groupie.GroupieAdapter
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
@@ -50,7 +49,7 @@ class RepliesBottomDialog : BottomSheetDialogFragment() {
         binding.replyButton.setOnClickListener {
             ContextCompat.startActivity(
                 context,
-                Intent(context, MarkdownCreatorActivity::class.java)
+                Intent(context, ActivityMarkdownCreator::class.java)
                     .putExtra("type", "replyActivity")
                     .putExtra("parentId", activityId),
                 null
diff --git a/app/src/main/java/ani/dantotsu/home/status/UserStatusAdapter.kt b/app/src/main/java/ani/dantotsu/home/status/UserStatusAdapter.kt
index 8aa02104..c8db4c99 100644
--- a/app/src/main/java/ani/dantotsu/home/status/UserStatusAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/home/status/UserStatusAdapter.kt
@@ -1,6 +1,5 @@
 package ani.dantotsu.home.status
 
-import android.content.Context
 import android.content.Intent
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -16,7 +15,7 @@ import ani.dantotsu.profile.User
 import ani.dantotsu.setAnimation
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.snackString
-import ani.dantotsu.util.MarkdownCreatorActivity
+import ani.dantotsu.util.ActivityMarkdownCreator
 
 class UserStatusAdapter(private val user: ArrayList<User>) :
     RecyclerView.Adapter<UserStatusAdapter.UsersViewHolder>() {
@@ -43,7 +42,7 @@ class UserStatusAdapter(private val user: ArrayList<User>) :
                 if (user[bindingAdapterPosition].id == Anilist.userid) {
                     ContextCompat.startActivity(
                         itemView.context,
-                        Intent(itemView.context, MarkdownCreatorActivity::class.java)
+                        Intent(itemView.context, ActivityMarkdownCreator::class.java)
                             .putExtra("type", "activity"),
                         null
                     )
diff --git a/app/src/main/java/ani/dantotsu/media/ReviewActivity.kt b/app/src/main/java/ani/dantotsu/media/ReviewActivity.kt
index 6b08734c..0f6d0e4f 100644
--- a/app/src/main/java/ani/dantotsu/media/ReviewActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/ReviewActivity.kt
@@ -3,7 +3,6 @@ package ani.dantotsu.media
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
-import android.text.SpannableString
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
@@ -21,7 +20,7 @@ import ani.dantotsu.initActivity
 import ani.dantotsu.navBarHeight
 import ani.dantotsu.statusBarHeight
 import ani.dantotsu.themes.ThemeManager
-import ani.dantotsu.util.MarkdownCreatorActivity
+import ani.dantotsu.util.ActivityMarkdownCreator
 import com.xwray.groupie.GroupieAdapter
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -59,7 +58,7 @@ class ReviewActivity : AppCompatActivity() {
         binding.followFilterButton.setOnClickListener {
             ContextCompat.startActivity(
                 this,
-                Intent(this, MarkdownCreatorActivity::class.java)
+                Intent(this, ActivityMarkdownCreator::class.java)
                     .putExtra("type", "review"),
                 null
             )
diff --git a/app/src/main/java/ani/dantotsu/profile/ProfileActivity.kt b/app/src/main/java/ani/dantotsu/profile/ProfileActivity.kt
index 29ac59d4..856dc0b8 100644
--- a/app/src/main/java/ani/dantotsu/profile/ProfileActivity.kt
+++ b/app/src/main/java/ani/dantotsu/profile/ProfileActivity.kt
@@ -38,7 +38,6 @@ import ani.dantotsu.snackString
 import ani.dantotsu.statusBarHeight
 import ani.dantotsu.themes.ThemeManager
 import ani.dantotsu.toast
-import ani.dantotsu.util.MarkdownCreatorActivity
 import com.google.android.material.appbar.AppBarLayout
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/ani/dantotsu/profile/activity/ActivityFragment.kt b/app/src/main/java/ani/dantotsu/profile/activity/ActivityFragment.kt
index ce647f15..fa7826b7 100644
--- a/app/src/main/java/ani/dantotsu/profile/activity/ActivityFragment.kt
+++ b/app/src/main/java/ani/dantotsu/profile/activity/ActivityFragment.kt
@@ -19,8 +19,7 @@ import ani.dantotsu.databinding.FragmentFeedBinding
 import ani.dantotsu.media.MediaDetailsActivity
 import ani.dantotsu.navBarHeight
 import ani.dantotsu.profile.ProfileActivity
-import ani.dantotsu.setBaseline
-import ani.dantotsu.util.MarkdownCreatorActivity
+import ani.dantotsu.util.ActivityMarkdownCreator
 import com.xwray.groupie.GroupieAdapter
 import eu.kanade.tachiyomi.util.system.getSerializableCompat
 import kotlinx.coroutines.launch
@@ -53,14 +52,14 @@ class ActivityFragment : Fragment() {
             if(userId == Anilist.userid) {
                 ContextCompat.startActivity(
                     requireContext(),
-                    Intent(context, MarkdownCreatorActivity::class.java)
+                    Intent(context, ActivityMarkdownCreator::class.java)
                         .putExtra("type", "activity"),
                     null
                 )
             } else{
                 ContextCompat.startActivity(
                     requireContext(),
-                    Intent(context, MarkdownCreatorActivity::class.java)
+                    Intent(context, ActivityMarkdownCreator::class.java)
                         .putExtra("type", "message")
                         .putExtra("userId", userId),
 
diff --git a/app/src/main/java/ani/dantotsu/profile/activity/ActivityItem.kt b/app/src/main/java/ani/dantotsu/profile/activity/ActivityItem.kt
index 9dd423da..22cf432b 100644
--- a/app/src/main/java/ani/dantotsu/profile/activity/ActivityItem.kt
+++ b/app/src/main/java/ani/dantotsu/profile/activity/ActivityItem.kt
@@ -5,7 +5,6 @@ import android.view.View
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
-import androidx.recyclerview.widget.LinearLayoutManager
 import ani.dantotsu.R
 import ani.dantotsu.blurImage
 import ani.dantotsu.buildMarkwon
@@ -19,7 +18,7 @@ import ani.dantotsu.profile.UsersDialogFragment
 import ani.dantotsu.setAnimation
 import ani.dantotsu.snackString
 import ani.dantotsu.util.AniMarkdown.Companion.getBasicAniHTML
-import ani.dantotsu.util.MarkdownCreatorActivity
+import ani.dantotsu.util.ActivityMarkdownCreator
 import com.xwray.groupie.GroupieAdapter
 import com.xwray.groupie.viewbinding.BindableItem
 import kotlinx.coroutines.CoroutineScope
@@ -152,7 +151,7 @@ class ActivityItem(
                 binding.activityEdit.setOnClickListener {
                     ContextCompat.startActivity(
                         context,
-                        Intent(context, MarkdownCreatorActivity::class.java)
+                        Intent(context, ActivityMarkdownCreator::class.java)
                             .putExtra("type", "activity")
                             .putExtra("other", activity.text)
                             .putExtra("edit", activity.id),
@@ -183,7 +182,7 @@ class ActivityItem(
                 binding.activityEdit.setOnClickListener {
                     ContextCompat.startActivity(
                         context,
-                        Intent(context, MarkdownCreatorActivity::class.java)
+                        Intent(context, ActivityMarkdownCreator::class.java)
                             .putExtra("type", "message")
                             .putExtra("other", activity.message)
                             .putExtra("edit", activity.id)
diff --git a/app/src/main/java/ani/dantotsu/profile/activity/ActivityReplyItem.kt b/app/src/main/java/ani/dantotsu/profile/activity/ActivityReplyItem.kt
index 1f9039d1..073ada94 100644
--- a/app/src/main/java/ani/dantotsu/profile/activity/ActivityReplyItem.kt
+++ b/app/src/main/java/ani/dantotsu/profile/activity/ActivityReplyItem.kt
@@ -15,7 +15,7 @@ import ani.dantotsu.profile.User
 import ani.dantotsu.profile.UsersDialogFragment
 import ani.dantotsu.snackString
 import ani.dantotsu.util.AniMarkdown.Companion.getBasicAniHTML
-import ani.dantotsu.util.MarkdownCreatorActivity
+import ani.dantotsu.util.ActivityMarkdownCreator
 import com.xwray.groupie.GroupieAdapter
 import com.xwray.groupie.viewbinding.BindableItem
 import kotlinx.coroutines.CoroutineScope
@@ -81,7 +81,7 @@ class ActivityReplyItem(
         binding.activityReply.setOnClickListener {
             ContextCompat.startActivity(
                 context,
-                Intent(context, MarkdownCreatorActivity::class.java)
+                Intent(context, ActivityMarkdownCreator::class.java)
                     .putExtra("type", "replyActivity")
                     .putExtra("parentId", parentId)
                     .putExtra("other", "@${reply.user.name} "),
@@ -92,7 +92,7 @@ class ActivityReplyItem(
         binding.activityEdit.setOnClickListener {
             ContextCompat.startActivity(
                 context,
-                Intent(context, MarkdownCreatorActivity::class.java)
+                Intent(context, ActivityMarkdownCreator::class.java)
                     .putExtra("type", "replyActivity")
                     .putExtra("parentId", parentId)
                     .putExtra("other", reply.text)
diff --git a/app/src/main/java/ani/dantotsu/util/MarkdownCreatorActivity.kt b/app/src/main/java/ani/dantotsu/util/ActivityMarkdownCreator.kt
similarity index 85%
rename from app/src/main/java/ani/dantotsu/util/MarkdownCreatorActivity.kt
rename to app/src/main/java/ani/dantotsu/util/ActivityMarkdownCreator.kt
index a66dba93..1a3e9f18 100644
--- a/app/src/main/java/ani/dantotsu/util/MarkdownCreatorActivity.kt
+++ b/app/src/main/java/ani/dantotsu/util/ActivityMarkdownCreator.kt
@@ -26,7 +26,7 @@ import io.noties.markwon.editor.MarkwonEditorTextWatcher
 import kotlinx.coroutines.DelicateCoroutinesApi
 import tachiyomi.core.util.lang.launchIO
 
-class MarkdownCreatorActivity : AppCompatActivity() {
+class ActivityMarkdownCreator : AppCompatActivity() {
     private lateinit var binding: ActivityMarkdownCreatorBinding
     private lateinit var type: String
     private var text: String = ""
@@ -80,24 +80,28 @@ class MarkdownCreatorActivity : AppCompatActivity() {
             finish()
             return
         }
-        binding.markdownCreatorTitle.text = when (type) {
-            "activity" -> getString(R.string.create_new_activity)
-            "review" -> getString(R.string.create_new_review)
-            "message" -> getString(R.string.create_new_message)
-            "replyActivity" -> {
-                parentId = intent.getIntExtra("parentId", -1)
-                if (parentId == -1) {
-                    toast("Error: No parent ID")
-                    finish()
-                    return
-                }
-                getString(R.string.create_new_reply)
+        val editId = intent.getIntExtra("edit", -1)
+        val userId = intent.getIntExtra("userId", -1)
+        parentId = intent.getIntExtra("parentId", -1)
+        when (type) {
+            "replyActivity" -> if (parentId == -1) {
+                toast("Error: No parent ID")
+                finish()
+                return
             }
 
-            else -> ""
+            "message" -> {
+                if (editId == -1) {
+                    binding.privateCheckbox.visibility = ViewGroup.VISIBLE
+                }
+            }
         }
+        var private = false
+        binding.privateCheckbox.setOnCheckedChangeListener { _, isChecked ->
+            private = isChecked
+        }
+
         ping = intent.getStringExtra("other")
-        val userId = intent.getIntExtra("userId", -1)
         text = ping ?: ""
         binding.editText.setText(text)
         binding.editText.addTextChangedListener {
@@ -121,7 +125,7 @@ class MarkdownCreatorActivity : AppCompatActivity() {
                 setMessage(R.string.post_to_anilist_warning)
                 setPositiveButton(R.string.ok) { _, _ ->
                     launchIO {
-                        val editId = intent.getIntExtra("edit", -1)
+
                         val isEdit = editId != -1
                         val success = when (type) {
                             "activity" -> if (isEdit) {
@@ -135,11 +139,13 @@ class MarkdownCreatorActivity : AppCompatActivity() {
                             } else {
                                 Anilist.mutation.postReply(parentId, text)
                             }
-                            "message" -> if (isEdit) { //TODO private
-                                Anilist.mutation.postMessage(userId , text, editId)
+
+                            "message" -> if (isEdit) {
+                                Anilist.mutation.postMessage(userId, text, editId)
                             } else {
-                                Anilist.mutation.postMessage(userId , text)
+                                Anilist.mutation.postMessage(userId, text, isPrivate = private)
                             }
+
                             else -> "Error: Unknown type"
                         }
                         toast(success)
@@ -153,7 +159,7 @@ class MarkdownCreatorActivity : AppCompatActivity() {
             }.show()
         }
 
-        binding.createButton.setOnLongClickListener {
+        binding.previewCheckbox.setOnClickListener {
             isPreviewMode = !isPreviewMode
             previewMarkdown(isPreviewMode)
             if (isPreviewMode) {
@@ -161,7 +167,6 @@ class MarkdownCreatorActivity : AppCompatActivity() {
             } else {
                 toast("Preview disabled")
             }
-            true
         }
         binding.editText.requestFocus()
         setupMarkdownButtons()
@@ -187,9 +192,11 @@ class MarkdownCreatorActivity : AppCompatActivity() {
                 MarkdownFormat.UNORDERED_LIST -> {
                     lines.joinToString("\n") { "- $it" }
                 }
+
                 MarkdownFormat.ORDERED_LIST -> {
                     lines.mapIndexed { index, line -> "${index + 1}. $line" }.joinToString("\n")
                 }
+
                 else -> {
                     if (format.syntax.contains("%s")) {
                         String.format(format.syntax, selectedText)
@@ -222,7 +229,6 @@ class MarkdownCreatorActivity : AppCompatActivity() {
                 ViewGroup.LayoutParams.WRAP_CONTENT
             )
             boxBackgroundMode = TextInputLayout.BOX_BACKGROUND_OUTLINE
-            hint = "Paste your link here"
             isHintEnabled = true
         }
 
@@ -241,30 +247,20 @@ class MarkdownCreatorActivity : AppCompatActivity() {
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT
             )
-            setPadding(64, 64, 64, 0)
+            setPadding(0, 0, 0, 0)
         }
-
-        val dialog = AlertDialog.Builder(this, R.style.MyPopup).apply {
-            setView(container)
-            setPositiveButton(getString(R.string.ok)) { dialog, _ ->
+        customAlertDialog().apply {
+            setTitle("Paste your link here")
+            setCustomView(container)
+            setPosButton(getString(R.string.ok)) {
                 val input = inputEditText.text.toString()
                 val formattedText = String.format(format.syntax, input)
                 binding.editText.text?.insert(position, formattedText)
                 binding.editText.setSelection(position + formattedText.length)
-                dialog.dismiss()
             }
-            setNegativeButton(getString(R.string.cancel)) { dialog, _ ->
-                dialog.dismiss()
-            }
-        }.create()
+            setNegButton(getString(R.string.cancel))
+        }.show()
 
-        val widthInDp = 245
-        val layoutParams = ViewGroup.LayoutParams(
-            (widthInDp * resources.displayMetrics.density).toInt(),
-            ViewGroup.LayoutParams.WRAP_CONTENT
-        )
-        dialog.window?.setLayout(layoutParams.width, layoutParams.height)
-        dialog.show()
         inputEditText.requestFocus()
     }
 
diff --git a/app/src/main/res/layout/activity_markdown_creator.xml b/app/src/main/res/layout/activity_markdown_creator.xml
index 504557a0..fb66d6f0 100644
--- a/app/src/main/res/layout/activity_markdown_creator.xml
+++ b/app/src/main/res/layout/activity_markdown_creator.xml
@@ -1,93 +1,100 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="false">
+    android:fitsSystemWindows="false"
+    android:orientation="vertical"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
     <LinearLayout
+        android:id="@+id/markdownCreatorToolbar"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        android:layout_height="48dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-        <FrameLayout
-            android:id="@+id/markdownCreatorToolbar"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:orientation="horizontal"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+        <ImageView
+            android:id="@+id/markdownCreatorBack"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center_vertical"
+            android:layout_marginStart="12dp"
+            android:src="@drawable/ic_round_arrow_back_ios_new_24"
+            app:tint="?attr/colorOnBackground"
+            tools:ignore="ContentDescription" />
 
-            <ImageView
-                android:id="@+id/markdownCreatorBack"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="start|center_vertical"
-                android:layout_marginStart="12dp"
-                android:src="@drawable/ic_round_arrow_back_ios_new_24"
-                app:tint="?attr/colorOnBackground"
-                tools:ignore="ContentDescription" />
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
 
-            <TextView
-                android:id="@+id/markdownCreatorTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="48dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="44dp"
-                android:ellipsize="end"
-                android:fontFamily="@font/poppins_bold"
-                android:gravity="center|start"
-                android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
-                android:textColor="?attr/colorOnBackground"
-                android:textSize="18sp"
-                tools:text="@string/placeholder" />
+        <CheckBox
+            android:id="@+id/privateCheckbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|center_vertical"
+            android:layout_marginEnd="8dp"
+            android:visibility="gone"
+            android:contentDescription="@string/preview"
+            android:fontFamily="@font/poppins_semi_bold"
+            android:text="@string/private_mode"
+            tools:ignore="ContentDescription" />
 
-            <Button
-                android:id="@+id/createButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end|center_vertical"
-                android:fontFamily="@font/poppins_bold"
-                android:maxLines="1"
-                android:text="@string/publish"
-                app:cornerRadius="16dp"
-                tools:ignore="ButtonStyle" />
-        </FrameLayout>
+        <CheckBox
+            android:id="@+id/previewCheckbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|center_vertical"
+            android:layout_marginEnd="8dp"
+            android:contentDescription="@string/preview"
+            android:fontFamily="@font/poppins_semi_bold"
+            android:text="@string/preview"
+            tools:ignore="ContentDescription" />
 
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:fillViewport="true">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="16dp">
-
-                <EditText
-                    android:id="@+id/editText"
-                    android:layout_width="match_parent"
-                    android:layout_height="590dp"
-                    android:fontFamily="@font/poppins"
-                    android:inputType="textMultiLine"
-                    android:padding="16dp"
-                    android:nestedScrollingEnabled="true"
-                    android:gravity="top|start"
-                    android:textColor="?attr/colorOnBackground"
-                    android:textIsSelectable="true"
-                    android:textSize="12sp"
-                    android:hint="@string/reply_hint"
-                    tools:ignore="LabelFor" />
-            </LinearLayout>
-        </ScrollView>
+        <ImageButton
+            android:id="@+id/createButton"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_gravity="center"
+            android:layout_marginEnd="12dp"
+            android:background="@drawable/ic_round_send_24"
+            tools:ignore="ContentDescription"
+            tools:visibility="visible" />
     </LinearLayout>
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="16dp">
+
+            <EditText
+                android:id="@+id/editText"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fontFamily="@font/poppins_semi_bold"
+                android:gravity="top|start"
+                android:hint="@string/reply_hint"
+                android:inputType="textMultiLine"
+                android:nestedScrollingEnabled="true"
+                android:padding="16dp"
+                android:textColor="?attr/colorOnBackground"
+                android:textIsSelectable="true"
+                android:textSize="18sp"
+                tools:ignore="LabelFor" />
+        </LinearLayout>
+    </ScrollView>
+
     <LinearLayout
         android:id="@+id/markdownOptionsContainer"
         android:layout_width="match_parent"
@@ -99,155 +106,170 @@
         android:windowSoftInputMode="adjustResize">
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
             <ImageView
                 android:id="@+id/formatBold"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="1"
                 android:padding="6dp"
-                android:layout_marginEnd="10dp"
                 android:src="@drawable/format_bold_24"
                 app:tint="?attr/colorOnBackground"
                 tools:ignore="ContentDescription" />
 
             <ImageView
                 android:id="@+id/formatItalic"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="1"
                 android:padding="6dp"
-                android:layout_marginEnd="10dp"
                 android:src="@drawable/format_italic_24"
                 app:tint="?attr/colorOnBackground"
                 tools:ignore="ContentDescription" />
 
             <ImageView
                 android:id="@+id/formatStrikethrough"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="1"
                 android:padding="6dp"
-                android:layout_marginEnd="10dp"
                 android:src="@drawable/format_strikethrough_24"
                 app:tint="?attr/colorOnBackground"
                 tools:ignore="ContentDescription" />
 
             <ImageView
                 android:id="@+id/formatSpoiler"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="1"
                 android:padding="6dp"
-                android:layout_marginEnd="10dp"
                 android:src="@drawable/format_spoiler_24"
                 app:tint="?attr/colorOnBackground"
                 tools:ignore="ContentDescription" />
 
             <ImageView
                 android:id="@+id/formatLink"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="1"
                 android:padding="6dp"
-                android:layout_marginEnd="10dp"
                 android:src="@drawable/format_link_24"
                 app:tint="?attr/colorOnBackground"
                 tools:ignore="ContentDescription" />
 
             <ImageView
                 android:id="@+id/formatImage"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="1"
                 android:padding="6dp"
-                android:layout_marginEnd="10dp"
                 android:src="@drawable/format_image_24"
                 app:tint="?attr/colorOnBackground"
                 tools:ignore="ContentDescription" />
 
             <ImageView
                 android:id="@+id/formatYoutube"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:padding="6dp"
-                android:layout_marginEnd="10dp"
                 android:src="@drawable/format_youtube_24"
                 app:tint="?attr/colorOnBackground"
                 tools:ignore="ContentDescription" />
 
-            <ImageView
-                android:id="@+id/formatVideo"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="6dp"
-                android:layout_marginEnd="10dp"
-                android:src="@drawable/format_video_24"
-                app:tint="?attr/colorOnBackground"
-                tools:ignore="ContentDescription" />
+
         </LinearLayout>
+
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
-            
+
             <ImageView
                 android:id="@+id/formatListOrdered"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="1"
                 android:padding="6dp"
-                android:layout_marginEnd="10dp"
                 android:src="@drawable/format_list_numbered_24"
                 app:tint="?attr/colorOnBackground"
                 tools:ignore="ContentDescription" />
 
             <ImageView
                 android:id="@+id/formatListUnordered"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="1"
                 android:padding="6dp"
-                android:layout_marginEnd="10dp"
                 android:src="@drawable/format_list_bulleted_24"
                 app:tint="?attr/colorOnBackground"
                 tools:ignore="ContentDescription" />
 
             <ImageView
                 android:id="@+id/formatTitle"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="1"
                 android:padding="6dp"
-                android:layout_marginEnd="10dp"
                 android:src="@drawable/format_title_24"
                 app:tint="?attr/colorOnBackground"
                 tools:ignore="ContentDescription" />
 
             <ImageView
                 android:id="@+id/formatCenter"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="1"
                 android:padding="6dp"
-                android:layout_marginEnd="10dp"
                 android:src="@drawable/format_align_center_24"
                 app:tint="?attr/colorOnBackground"
                 tools:ignore="ContentDescription" />
 
             <ImageView
                 android:id="@+id/formatQuote"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="1"
                 android:padding="6dp"
-                android:layout_marginEnd="10dp"
                 android:src="@drawable/format_quote_24"
                 app:tint="?attr/colorOnBackground"
                 tools:ignore="ContentDescription" />
 
             <ImageView
                 android:id="@+id/formatCode"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="1"
                 android:padding="6dp"
-                android:layout_marginEnd="10dp"
                 android:src="@drawable/format_code_24"
                 app:tint="?attr/colorOnBackground"
                 tools:ignore="ContentDescription" />
+
+            <ImageView
+                android:id="@+id/formatVideo"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:padding="6dp"
+                android:src="@drawable/format_video_24"
+                app:tint="?attr/colorOnBackground"
+                tools:ignore="ContentDescription" />
         </LinearLayout>
     </LinearLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_status.xml b/app/src/main/res/layout/fragment_status.xml
index 4660a182..2aaf4850 100644
--- a/app/src/main/res/layout/fragment_status.xml
+++ b/app/src/main/res/layout/fragment_status.xml
@@ -65,19 +65,6 @@
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 
-    <ImageButton
-        android:id="@+id/addStory"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:scaleX="2.2"
-        android:scaleY="2.2"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:src="@drawable/ic_circle_add"
-        app:layout_goneMarginBottom="40dp"
-        app:layout_goneMarginRight="8dp"
-        app:layout_constraintBottom_toBottomOf="@id/textActivityContainer"
-        app:layout_constraintEnd_toEndOf="@id/textActivityContainer" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6371c8dd..3660dae9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1033,5 +1033,6 @@ Non quae tempore quo provident laudantium qui illo dolor vel quia dolor et exerc
     <string name="bio_prompt_info_desc">Use your fingerprint or face to unlock the app</string>
     <string name="enable_forgot_password">Enable Forgot Password (hold clear button for 10 seconds)</string>
     <string name="hide_notification_dot">Hide Notification Dot</string>
+    <string name="private_mode">Private</string>
 
 </resources>