diff --git a/frontend/src/components/MdEditor.vue b/frontend/src/components/MdEditor.vue
new file mode 100644
index 0000000..484c48b
--- /dev/null
+++ b/frontend/src/components/MdEditor.vue
@@ -0,0 +1,142 @@
+<script setup lang="ts">
+import { computed, nextTick, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { renderMarkdown } from '../taskui'
+
+// Markdown-редактор с тулбаром (жирный/курсив/заголовок/списки/ссылка/код)
+// и предпросмотром по переключателю. Ctrl+V (картинки) пробрасывается наверх.
+// Текстовое поле — GnTextarea кита (его тёмные стили живут внутри .form-group).
+
+const props = defineProps<{
+  modelValue: string
+  rows?: number
+}>()
+
+const emit = defineEmits<{
+  'update:modelValue': [string]
+  paste: [ClipboardEvent]
+}>()
+
+const { t } = useI18n()
+
+const box = ref<HTMLDivElement | null>(null)
+const preview = ref(false)
+const html = computed(() => renderMarkdown(props.modelValue))
+
+function taEl(): HTMLTextAreaElement | null {
+  return box.value?.querySelector('textarea') ?? null
+}
+
+// Обёртка выделения синтаксисом (**…**, `…`, […](…))
+async function wrap(before: string, after: string, placeholder: string) {
+  const el = taEl()
+  if (!el) return
+  const s = el.selectionStart
+  const e = el.selectionEnd
+  const sel = props.modelValue.slice(s, e) || placeholder
+  emit(
+    'update:modelValue',
+    props.modelValue.slice(0, s) + before + sel + after + props.modelValue.slice(e),
+  )
+  await nextTick()
+  el.focus()
+  el.setSelectionRange(s + before.length, s + before.length + sel.length)
+}
+
+// Префикс для каждой строки выделения (заголовок, списки)
+async function prefix(mark: string) {
+  const el = taEl()
+  if (!el) return
+  const s = el.selectionStart
+  const e = el.selectionEnd
+  const lineStart = props.modelValue.lastIndexOf('\n', s - 1) + 1
+  let lineEnd = props.modelValue.indexOf('\n', e)
+  if (lineEnd === -1) lineEnd = props.modelValue.length
+  const chunk = props.modelValue.slice(lineStart, lineEnd)
+  emit(
+    'update:modelValue',
+    props.modelValue.slice(0, lineStart) +
+      chunk
+        .split('\n')
+        .map((l) => mark + l)
+        .join('\n') +
+      props.modelValue.slice(lineEnd),
+  )
+  await nextTick()
+  el.focus()
+  el.setSelectionRange(s + mark.length, s + mark.length)
+}
+
+const tools = computed(() => [
+  { icon: 'ph-text-bolder', label: t('md.bold'), run: () => wrap('**', '**', t('md.boldText')) },
+  { icon: 'ph-text-italic', label: t('md.italic'), run: () => wrap('*', '*', t('md.italicText')) },
+  { icon: 'ph-text-h-two', label: t('md.heading'), run: () => prefix('## ') },
+  { icon: 'ph-list-bullets', label: t('md.list'), run: () => prefix('- ') },
+  { icon: 'ph-list-checks', label: t('md.checklist'), run: () => prefix('- [ ] ') },
+  {
+    icon: 'ph-link',
+    label: t('md.link'),
+    run: () => wrap('[', '](https://)', t('md.linkText')),
+  },
+  { icon: 'ph-code', label: t('md.code'), run: () => wrap('`', '`', '') },
+])
+</script>
+
+<template>
+  <div ref="box" class="md-editor" @paste="emit('paste', $event)">
+    <div class="md-caption">{{ t('stack.form.description') }}</div>
+    <div class="md-toolbar">
+      <GnIconButton
+        v-for="tool in tools"
+        :key="tool.icon"
+        :icon="tool.icon"
+        :label="tool.label"
+        :title="tool.label"
+        size="sm"
+        @click="tool.run()"
+      />
+      <GnIconButton
+        class="md-toggle"
+        :icon="preview ? 'ph-pencil-simple' : 'ph-eye'"
+        :label="preview ? t('common.edit') : t('common.preview')"
+        :title="preview ? t('common.edit') : t('common.preview')"
+        size="sm"
+        @click="preview = !preview"
+      />
+    </div>
+    <GnTextarea
+      v-if="!preview"
+      class="md-textarea"
+      :model-value="modelValue"
+      :rows="rows ?? 6"
+      @update:model-value="emit('update:modelValue', $event)"
+    />
+    <div v-else class="md-view md-preview" v-html="html" />
+  </div>
+</template>
+
+<style scoped>
+.md-caption {
+  font-size: 0.85em;
+  color: var(--text-muted, #888);
+  margin-bottom: 0.3rem;
+}
+.md-toolbar {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.25rem;
+  margin-bottom: 0.4rem;
+}
+.md-toggle {
+  margin-left: auto;
+}
+.md-editor :deep(textarea.input) {
+  height: auto;
+  min-height: 9rem;
+  line-height: 1.5;
+  resize: vertical;
+}
+.md-preview {
+  min-height: 9rem;
+}
+</style>
\ No newline at end of file
diff --git a/frontend/src/components/TaskForm.vue b/frontend/src/components/TaskForm.vue
index ef04a1f..2e0cf36 100644
--- a/frontend/src/components/TaskForm.vue
+++ b/frontend/src/components/TaskForm.vue
@@ -1,15 +1,15 @@
 <script setup lang="ts">
-import DOMPurify from 'dompurify'
-import { marked } from 'marked'
-import { computed, onMounted, ref } from 'vue'
+import { onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { api, type Attachment, type Project, type Tag, type Task } from '../api'
 import { deadlinePeriodOptions, recurKindOptions, weekdayShort } from '../taskui'
 import { useToast } from 'gnexus-ui-kit/vue'
+import MdEditor from './MdEditor.vue'
 import QuickPrompt from './QuickPrompt.vue'
 
-// Полная форма задачи (вынесена из drawer'а стека): метаданные, дедлайн,
-// рекуррентность, вложения (Ctrl+V — картинка), создание проекта/тега на лету.
+// Полная форма задачи: тип (радио), описание (Markdown-редактор с тулбаром),
+// метаданные, дедлайн, рекуррентность, вложения (Ctrl+V — картинка),
+// теги через GnTagInput (ввод нового имени создаёт тег), проект на лету.
 // Сохранение делает сама (PATCH + опционально approve) и эмитит результат.
 
 const props = defineProps<{
@@ -33,50 +33,44 @@
 
 const form = ref({
   title: '',
+  task_type: 'one_time',
   description: '',
   project_id: '' as string | number,
-  tagSelection: {} as Record<number, boolean>,
   priority: null as number | null,
   estimated_minutes: null as number | null,
-  budget_money: null as number | null,
   cost_estimate_money: null as number | null,
   deadline_date: '' as string,
   deadline_period: '' as string,
-  task_type: 'one_time',
   recur_kind: '' as string,
   recur_interval_days: 1 as number | null,
   recurWeekday: {} as Record<string, boolean>,
   recur_day_of_month: 1 as number | null,
 })
 
+// Теги — имена (GnTagInput работает со строками); id резолвятся при сохранении
+const selectedTags = ref<string[]>([])
+
 // Дни недели для правила повторения (ISO: пн=1..вс=7) — имена через Intl
-const WEEKDAYS = computed(() =>
-  [1, 2, 3, 4, 5, 6, 7].map((n) => ({ value: String(n), label: weekdayShort(n) })),
-)
-const showPreview = ref(false)
+const WEEKDAYS = [1, 2, 3, 4, 5, 6, 7].map((n) => ({
+  value: String(n),
+  label: weekdayShort(n),
+}))
+
 const attachments = ref<Attachment[]>([])
 const uploading = ref(false)
 
-const markdownPreview = computed(() =>
-  DOMPurify.sanitize(marked.parse(form.value.description, { async: false })),
-)
-
 onMounted(async () => {
   const task = props.task
-  const selection: Record<number, boolean> = {}
-  task.tags.forEach((t) => (selection[t.id] = true))
   form.value = {
     title: task.title,
+    task_type: task.task_type ?? 'one_time',
     description: task.description,
     project_id: task.project?.id ?? '',
-    tagSelection: selection,
     priority: task.priority,
     estimated_minutes: task.estimated_minutes,
-    budget_money: task.budget_money,
     cost_estimate_money: task.cost_estimate_money,
     deadline_date: task.deadline_date ?? '',
     deadline_period: task.deadline_period ?? '',
-    task_type: task.task_type ?? 'one_time',
     recur_kind: task.recur_kind ?? '',
     recur_interval_days: task.recur_interval_days ?? 1,
     recurWeekday: task.recur_weekdays
@@ -84,6 +78,7 @@
       : {},
     recur_day_of_month: task.recur_day_of_month ?? 1,
   }
+  selectedTags.value = task.tags.map((t) => t.name)
   try {
     ;[projects.value, tags.value] = await Promise.all([api.listProjects(), api.listTags()])
   } catch (e) {
@@ -101,22 +96,31 @@
 }
 
 function selectedTagIds(): number[] {
-  return Object.entries(form.value.tagSelection)
-    .filter(([, on]) => on)
-    .map(([id]) => Number(id))
+  return selectedTags.value
+    .map((name) => tags.value.find((tag) => tag.name === name)?.id)
+    .filter((id): id is number => typeof id === 'number')
+}
+
+// Новый тег, введённый в поле, — сразу в каталог
+async function onTagAdd(name: string) {
+  if (tags.value.some((tag) => tag.name === name)) return
+  try {
+    tags.value.push(await api.createTag(name))
+  } catch (e) {
+    toast.error({ title: t('common.error'), text: String(e) })
+  }
 }
 
 async function save() {
   try {
     const f = form.value
-    let task = await api.updateTask(props.task.id, {
+    const task = await api.updateTask(props.task.id, {
       title: f.title,
       description: f.description,
       project_id: f.project_id === '' ? null : Number(f.project_id),
       tag_ids: selectedTagIds(),
       priority: f.priority,
       estimated_minutes: f.estimated_minutes,
-      budget_money: f.budget_money,
       cost_estimate_money: f.cost_estimate_money,
       deadline_date: f.deadline_date === '' ? null : f.deadline_date,
       deadline_period: f.deadline_period === '' ? null : f.deadline_period,
@@ -134,7 +138,7 @@
       recur_day_of_month:
         f.task_type === 'recurring' && f.recur_kind === 'monthly' ? f.recur_day_of_month : null,
     })
-    if (props.approveAfterSave) task = await api.approveTask(props.task.id)
+    if (props.approveAfterSave) await api.approveTask(props.task.id)
     toast.success({ title: props.approveAfterSave ? t('common.taskApproved') : t('common.saved') })
     emit('saved', task)
   } catch (e) {
@@ -169,28 +173,18 @@
   }
 }
 
-// Создание проекта/тега на лету — модальное окно вместо window.prompt
+// Создание проекта на лету — модальное окно вместо window.prompt
 const promptOpen = ref(false)
-const promptTitle = ref('')
-let promptKind: 'project' | 'tag' = 'project'
 
-function openPrompt(kind: 'project' | 'tag') {
-  promptKind = kind
-  promptTitle.value = kind === 'project' ? t('stack.promptProject') : t('stack.promptTag')
+function openPrompt() {
   promptOpen.value = true
 }
 
 async function onPromptConfirm(name: string) {
   try {
-    if (promptKind === 'project') {
-      const p = await api.createProject(name)
-      projects.value.push(p)
-      form.value.project_id = p.id
-    } else {
-      const tag = await api.createTag(name)
-      tags.value.push(tag)
-      form.value.tagSelection[tag.id] = true
-    }
+    const p = await api.createProject(name)
+    projects.value.push(p)
+    form.value.project_id = p.id
   } catch (e) {
     toast.error({ title: t('common.error'), text: String(e) })
   }
@@ -205,9 +199,19 @@
 <template>
   <form class="edit-form" @submit.prevent="save">
     <GnInput v-model="form.title" :label="t('stack.form.title')" required />
-    <GnTextarea v-model="form.description" :label="t('stack.form.description')" :rows="4" @paste="onPaste" />
-    <GnCheckbox v-model="showPreview" :label="t('stack.form.preview')" />
-    <div v-if="showPreview" class="md-preview" v-html="markdownPreview" />
+
+    <!-- Тип задачи — важно, стоит сразу после заголовка -->
+    <GnRadioGroup
+      v-model="form.task_type"
+      name="task_type"
+      :label="t('stack.recur.legend')"
+      :options="[
+        { value: 'one_time', label: t('stack.recur.oneTime') },
+        { value: 'recurring', label: t('stack.recur.recurring') },
+      ]"
+    />
+
+    <MdEditor v-model="form.description" @paste="onPaste" />
 
     <GnSelect
       v-model="form.project_id"
@@ -216,17 +220,20 @@
       :options="projectOptions()"
     />
     <div class="form-row-actions">
-      <GnButton type="button" variant="secondary" size="sm" icon="ph-plus" @click="openPrompt('project')">
+      <GnButton type="button" variant="secondary" size="sm" icon="ph-plus" @click="openPrompt">
         {{ t('stack.newProject') }}
       </GnButton>
     </div>
-    <fieldset class="tags-fieldset">
-      <legend>{{ t('stack.form.tags') }}</legend>
-      <GnCheckbox v-for="tag in tags" :key="tag.id" v-model="form.tagSelection[tag.id]" :label="tag.name" />
-      <GnButton type="button" variant="secondary" size="sm" icon="ph-plus" @click="openPrompt('tag')">
-        {{ t('stack.newTag') }}
-      </GnButton>
-    </fieldset>
+
+    <!-- Теги: существующие выбираются, новое имя создаёт тег -->
+    <GnTagInput
+      v-model="selectedTags"
+      :label="t('stack.form.tags')"
+      :placeholder="t('stack.form.tagsPlaceholder')"
+      unique
+      @add="onTagAdd"
+    />
+
     <GnInput v-model.number="form.priority" :label="t('stack.form.priority')" type="number" />
     <GnInput
       v-model.number="form.estimated_minutes"
@@ -234,15 +241,13 @@
       type="number"
       min="1"
     />
-    <div class="budget-row">
-      <GnInput v-model.number="form.budget_money" :label="t('stack.form.budget')" type="number" min="0" />
-      <GnInput
-        v-model.number="form.cost_estimate_money"
-        :label="t('stack.form.cost')"
-        type="number"
-        min="0"
-      />
-    </div>
+    <GnInput
+      v-model.number="form.cost_estimate_money"
+      :label="t('stack.form.cost')"
+      type="number"
+      min="0"
+    />
+
     <fieldset class="tags-fieldset">
       <legend>{{ t('stack.deadline.legend') }}</legend>
       <GnInput v-model="form.deadline_date" :label="t('stack.deadline.date')" type="date" />
@@ -252,49 +257,40 @@
         :options="[{ value: '', label: t('common.none') }, ...deadlinePeriodOptions()]"
       />
     </fieldset>
-    <fieldset class="tags-fieldset">
-      <legend>{{ t('stack.recur.legend') }}</legend>
+
+    <fieldset v-if="form.task_type === 'recurring'" class="tags-fieldset">
+      <legend>{{ t('stack.recur.kind') }}</legend>
       <GnSelect
-        v-model="form.task_type"
-        :options="[
-          { value: 'one_time', label: t('stack.recur.oneTime') },
-          { value: 'recurring', label: t('stack.recur.recurring') },
-        ]"
+        v-model="form.recur_kind"
+        :options="[{ value: '', label: t('common.choose') }, ...recurKindOptions()]"
       />
-      <template v-if="form.task_type === 'recurring'">
-        <GnSelect
-          v-model="form.recur_kind"
-          :label="t('stack.recur.kind')"
-          :options="[{ value: '', label: t('common.choose') }, ...recurKindOptions()]"
-        />
-        <GnInput
-          v-if="form.recur_kind === 'interval'"
-          v-model.number="form.recur_interval_days"
-          :label="t('stack.recur.interval')"
-          type="number"
-          min="1"
-          max="365"
-        />
-        <template v-if="form.recur_kind === 'weekdays'">
-          <fieldset class="tags-fieldset weekdays-fieldset">
-            <legend>{{ t('stack.recur.weekdays') }}</legend>
-            <GnCheckbox
-              v-for="d in WEEKDAYS"
-              :key="d.value"
-              v-model="form.recurWeekday[d.value]"
-              :label="d.label"
-            />
-          </fieldset>
-        </template>
-        <GnInput
-          v-if="form.recur_kind === 'monthly'"
-          v-model.number="form.recur_day_of_month"
-          :label="t('stack.recur.monthlyDay')"
-          type="number"
-          min="1"
-          max="31"
-        />
+      <GnInput
+        v-if="form.recur_kind === 'interval'"
+        v-model.number="form.recur_interval_days"
+        :label="t('stack.recur.interval')"
+        type="number"
+        min="1"
+        max="365"
+      />
+      <template v-if="form.recur_kind === 'weekdays'">
+        <fieldset class="tags-fieldset weekdays-fieldset">
+          <legend>{{ t('stack.recur.weekdays') }}</legend>
+          <GnCheckbox
+            v-for="d in WEEKDAYS"
+            :key="d.value"
+            v-model="form.recurWeekday[d.value]"
+            :label="d.label"
+          />
+        </fieldset>
       </template>
+      <GnInput
+        v-if="form.recur_kind === 'monthly'"
+        v-model.number="form.recur_day_of_month"
+        :label="t('stack.recur.monthlyDay')"
+        type="number"
+        min="1"
+        max="31"
+      />
     </fieldset>
 
     <!-- Вложения: вставленные Ctrl+V изображения -->
@@ -314,16 +310,16 @@
     </div>
 
     <div class="form-actions">
-      <GnButton type="submit" variant="accent" icon="ph-check-circle">
-        {{ submitLabel ?? t('stack.approve') }}
+      <GnButton type="submit" variant="success" icon="ph-check-circle">
+        {{ submitLabel ?? t('common.save') }}
       </GnButton>
-      <GnButton type="button" variant="secondary" @click="emit('cancel')">
+      <GnButton type="button" variant="secondary" class="btn-cancel" @click="emit('cancel')">
         {{ t('common.cancel') }}
       </GnButton>
     </div>
   </form>
 
-  <QuickPrompt v-model:open="promptOpen" :title="promptTitle" @confirm="onPromptConfirm" />
+  <QuickPrompt v-model:open="promptOpen" :title="t('stack.promptProject')" @confirm="onPromptConfirm" />
 </template>
 
 <style scoped>
@@ -331,6 +327,7 @@
   display: flex;
   flex-direction: column;
   gap: 1rem;
+  max-width: 640px;
 }
 .form-row-actions {
   margin-top: -0.5rem;
@@ -349,12 +346,6 @@
   font-size: 0.85em;
   color: var(--text-muted, #888);
 }
-.md-preview {
-  border: 1px solid var(--border, #333);
-  border-radius: 6px;
-  padding: 0.75rem;
-  overflow-x: auto;
-}
 .attachments {
   display: flex;
   flex-direction: column;
@@ -385,11 +376,13 @@
   flex-wrap: wrap;
   gap: 0.75rem;
 }
-.budget-row {
-  display: flex;
-  gap: 0.75rem;
+/* Отмена — без рамки, менее заметная, чем вторичная */
+.btn-cancel {
+  border-color: transparent;
+  color: var(--text-muted, #888);
 }
-.budget-row > * {
-  flex: 1;
+.btn-cancel:hover {
+  border-color: transparent;
+  color: var(--accent, #7aa2f7);
 }
 </style>
\ No newline at end of file
diff --git a/frontend/src/locales/en.ts b/frontend/src/locales/en.ts
index 8d49529..32e903d 100644
--- a/frontend/src/locales/en.ts
+++ b/frontend/src/locales/en.ts
@@ -70,6 +70,7 @@
       description: 'Description (Markdown, Ctrl+V for image)',
       preview: 'Markdown preview',
       project: 'Project',
+      tagsPlaceholder: 'Add a tag…',
       tags: 'Tags',
       priority: 'Priority (0–10)',
       estimate: 'Time estimate, minutes',
@@ -184,6 +185,18 @@
     langEn: 'English',
     langUk: 'Українська',
   },
+  md: {
+    bold: 'Bold',
+    boldText: 'bold text',
+    italic: 'Italic',
+    italicText: 'italic text',
+    heading: 'Heading',
+    list: 'List',
+    checklist: 'Checklist',
+    link: 'Link',
+    linkText: 'link text',
+    code: 'Code',
+  },
   taskui: {
     status: {
       to_do: 'To do',
diff --git a/frontend/src/locales/ru.ts b/frontend/src/locales/ru.ts
index 3bdd8db..144fa5d 100644
--- a/frontend/src/locales/ru.ts
+++ b/frontend/src/locales/ru.ts
@@ -71,6 +71,7 @@
       description: 'Описание (Markdown, Ctrl+V — картинка)',
       preview: 'Предпросмотр Markdown',
       project: 'Проект',
+      tagsPlaceholder: 'Добавить тег…',
       tags: 'Теги',
       priority: 'Приоритет (0–10)',
       estimate: 'Оценка времени, минут',
@@ -186,6 +187,18 @@
     langEn: 'English',
     langUk: 'Українська',
   },
+  md: {
+    bold: 'Жирный',
+    boldText: 'жирный текст',
+    italic: 'Курсив',
+    italicText: 'курсивный текст',
+    heading: 'Заголовок',
+    list: 'Список',
+    checklist: 'Чек-лист',
+    link: 'Ссылка',
+    linkText: 'текст ссылки',
+    code: 'Код',
+  },
   taskui: {
     status: {
       to_do: 'К выполнению',
diff --git a/frontend/src/locales/uk.ts b/frontend/src/locales/uk.ts
index 0ce127a..3b3aba9 100644
--- a/frontend/src/locales/uk.ts
+++ b/frontend/src/locales/uk.ts
@@ -70,6 +70,7 @@
       description: 'Опис (Markdown, Ctrl+V — картинка)',
       preview: 'Попередній перегляд Markdown',
       project: 'Проєкт',
+      tagsPlaceholder: 'Додати теґ…',
       tags: 'Теґи',
       priority: 'Пріоритет (0–10)',
       estimate: 'Оцінка часу, хвилин',
@@ -184,6 +185,18 @@
     langEn: 'English',
     langUk: 'Українська',
   },
+  md: {
+    bold: 'Жирний',
+    boldText: 'жирний текст',
+    italic: 'Курсив',
+    italicText: 'курсивний текст',
+    heading: 'Заголовок',
+    list: 'Список',
+    checklist: 'Чек-ліст',
+    link: 'Посилання',
+    linkText: 'текст посилання',
+    code: 'Код',
+  },
   taskui: {
     status: {
       to_do: 'До виконання',