diff --git a/src/app/me/page.tsx b/src/app/me/page.tsx
index ccc453f..723ceee 100644
--- a/src/app/me/page.tsx
+++ b/src/app/me/page.tsx
@@ -145,7 +145,7 @@ const Login = () => {
                         <img alt="" src="/static/icons/discord.svg" />
                         Discord
                     </a>
-                    <MinecraftConnect onInput={loginMinecraft}>
+                    <MinecraftConnect onInput={loginMinecraft} login>
                         <div
                             className={styles.login_button}
                             style={{ '--color': '#56ff4b' } as CSSProperties}
diff --git a/src/app/me/settings/page.tsx b/src/app/me/settings/page.tsx
index d31d788..782aba7 100644
--- a/src/app/me/settings/page.tsx
+++ b/src/app/me/settings/page.tsx
@@ -24,7 +24,8 @@ import {
     IconShield,
     IconDeviceMobile,
     IconDeviceDesktop,
-    IconBrandMinecraft
+    IconBrandMinecraft,
+    IconPlugConnected
 } from '@tabler/icons-react';
 import { timeStamp } from '@/app/modules/utils/time';
 import style_workshop from "@/app/styles/workshop/page.module.css";
@@ -32,6 +33,7 @@ import SlideButton from '@/app/modules/components/SlideButton';
 import ApiManager from '@/app/modules/utils/apiManager';
 import { Session } from '@/app/interfaces';
 import { setTheme } from './setTheme';
+import MinecraftConnect from '@/app/modules/components/MinecraftConnect';
 const fira = Fira_Code({ subsets: ["latin"] });
 
 export interface SettingsResponse {
@@ -88,7 +90,7 @@ const Page = () => {
                     <div
                         id="sidebar"
                         className={Style.main}
-                        style={loaded ? { opacity: "1", transform: "translateY(0)" } : { opacity: "0", transform: "translateY(50px)" }}
+                        style={loaded ? { opacity: "1", transform: "none" } : { opacity: "0", transform: "translateY(50px)" }}
                     >
                         {data &&
                             <>
@@ -106,31 +108,23 @@ const Page = () => {
 }
 
 const UserSettings = ({ data }: { data: SettingsResponse }) => {
-    const changePublic = (state: boolean): Promise<void> => {
-        return new Promise((resolve, reject) => {
-            ApiManager.setPublicProfile({ state })
-                .then(() => resolve())
-                .catch(reject);
-        });
-    }
-
     return (
         <div className={Style.container}>
             <h3><IconUser width={26} height={26} />Настройки аккаунта</h3>
             <SlideButton
                 label='Публичный профиль'
-                defaultValue={data.can_be_public ? data?.public_profile : false}
-                loadable={true}
-                strict={true}
-                onChange={changePublic}
+                defaultValue={data.can_be_public ? data.public_profile : false}
+                onChange={state => ApiManager.setPublicProfile({ state })}
                 disabled={!data.can_be_public}
+                loadable
+                strict
             />
         </div>
     );
 }
 
 const Connections = ({ data, refetch }: { data: SettingsResponse, refetch(): void }) => {
-    const refresh = () => {
+    const refreshMinecraft = () => {
         const load_icon = document.getElementById('refresh');
         load_icon.style.animation = `${Style.loading} infinite 1s reverse ease-in-out`;
 
@@ -163,18 +157,14 @@ const Connections = ({ data, refetch }: { data: SettingsResponse, refetch(): voi
         })
     }
 
-    const connectMinecraft = () => {
-        const target = document.getElementById('code') as HTMLInputElement;
-        if (target.value.length != 6) return;
-
-        ApiManager.connectMinecraft(target.value)
-            .then(refetch)
-            .catch(response => {
-                const data = response.data as { message: string };
-                const err = document.getElementById('error') as HTMLParagraphElement;
-                err.innerText = data.message;
-            });
-    }
+    const connectMinecraft = async (code: string): Promise<void> => {
+        try {
+            await ApiManager.connectMinecraft(code);
+            setTimeout(refetch, 150);
+        } catch (error) {
+            throw error;
+        }
+    };
 
     return (
         <>
@@ -224,7 +214,7 @@ const Connections = ({ data, refetch }: { data: SettingsResponse, refetch(): voi
                     </div>
                     <div className={Style.checkboxes}>
                         <span>Последний раз кэшировано {formatDate(new Date(data.connections?.minecraft?.last_cached))}</span>
-                        <button className={Style.unlink} onClick={refresh}>
+                        <button className={Style.unlink} onClick={refreshMinecraft}>
                             <IconRefresh style={{ width: "1.8rem" }} id="refresh" />Обновить кэш
                         </button>
 
@@ -233,26 +223,12 @@ const Connections = ({ data, refetch }: { data: SettingsResponse, refetch(): voi
                         </button>
                     </div>
                 </> : <>
-                    <p style={{ margin: 0 }}>Привяжите свою учётную запись Minecraft к учетной записи PPLBandage для управления кэшем скинов и настройками видимости
-                        вашего никнейма в поиске.</p>
-                    <p style={{ marginBottom: 0, marginTop: '.5rem' }}>
-                        Зайдите на Minecraft сервер&nbsp;
-                        <span
-                            style={{ textDecoration: "underline", cursor: "pointer", fontWeight: "600" }}
-                            onClick={() => { navigator.clipboard?.writeText("oauth.pplbandage.ru"); }}>
-                            oauth.pplbandage.ru
-                        </span>&nbsp;(версия 1.8-текущая) и получите там 6-значный код.</p>
-
-                    <div>
-                        <div className={Style.code_container}>
-                            <input placeholder="Введите 6-значный код" type='number' id='code' className={Style.code_input} onChange={e => {
-                                const target = document.getElementById('code') as HTMLInputElement;
-                                if (target.value.length > 6) target.value = target.value.slice(0, 6)
-                            }} />
-                            <button className={Style.code_send} onClick={connectMinecraft}>Отправить</button>
-                        </div>
-                        <p style={{ margin: 0, color: "#dd0f0f", marginTop: "5px" }} id="error"></p>
-                    </div>
+                    <p style={{ margin: 0 }} >Подключите свой аккаунт Minecraft, чтобы управлять кэшем скинов и настройками видимости вашего никнейма в поиске.</p>
+                    <MinecraftConnect onInput={connectMinecraft}>
+                        <button className={Style.unlink} style={{ width: '100%' }}>
+                            <IconPlugConnected style={{ width: "1.8rem" }} />Подключить
+                        </button>
+                    </MinecraftConnect>
                 </>}
             </div>
         </>
diff --git a/src/app/modules/components/EditConfirmation.tsx b/src/app/modules/components/EditConfirmation.tsx
new file mode 100644
index 0000000..12f1b6b
--- /dev/null
+++ b/src/app/modules/components/EditConfirmation.tsx
@@ -0,0 +1,101 @@
+import { useState } from "react";
+import { CSSTransition } from "react-transition-group"
+import style_base from '@/app/styles/minecraftConnect.module.css';
+import style from '@/app/styles/EditConfirmation.module.css';
+import { IconArchive, IconTrash, IconX } from "@tabler/icons-react";
+
+interface EditConfirmationProps {
+    children: JSX.Element,
+    onInput(): Promise<void>,
+    confirm_code: string,
+    action: 'delete' | 'archive'
+}
+
+const EditConfirmation = ({ action, confirm_code, children, onInput }: EditConfirmationProps) => {
+    const [expanded, setExpanded] = useState<boolean>(false);
+    const [available, setAvailable] = useState<boolean>(false);
+
+    const titles = {
+        delete: 'Подтвердите удаление',
+        archive: 'Подтвердите архивацию'
+    }
+
+    const icons = {
+        delete: <IconTrash />,
+        archive: <IconArchive />
+    }
+
+    const action_confirm = {
+        delete: 'Удалить',
+        archive: 'Архивировать'
+    }
+
+    return (
+        <>
+            <div onClick={() => setExpanded(true)}>
+                {children}
+            </div>
+            <CSSTransition
+                in={expanded}
+                timeout={150}
+                classNames={{
+                    enter: style_base['background-enter'],
+                    enterActive: style_base['background-enter-active'],
+                    exit: style_base['background-exit'],
+                    exitActive: style_base['background-exit-active'],
+                }}
+                unmountOnExit>
+                <div className={style_base.background} />
+            </CSSTransition>
+
+            <CSSTransition
+                in={expanded}
+                timeout={150}
+                classNames={{
+                    enter: style_base['menu-enter'],
+                    enterActive: style_base['menu-enter-active'],
+                    exit: style_base['menu-exit'],
+                    exitActive: style_base['menu-exit-active'],
+                }}
+                unmountOnExit>
+                <div className={style_base.base}>
+                    <div className={style_base.container}>
+                        <div className={style_base.header}>
+                            <h3 style={{ margin: 0, display: 'flex', gap: '.5rem', alignItems: 'center' }}>{icons[action]}{titles[action]}</h3>
+                            <IconX className={style_base.close} onClick={() => setExpanded(false)} />
+                        </div>
+                        <p style={{ margin: 0, fontSize: '.9rem', fontWeight: 'bold' }}>Это действие имеет необратимый характер!</p>
+                        <p style={{ margin: 0, userSelect: 'none', marginTop: '.5rem' }}>Для продолжения введите `<b>{confirm_code}</b>` ниже</p>
+
+                        <input
+                            style={{ borderRadius: '10px' }}
+                            placeholder='Введите идентификатор повязки'
+                            id='id'
+                            className={style_base.code_input}
+                            onChange={e => setAvailable(e.target.value === confirm_code)} />
+
+                        <button
+                            className={`${style.button} ${available && style.available}`}
+                            disabled={!available}
+                            onClick={() => {
+                                if (!available) return;
+                                onInput()
+                                    .then(() => setExpanded(false))
+                                    .catch(response => {
+                                        const err = document.getElementById('error') as HTMLParagraphElement;
+                                        err.innerText = response;
+                                        err.style.display = 'block';
+                                    })
+                            }}>
+                            {action_confirm[action]}
+                        </button>
+
+                        <p style={{ margin: 0, color: '#ED4245', display: 'none' }} id="error" />
+                    </div>
+                </div>
+            </CSSTransition>
+        </>
+    );
+}
+
+export default EditConfirmation;
\ No newline at end of file
diff --git a/src/app/modules/components/MeSidebar.tsx b/src/app/modules/components/MeSidebar.tsx
index a5ba8c4..9a11522 100644
--- a/src/app/modules/components/MeSidebar.tsx
+++ b/src/app/modules/components/MeSidebar.tsx
@@ -97,7 +97,7 @@ export const Me = ({ children, user_data }: { children: JSX.Element, user_data?:
 
     return (
         <div className={style_sidebar.main_container}>
-            <div style={islogged ? { opacity: "1", transform: "translateY(0)" } : {}} className={style_sidebar.hidable}>
+            <div style={islogged ? { opacity: "1", transform: "none" } : {}} className={style_sidebar.hidable}>
                 <div className={style_sidebar.main}>
                     <div className={style_sidebar.side}>
                         {!!data &&
diff --git a/src/app/modules/components/MinecraftConnect.tsx b/src/app/modules/components/MinecraftConnect.tsx
index 574aa40..8e6dfda 100644
--- a/src/app/modules/components/MinecraftConnect.tsx
+++ b/src/app/modules/components/MinecraftConnect.tsx
@@ -2,14 +2,14 @@ import { useState } from "react";
 import { CSSTransition } from "react-transition-group"
 import style from '@/app/styles/minecraftConnect.module.css';
 import { IconBrandMinecraft, IconCheck, IconX } from "@tabler/icons-react";
-import ApiManager from "../utils/apiManager";
 
 interface MinecraftConnectProps {
     children: JSX.Element,
-    onInput(code: string): Promise<void>
+    onInput(code: string): Promise<void>,
+    login?: boolean
 }
 
-const MinecraftConnect = ({ children, onInput }: MinecraftConnectProps) => {
+const MinecraftConnect = ({ login, children, onInput }: MinecraftConnectProps) => {
     const [expanded, setExpanded] = useState<boolean>(false);
 
     const selectText = (nodeId: string) => {
@@ -23,6 +23,8 @@ const MinecraftConnect = ({ children, onInput }: MinecraftConnectProps) => {
         }
     }
 
+    const title = login ? 'Войти через Minecraft' : 'Подключить аккаунт Minecraft';
+
     return (
         <>
             <div onClick={() => setExpanded(true)}>
@@ -54,10 +56,10 @@ const MinecraftConnect = ({ children, onInput }: MinecraftConnectProps) => {
                 <div className={style.base}>
                     <div className={style.container}>
                         <div className={style.header}>
-                            <h3 style={{ margin: 0, display: 'flex', gap: '.5rem', alignItems: 'center' }}><IconBrandMinecraft />Войти через Minecraft</h3>
+                            <h3 style={{ margin: 0, display: 'flex', gap: '.5rem', alignItems: 'center' }}><IconBrandMinecraft />{title}</h3>
                             <IconX className={style.close} onClick={() => setExpanded(false)} />
                         </div>
-                        <p style={{ margin: 0, fontSize: '.9rem', opacity: .6 }}>Этот способ будет работать, если вы привязали аккаунт Minecraft в личном кабинете.</p>
+                        {login && <p style={{ margin: 0, fontSize: '.9rem', opacity: .6 }}>Этот способ будет работать, если вы привязали аккаунт Minecraft в личном кабинете.</p>}
                         <p style={{ margin: 0, fontSize: '.95rem' }}>Зайдите на Minecraft сервер
                             `<span style={{ color: "rgba(12, 247, 215)" }} id="oauth_name" onClick={() => selectText('oauth_name')}>
                                 oauth.pplbandage.ru
@@ -80,6 +82,7 @@ const MinecraftConnect = ({ children, onInput }: MinecraftConnectProps) => {
                                     if (target.value.length != 6) return;
 
                                     onInput(target.value)
+                                        .then(() => setExpanded(false))
                                         .catch(response => {
                                             const data = response.data as { message: string };
                                             const err = document.getElementById('error') as HTMLParagraphElement;
diff --git a/src/app/modules/utils/apiManager.ts b/src/app/modules/utils/apiManager.ts
index 06717b7..0b1c573 100644
--- a/src/app/modules/utils/apiManager.ts
+++ b/src/app/modules/utils/apiManager.ts
@@ -167,12 +167,12 @@ class ApiManager {
     }
 
     /* Set public profile */
-    static async setPublicProfile(params: { state: boolean }): Promise<boolean> {
-        return (await this.doRequest({
+    static async setPublicProfile(params: { state: boolean }): Promise<void> {
+        await this.doRequest({
             url: `/user/me`,
             method: 'PATCH',
             data: { public: params.state }
-        })).data.new_data;
+        });
     }
 
     /* Set user profile theme */
diff --git a/src/app/styles/EditConfirmation.module.css b/src/app/styles/EditConfirmation.module.css
new file mode 100644
index 0000000..b8f9fbe
--- /dev/null
+++ b/src/app/styles/EditConfirmation.module.css
@@ -0,0 +1,25 @@
+.button {
+    color: var(--main-text-color);
+    background-color: var(--main-card-color);
+    border-radius: 10px;
+    border: 1px var(--main-element-color) solid;
+    height: 2.4rem;
+    box-sizing: border-box;
+    cursor: auto;
+    transition: background-color 250ms, border 150ms;
+    font-weight: 600;
+    font-family: inherit;
+    font-size: 1rem;
+    display: flex;
+    align-items: center;
+    flex-direction: row;
+    justify-content: center;
+}
+
+.available {
+    cursor: pointer;
+}
+
+.available:hover {
+    background-color: #ED4245;
+}
\ No newline at end of file
diff --git a/src/app/styles/me/me.module.css b/src/app/styles/me/me.module.css
index 121d029..1f3a349 100644
--- a/src/app/styles/me/me.module.css
+++ b/src/app/styles/me/me.module.css
@@ -49,10 +49,8 @@
 
 .login_main {
     position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
+    inset: 0;
+    z-index: 2;
 
     display: flex;
     align-items: center;
diff --git a/src/app/styles/minecraftConnect.module.css b/src/app/styles/minecraftConnect.module.css
index df6b098..7017b53 100644
--- a/src/app/styles/minecraftConnect.module.css
+++ b/src/app/styles/minecraftConnect.module.css
@@ -11,7 +11,7 @@
     position: fixed;
     inset: 0;
     z-index: 9000;
-    background-color: rgba(0, 0, 0, 0.4);
+    background-color: rgba(0, 0, 0, 0.6);
 }
 
 .container {
diff --git a/src/app/workshop/[id]/client.tsx b/src/app/workshop/[id]/client.tsx
index 43f2987..ed5348b 100644
--- a/src/app/workshop/[id]/client.tsx
+++ b/src/app/workshop/[id]/client.tsx
@@ -217,7 +217,7 @@ export default function Home({ data, referrer }: { data: Interfaces.Bandage, ref
 
             <main
                 className={style.main}
-                style={loaded ? { opacity: '1', transform: 'translateY(0)' } : { opacity: '0', transform: 'translateY(50px)' }}
+                style={loaded ? { opacity: '1', transform: 'none' } : { opacity: '0', transform: 'translateY(50px)' }}
             >
                 <NavigatorEl path={navPath}
                     style={{ marginBottom: "1rem" }} />
diff --git a/src/app/workshop/[id]/components/edit.tsx b/src/app/workshop/[id]/components/edit.tsx
index 4b47790..f9a1978 100644
--- a/src/app/workshop/[id]/components/edit.tsx
+++ b/src/app/workshop/[id]/components/edit.tsx
@@ -6,6 +6,7 @@ import style from "@/app/styles/editor/page.module.css";
 import * as Interfaces from "@/app/interfaces";
 import Select from 'react-select';
 import { IconArchive, IconX } from "@tabler/icons-react";
+import EditConfirmation from "@/app/modules/components/EditConfirmation";
 
 
 const lstrip = (string: string) => string.replace(/^\s+/, '');
@@ -62,21 +63,26 @@ const EditElement = ({
             });
     }
 
-    const deleteBandage = () => {
-        const first = confirm(`Вы собираетесь удалить повязку ${bandage.title}! Это действе необратимо! Подтверждаете?`);
-        if (!first) return;
-        const second = confirm('Последний шанс! Удалить?');
-        if (!second) return;
-        ApiManager.deleteBandage(bandage.external_id)
-            .then(() => router.replace('/workshop'))
-            .catch(err => alert(err.data.message));
+    const deleteBandage = async (): Promise<void> => {
+        return new Promise((resolve, reject) => {
+            ApiManager.deleteBandage(bandage.external_id)
+                .then(() => {
+                    resolve();
+                    router.replace('/workshop');
+                })
+                .catch(err => reject(err.data.message))
+        });
     }
 
-    const archiveBandage = () => {
-        if (!confirm('Заархивировать повязку? После архивации её будет невозможно изменить!')) return;
-        ApiManager.archiveBandage(bandage.external_id)
-            .then(() => window.location.reload())
-            .catch(err => alert(err.data?.message || err.message));
+    const archiveBandage = (): Promise<void> => {
+        return new Promise((resolve, reject) => {
+            ApiManager.archiveBandage(bandage.external_id)
+                .then(() => {
+                    resolve();
+                    window.location.reload();
+                })
+                .catch(err => reject(err.data.message))
+        });
     }
 
     return <div style={{ display: "flex", flexDirection: "column", gap: ".8rem" }}>
@@ -125,10 +131,16 @@ const EditElement = ({
                 marginTop: '1rem',
                 marginBottom: '.4rem'
             }}>
-                <div className={style.deleteButton} onClick={deleteBandage}>
-                    <img className={style.binUp} alt="" src="/static/icons/bin_up.png"></img>
-                    <img className={style.binDown} alt="" src="/static/icons/bin_down.png"></img>
-                </div>
+                <EditConfirmation
+                    action='delete'
+                    onInput={deleteBandage}
+                    confirm_code={bandage.external_id}
+                >
+                    <div className={style.deleteButton}>
+                        <img className={style.binUp} alt="" src="/static/icons/bin_up.png"></img>
+                        <img className={style.binDown} alt="" src="/static/icons/bin_down.png"></img>
+                    </div>
+                </EditConfirmation>
                 <p style={{ margin: 0 }}>Удалить повязку</p>
             </div>
             <div style={{
@@ -136,7 +148,13 @@ const EditElement = ({
                 alignItems: 'center',
                 gap: '.4rem'
             }}>
-                <button className={style.archiveButton} onClick={archiveBandage}><IconArchive /></button>
+                <EditConfirmation
+                    action='archive'
+                    onInput={archiveBandage}
+                    confirm_code={bandage.external_id}
+                >
+                    <button className={style.archiveButton}><IconArchive /></button>
+                </EditConfirmation>
                 <p style={{ margin: 0 }}>Архивировать</p>
             </div>
         </div>