diff --git a/crates/jarvis-core/src/i18n/locales/en.ftl b/crates/jarvis-core/src/i18n/locales/en.ftl
index ebb60a0..5d43086 100644
--- a/crates/jarvis-core/src/i18n/locales/en.ftl
+++ b/crates/jarvis-core/src/i18n/locales/en.ftl
@@ -110,10 +110,9 @@ settings-openai-not-supported = ChatGPT is not currently supported. It will be a
 commands-title = Commands
 commands-search = Search commands...
 commands-count = { $count } commands
-commands-wip-title = [404] This section is under development!
-commands-wip-desc = Here will be a list of commands + full-featured command editor.
-commands-wip-follow = Follow updates in
-commands-wip-channel = our Telegram channel
+commands-heading = Jarvis commands
+commands-desc = Voice commands are configured via commands.yaml (Python fork) or resources/commands/ (Rust). A GUI command builder is available in the Python version of the fork.
+commands-builder-link = Open Command Builder (Python fork)
 
 # ### ERRORS
 error-generic = An error occurred
diff --git a/crates/jarvis-core/src/i18n/locales/ru.ftl b/crates/jarvis-core/src/i18n/locales/ru.ftl
index b208c30..a68f08d 100644
--- a/crates/jarvis-core/src/i18n/locales/ru.ftl
+++ b/crates/jarvis-core/src/i18n/locales/ru.ftl
@@ -110,10 +110,9 @@ settings-openai-not-supported = В данный момент ChatGPT не под
 commands-title = Команды
 commands-search = Поиск команд...
 commands-count = { $count } команд
-commands-wip-title = [404] Этот раздел еще находится в разработке!
-commands-wip-desc = Тут будет список команд + полноценный редактор команд.
-commands-wip-follow = Следите за обновлениями в
-commands-wip-channel = нашем телеграм канале
+commands-heading = Команды Jarvis
+commands-desc = Голосовые команды настраиваются через файл commands.yaml (Python-форк) или resources/commands/ (Rust). GUI-конструктор команд доступен в Python-версии форка.
+commands-builder-link = Открыть Command Builder (Python-форк)
 
 # ERRORS
 error-generic = Произошла ошибка
diff --git a/crates/jarvis-core/src/i18n/locales/ua.ftl b/crates/jarvis-core/src/i18n/locales/ua.ftl
index 572fe7f..c805a20 100644
--- a/crates/jarvis-core/src/i18n/locales/ua.ftl
+++ b/crates/jarvis-core/src/i18n/locales/ua.ftl
@@ -110,10 +110,9 @@ settings-openai-not-supported = Наразі ChatGPT не підтримуєть
 commands-title = Команди
 commands-search = Пошук команд...
 commands-count = { $count } команд
-commands-wip-title = [404] Цей розділ ще в розробці!
-commands-wip-desc = Тут буде список команд + повноцінний редактор команд.
-commands-wip-follow = Слідкуйте за оновленнями в
-commands-wip-channel = нашому телеграм каналі
+commands-heading = Команди Jarvis
+commands-desc = Голосові команди налаштовуються через файл commands.yaml (Python-форк) або resources/commands/ (Rust). GUI-конструктор команд доступний у Python-версії форка.
+commands-builder-link = Відкрити Command Builder (Python-форк)
 
 # ### ERRORS
 error-generic = Сталася помилка
diff --git a/frontend/src/routes/commands/index.svelte b/frontend/src/routes/commands/index.svelte
index 567be23..46baf75 100644
--- a/frontend/src/routes/commands/index.svelte
+++ b/frontend/src/routes/commands/index.svelte
@@ -1,41 +1,74 @@
 <script lang="ts">
-    import { Notification, Space } from "@svelteuidev/core"
-    import { InfoCircled } from "radix-icons-svelte"
+    import { Space } from "@svelteuidev/core"
 
     import HDivider from "@/components/elements/HDivider.svelte"
     import Footer from "@/components/Footer.svelte"
-    import { appInfo, translations, translate } from "@/stores"
+    import { translations, translate } from "@/stores"
 
     $: t = (key: string) => translate($translations, key)
 
-    let tgLink = ""
-    appInfo.subscribe(info => {
-        tgLink = info.tgOfficialLink
-    })
+    const builderUrl = "https://github.com/DmitryBykov-ISPO/J.A.R.V.I.S-py/tree/main/tools/command_builder"
 </script>
 
 <Space h="xl" />
 
-<Notification
-    title={t('commands-wip-title')}
-    icon={InfoCircled}
-    color="blue"
-    withCloseButton={false}
->
-    {t('commands-wip-desc')}<br />
-    {t('commands-wip-follow')} <a href={tgLink} target="_blank">{t('commands-wip-channel')}</a>!
-</Notification>
-
-<div class="placeholder-image">
-    <img src="/media/images/tenor.gif" alt="bruh" width="320px" />
+<div class="commands-info">
+    <h2>{t('commands-heading')}</h2>
+    <p>{t('commands-desc')}</p>
+    <a class="builder-link" href={builderUrl} target="_blank" rel="noopener noreferrer">
+        {t('commands-builder-link')}
+    </a>
 </div>
 
 <HDivider />
 <Footer />
 
-<style>
-    .placeholder-image {
-        text-align: center;
-        margin-top: 25px;
+<style lang="scss">
+    .commands-info {
+        background: #0a1214;
+        border: 1px solid rgba(82, 254, 254, 0.2);
+        border-radius: 8px;
+        padding: 1.25rem 1.5rem;
+        color: #d6e2e6;
+
+        h2 {
+            margin: 0 0 0.75rem;
+            font-size: 1.05rem;
+            color: #52fefe;
+            font-weight: 600;
+            letter-spacing: 0.02em;
+        }
+
+        p {
+            margin: 0 0 1rem;
+            font-size: 0.85rem;
+            line-height: 1.5;
+            color: rgba(255, 255, 255, 0.65);
+        }
+
+        :global(code) {
+            background: rgba(82, 254, 254, 0.08);
+            color: #52fefe;
+            padding: 0.05rem 0.35rem;
+            border-radius: 3px;
+            font-size: 0.8rem;
+        }
     }
-</style>
\ No newline at end of file
+
+    .builder-link {
+        display: inline-block;
+        padding: 0.5rem 0.9rem;
+        background: rgba(82, 254, 254, 0.08);
+        border: 1px solid rgba(82, 254, 254, 0.4);
+        border-radius: 6px;
+        color: #52fefe;
+        font-size: 0.8rem;
+        text-decoration: none;
+        transition: background 0.15s ease, border-color 0.15s ease;
+
+        &:hover {
+            background: rgba(82, 254, 254, 0.16);
+            border-color: rgba(82, 254, 254, 0.6);
+        }
+    }
+</style>