diff --git a/front/src/components/library/EditForm.vue b/front/src/components/library/EditForm.vue
index 15e0b8f88..2ae988f47 100644
--- a/front/src/components/library/EditForm.vue
+++ b/front/src/components/library/EditForm.vue
@@ -278,11 +278,10 @@ const resetField = (fieldId: string) => {
           </select>
         </template>
         <template v-else-if="fieldConfig.type === 'content'">
-          <Textarea
+          <content-form
             v-model="values[fieldConfig.id].text"
-            :label="fieldConfig.label"
             :field-id="fieldConfig.id"
-            initial-lines="3"
+            :rows="3"
           />
         </template>
         <!-- TODO: Style Attachment Input -->
@@ -349,29 +348,18 @@ const resetField = (fieldId: string) => {
           {{ t('components.library.EditForm.button.cancel') }}
         </Link>
       </Textarea>
-      <Layout flex>
-        <Spacer grow />
-        <Button
-          :is-loading="isLoading"
-          primary
-          :disabled="isLoading || !mutationPayload"
-        >
-          <span v-if="canEdit">
-            {{ t('components.library.EditForm.button.submit') }}
-          </span>
-          <span v-else>
-            {{ t('components.library.EditForm.button.suggest') }}
-          </span>
-        </Button>
-        <Link
-          solid
-          secondary
-          raised
-          :to="{ name: 'library.albums.detail', params: { id: object.id } }"
-        >
-          {{ t('components.library.EditForm.button.cancel') }}
-        </Link>
-      </Layout>
+      <Button
+        :is-loading="isLoading"
+        primary
+        :disabled="isLoading || !mutationPayload"
+      >
+        <span v-if="canEdit">
+          {{ t('components.library.EditForm.button.submit') }}
+        </span>
+        <span v-else>
+          {{ t('components.library.EditForm.button.suggest') }}
+        </span>
+      </Button>
     </form>
   </Layout>
 </template>
diff --git a/front/src/components/ui/Markdown.vue b/front/src/components/ui/Markdown.vue
index b90f06faf..757715262 100644
--- a/front/src/components/ui/Markdown.vue
+++ b/front/src/components/ui/Markdown.vue
@@ -6,7 +6,7 @@ import showdown from 'showdown'
 import SanitizedHtml from './SanitizedHtml.vue'
 
 interface Props {
-  md: string
+  md: string | null
 }
 
 const props = defineProps<Props>()