diff --git a/wp-content/themes/cosmopet/templates/profile/profile-base.twig b/wp-content/themes/cosmopet/templates/profile/profile-base.twig
index 3978f42..2b93365 100644
--- a/wp-content/themes/cosmopet/templates/profile/profile-base.twig
+++ b/wp-content/themes/cosmopet/templates/profile/profile-base.twig
@@ -152,9 +152,6 @@
 </main>
 
 
-
-
-
 <div class="modalProfile" id="pet_add_form">
     <div class="popup-wrap">
         <div class="modal-form form__full-mobile modal-form--white modal-form--height-100-phone form-pet active">
@@ -587,13 +584,13 @@
                 <div class="modal-form-content__line modal-form-content__line--two">
                     <div class="modal-form-content-line__element">
                         <label for="user_firstname" class="label-name">{{ fn('pll_e', 'Имя') }}</label>
-                        <input id="user_firstname" class="form__input" type="text" value="{{ user.user_firstname }}" name="name" placeholder="{{ fn('pll_e', 'Ваше имя') }}" required>
+                        <input id="user_firstname" class="form__input" type="text" value="{{ first_name }}" name="name" placeholder="{{ fn('pll_e', 'Ваше имя') }}" required>
                         <span class="form-input__error form-input__error--absolute">{{ fn('pll_e', 'Имя введено неверно') }}</span>
                     </div>
 
                     <div class="modal-form-content-line__element">
                         <label for="user_lastname" class="label-name">{{ fn('pll_e', 'Фамилия') }}</label>
-                        <input id="user_lastname" class="form__input" type="text" value="{{ user.user_lastname }}" name="l_name" placeholder="{{ fn('pll_e', 'Ваша фамилия') }}" required>
+                        <input id="user_lastname" class="form__input" type="text" value="{{ last_name }}" name="l_name" placeholder="{{ fn('pll_e', 'Ваша фамилия') }}" required>
                         <span class="form-input__error form-input__error--absolute">{{ fn('pll_e', 'Фамилия введена неверно') }}</span>
                     </div>                        
                 </div>
@@ -601,7 +598,7 @@
                 <div class="modal-form-content__line">
                     <label class="label-name">{{ fn('pll_e', 'Телефон') }}</label>
                     <div class="form-input__phone">
-                        <input type="text" placeholder="___ ___ ____" id="user_phone" value="{{ fn('get_user_meta', user.ID, 'billing_phone', true) }}" name="phone" class="form-input-phone__input" required>
+                        <input type="text" placeholder="___ ___ ____" id="user_phone" value="{{ phone }}" name="phone" class="form-input-phone__input" required>
                         <div class="form-input__error form-input__error--absolute">{{ fn('pll_e', 'Номер введён неверно') }}</div>
                     </div>
                 </div>
diff --git a/wp-content/themes/cosmopet/templates/profile/profile.twig b/wp-content/themes/cosmopet/templates/profile/profile.twig
index 7b79b8a..0b74884 100644
--- a/wp-content/themes/cosmopet/templates/profile/profile.twig
+++ b/wp-content/themes/cosmopet/templates/profile/profile.twig
@@ -110,326 +110,5 @@
 </main>
 
 
-<div class="modalProfile" id="pet_add_form">
-    <div class="popup-wrap">
-        <div class="modal-form form__full-mobile modal-form--white modal-form--height-100-phone form-pet active">
-            <button class="modal-form__close"></button>
-            <p class="modal-form__title">{{ fn('pll_e', 'Добавить питомца') }}</p>
-
-            <form class="modal-form__content" id="add-pet-form" method="post" action="">
-                <input type="hidden" name="action" value="add_pet">
-
-                <!-- Вид животного -->
-                <div class="modal-form-content__line">
-                    <label class="label-name">{{ fn('pll_e', 'Вид животного') }}</label>
-                    <div class="form-input__tabs">
-                        <label for="cat" class="form-input-tabs__button active">
-                            {{ fn('pll_e', 'Кошка') }}
-                            <input type="radio" value="cat" checked name="pet" id="cat" class="form-input-tabs__input">
-                        </label>
-                        <label for="dog" class="form-input-tabs__button">
-                            {{ fn('pll_e', 'Собака') }}
-                            <input type="radio" value="dog" name="pet" id="dog" class="form-input-tabs__input">
-                        </label>
-                    </div>
-                </div>
-
-                <!-- Стерилизован -->
-                <div class="modal-form-content__line sterilized">
-                    <label class="label-name">{{ fn('pll_e', 'Стерелизован') }}</label>
-                    <div class="form-input__tabs">
-                        <label class="form-input-tabs__button active">
-                            {{ fn('pll_e', 'Да') }}
-                            <input type="radio" value="1" checked name="sterilized" class="form-input-tabs__input">
-                        </label>
-                        <label class="form-input-tabs__button">
-                            {{ fn('pll_e', 'Нет') }}
-                            <input type="radio" value="0" name="sterilized" class="form-input-tabs__input">
-                        </label>
-                    </div>
-                </div>
-
-                <!-- Имя питомца -->
-                <div class="modal-form-content__line">
-                    <div class="modal-form-content-line__element">
-                        <label class="label-name">{{ fn('pll_e', 'Имя') }}</label>
-                        <input class="form__input" type="text" name="name" placeholder="{{ fn('pll_e', 'Имя питомца') }}" required>
-                    </div>
-                </div>
-
-                <!-- Порода -->
-                <div class="modal-form-content__line">
-                    <div class="modal-form-content-line__element">
-                        <label class="label-name">{{ fn('pll_e', 'Порода') }}</label>
-                        <input class="form__input" type="text" name="breed" placeholder="{{ fn('pll_e', 'Порода вашего питомца') }}" required>
-                    </div>
-                </div>
-
-                <!-- Пол -->
-                <div class="modal-form-content__line">
-                    <label class="label-name">{{ fn('pll_e', 'Пол вашего питомца') }}</label>
-                    <div class="form-input__tabs">
-                        <label for="boy" class="form-input-tabs__button active">
-                            {{ fn('pll_e', 'Мальчик') }}
-                            <input type="radio" value="male" checked name="sex" id="boy" class="form-input-tabs__input">
-                        </label>
-                        <label for="girl" class="form-input-tabs__button">
-                            {{ fn('pll_e', 'Девочка') }}
-                            <input type="radio" value="female" name="sex" id="girl" class="form-input-tabs__input">
-                        </label>
-                    </div>
-                </div>
-
-                <!-- Вид активности -->
-                <div class="modal-form-content__line modal-form-content__line--two">
-                    <div class="modal-form-content-line__element">
-                        <label class="label-name">{{ fn('pll_e', 'Вид активности') }}</label>
-                        <div class="form-input__list">
-                            <div class="form-input-list__input">{{ fn('pll_e', 'Выберите из списка') }}</div>
-                            <div class="form-input-list__block-content">
-                                <div class="form-input-list__content">
-
-                                    <label class="form-input-list__item">
-                                        <p class="form-input-list-item__text">{{ fn('pll_e', 'Низкая') }}</p>
-                                        <input type="radio" required name="activity" value="low" class="v-hidden">
-                                        <div class="form-input-list-item__box">
-                                            <div class="form-input-list-item-box__content">
-                                                <img src="{{ theme.link }}/gp-include/assets/lk/img/svg/main/arrow-selected-white.svg" alt="">
-                                            </div>
-                                        </div>
-                                    </label>
-
-                                    <label class="form-input-list__item">
-                                        <p class="form-input-list-item__text">{{ fn('pll_e', 'Средняя') }}</p>
-                                        <input type="radio" required name="activity" value="moderate" class="v-hidden">
-                                        <div class="form-input-list-item__box">
-                                            <div class="form-input-list-item-box__content">
-                                                <img src="{{ theme.link }}/gp-include/assets/lk/img/svg/main/arrow-selected-white.svg" alt="">
-                                            </div>
-                                        </div>
-                                    </label>
-
-                                    <label class="form-input-list__item">
-                                        <p class="form-input-list-item__text">{{ fn('pll_e', 'Высокая') }}</p>
-                                        <input type="radio" required name="activity" value="high" class="v-hidden">
-                                        <div class="form-input-list-item__box">
-                                            <div class="form-input-list-item-box__content">
-                                                <img src="{{ theme.link }}/gp-include/assets/lk/img/svg/main/arrow-selected-white.svg" alt="">
-                                            </div>
-                                        </div>
-                                    </label>
-
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <!-- Вес -->
-                    <div class="modal-form-content-line__element">
-                        <label class="label-name">{{ fn('pll_e', 'Вес') }}</label>
-                        <div class="form-input__list">
-                            <div class="form-input-list__input">{{ fn('pll_e', 'Выберите из списка') }}</div>
-                            <div class="form-input-list__block-content">
-                                <div class="form-input-list__content">
-
-                                    <label class="form-input-list__item">
-                                        <p class="form-input-list-item__text">1-1.5 кг</p>
-                                        <input type="radio" required name="weight" value="below_1_5" class="v-hidden">
-                                        <div class="form-input-list-item__box">
-                                            <div class="form-input-list-item-box__content">
-                                                <img src="{{ theme.link }}/gp-include/assets/lk/img/svg/main/arrow-selected-white.svg" alt="">
-                                            </div>
-                                        </div>
-                                    </label>
-
-                                    <label class="form-input-list__item">
-                                        <p class="form-input-list-item__text">1.5-3 кг</p>
-                                        <input type="radio" required name="weight" value="1_5-3" class="v-hidden">
-                                        <div class="form-input-list-item__box">
-                                            <div class="form-input-list-item-box__content">
-                                                <img src="{{ theme.link }}/gp-include/assets/lk/img/svg/main/arrow-selected-white.svg" alt="">
-                                            </div>
-                                        </div>
-                                    </label>
-
-                                    <label class="form-input-list__item">
-                                        <p class="form-input-list-item__text">3-5 кг</p>
-                                        <input type="radio" required name="weight" value="3-5" class="v-hidden">
-                                        <div class="form-input-list-item__box">
-                                            <div class="form-input-list-item-box__content">
-                                                <img src="{{ theme.link }}/gp-include/assets/lk/img/svg/main/arrow-selected-white.svg" alt="">
-                                            </div>
-                                        </div>
-                                    </label>
-
-                                    <label class="form-input-list__item">
-                                        <p class="form-input-list-item__text">5-8 кг</p>
-                                        <input type="radio" required name="weight" value="5-8" class="v-hidden">
-                                        <div class="form-input-list-item__box">
-                                            <div class="form-input-list-item-box__content">
-                                                <img src="{{ theme.link }}/gp-include/assets/lk/img/svg/main/arrow-selected-white.svg" alt="">
-                                            </div>
-                                        </div>
-                                    </label>
-
-                                    <!-- Добавь остальные веса аналогично -->
-                                    <!-- ... -->
-
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <!-- Возраст -->
-                <div class="rm">
-                    <div class="modal-form-content__line">
-                        <label class="label-name">{{ fn('pll_e', 'Возраст питомца') }}</label>
-                        <div class="form-input__tabs form-input__remote-control" data-content="modal__age">
-                            <label for="exemplary" class="form-input-tabs__button active" data-rm="0">
-                                {{ fn('pll_e', 'Примерный') }}
-                                <input type="radio" checked value="ex" name="old_type" required id="exemplary" class="form-input-tabs__input">
-                            </label>
-                            <label for="accurate" class="form-input-tabs__button" data-rm="1">
-                                {{ fn('pll_e', 'Точный') }}
-                                <input type="radio" value="acc" name="old_type" required id="accurate" class="form-input-tabs__input">
-                            </label>
-                        </div>
-                    </div>
-
-                    <div class="modal__age">
-
-                        <!-- Примерный возраст -->
-                        <div class="form-input__radio remote-control__item active" data-rmcont="0">
-
-                            <label class="form-input-radio__item active">
-                                <input type="radio" name="old" value="baby" checked class="v-hidden">
-                                <div class="form-input-radio__circle">
-                                    <div class="form-input-radio-circle__content"></div>
-                                </div>
-                                <p class="form-input-radio__title">{{ fn('pll_e', 'Малыш') }} <span>{{ fn('pll_e', '(от 0 до 1 года)') }}</span></p>
-                            </label>
-
-                            <label class="form-input-radio__item">
-                                <input type="radio" name="old" value="normal" class="v-hidden">
-                                <div class="form-input-radio__circle">
-                                    <div class="form-input-radio-circle__content"></div>
-                                </div>
-                                <p class="form-input-radio__title">{{ fn('pll_e', 'Взрослый') }} <span>{{ fn('pll_e', '(от 1 года до 7 лет)') }}</span></p>
-                            </label>
-
-                            <label class="form-input-radio__item">
-                                <input type="radio" name="old" value="old" class="v-hidden">
-                                <div class="form-input-radio__circle">
-                                    <div class="form-input-radio-circle__content"></div>
-                                </div>
-                                <p class="form-input-radio__title">{{ fn('pll_e', 'Пожилой') }} <span>{{ fn('pll_e', '(от 7 до 12 лет)') }}</span></p>
-                            </label>
-
-                            <label class="form-input-radio__item">
-                                <input type="radio" name="old" value="very_old" class="v-hidden">
-                                <div class="form-input-radio__circle">
-                                    <div class="form-input-radio-circle__content"></div>
-                                </div>
-                                <p class="form-input-radio__title">{{ fn('pll_e', 'Стареющий') }} <span>{{ fn('pll_e', '(от 12 лет и старше)') }}</span></p>
-                            </label>
-
-                        </div>
-
-                        <!-- Точный возраст -->
-                        <div data-rmcont="1" class="modal-form-content__line remote-control__item modal-form-content__line--three modal-form-content__line--margin-top-16">
-                            <div class="modal-form-content-line__element">
-                                <label class="label-name">{{ fn('pll_e', 'День') }}</label>
-                                <input class="form__input form__input--center" maxlength="2" type="text" name="day" placeholder="{{ fn('pll_e', 'ДД') }}">
-                            </div>
-                            <div class="modal-form-content-line__element">
-                                <label class="label-name">{{ fn('pll_e', 'Месяц') }}</label>
-                                <!-- Месяцы тоже можно захардкодить аналогично — по той же схеме -->
-                            </div>
-                            <div class="modal-form-content-line__element">
-                                <label class="label-name">{{ fn('pll_e', 'Год') }}</label>
-                                <input class="form__input form__input--center" maxlength="4" type="text" name="year" placeholder="{{ fn('pll_e', 'ГГГГ') }}">
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-
-                <!-- Кнопка добавить -->
-                <div class="modal-form__buttons">
-                    <button class="button button--gradient button--high button--100-perc" type="submit">{{ fn('pll_e', 'Добавить') }}</button>
-                </div>
-
-            </form>
-        </div>
-    </div>
-</div>
-
-
-<div class="modalProfile" id="subForm">
-    <div class="popup-wrap">
-        <div class="modal-form modal__notification modal-form--green-gradient modal-form--width-584 form-sub active">
-            <button class="modal-form__close modal-form__close--white"></button>
-            <p class="modal-form__title modal-form__title--white">Подписка на корм</p>
-
-            <div class="modal-form__element modal-form__element--top-40">
-                <p class="modal-form__text modal-form__text--white">
-                    Спасибо за интерес к нашему новому виду услуг, данная функция находится в разработке, если вы хотите узнать первыми о запуске подпишитесь на рассылку. 
-                </p>
-            </div>
-
-            <form class="modal-form__element modal-form__element--top-40 foodSub">
-                <input type="hidden" name="email" value="{{ user.user_email }}">
-                <input type="hidden" name="action" value="subscription_sub__profile">
-                <button class="button form__button-pc button--white button--100-perc open-overlay button--high">
-                    Хочу попробовать первым!
-                </button>
-                <button class="button form__button-mobile button--white button--100-perc open-overlay button--high">
-                    Хочу быть первым!
-                </button>
-            </form>
-        </div>
-    </div>
-</div>
-
-<div class="modalProfile" id="user_edit">
-    <div class="popup-wrap">
-        <div class="modal-form form__full-mobile modal-form--white modal-form--height-100-phone form-data active">
-            <button class="modal-form__close"></button>
-            <p class="modal-form__title">Изменить мои данные</p>
-
-            <form class="modal-form__content user-edit-form" method="post">
-                <input type="hidden" name="action" value="edit_user">
-                <div class="modal-form-content__line modal-form-content__line--two">
-                    <div class="modal-form-content-line__element">
-                        <label for="firstname" class="label-name">Имя</label>
-                        <input id="firstname" class="form__input" type="text" value="{{ user.user_firstname }}" name="name" placeholder="Ваше имя" required>
-                        <span class="form-input__error form-input__error--absolute">Имя введено неверно</span>
-                    </div>
-
-                    <div class="modal-form-content-line__element">
-                        <label for="lastname" class="label-name">Фамилия</label>
-                        <input id="lastname" class="form__input" type="text" value="{{ user.user_lastname }}" name="l_name" placeholder="Ваша фамилия" required>
-                        <span class="form-input__error form-input__error--absolute">Фамилия введена неверно</span>
-                    </div>                        
-                </div>
-
-                <div class="modal-form-content__line">
-                    <label class="label-name">Телефон</label>
-                    <div class="form-input__phone">
-                        <input type="text" placeholder="___ ___ ____" id="tel-phone" value="{{ fn('get_user_meta', user.ID, 'billing_phone', true) }}" name="phone" class="form-input-phone__input" required>
-                        <div class="form-input__error form-input__error--absolute">Номер введён неверно</div>
-                    </div>
-                </div>
-
-                <div class="modal-form__buttons modal-form__buttons--two">
-                    <button class="button button--gradient button--high" type="submit">Сохранить</button>
-                    <input type="reset" class="button button--white open-overlay button--high modal-form__button-close" value="Отмена">
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
-
 {% endblock %}