diff --git a/src/components/pop-up-message.ts b/src/components/pop-up-message.ts
new file mode 100644
index 0000000..ffb40fc
--- /dev/null
+++ b/src/components/pop-up-message.ts
@@ -0,0 +1,17 @@
+export default {
+
+    html: `
+        <div class="pop-up-message hidden hidden-animation" id="pop-up-message">Текст уведомления</div>
+    `,
+
+    showMessage(messageText: string) {
+        const messageElement = document.getElementById('pop-up-message') as HTMLElement;
+        messageElement.textContent = messageText;
+        messageElement.classList.remove('hidden');
+        setTimeout(() => messageElement.classList.remove('hidden-animation'), 100);
+        setTimeout(() => {
+            messageElement.classList.add('hidden-animation');
+            setTimeout (()=> messageElement.classList.add('hidden'), 300);
+        }, 2000);
+    },
+};
diff --git a/src/components/search/search.ts b/src/components/search/search.ts
index 24adeb5..5362199 100644
--- a/src/components/search/search.ts
+++ b/src/components/search/search.ts
@@ -11,7 +11,7 @@ import debounce from '../debounce';
 export default {
     html: `
         <div class="search search-grid">
-            <input type="text" placeholder="Здесь будет поиск" class="search-input" id="search-input">
+            <input type="text" placeholder="Поиск" class="search-input" id="search-input">
             <ul class="search-results hidden" id="search-results">
                 <ul class="search-results-cities" id="search-results-cities"></ul>
                 <ul class="search-results-places" id="search-results-places"></ul>
@@ -74,6 +74,14 @@ export default {
                         const listItem = target.closest('LI');
                         if (listItem) {
                             Search.cityId = Number(listItem.querySelector('city')!.textContent);
+                            inputSearch.removeEventListener('input', () => {
+                                searchResults.classList.add('hidden');
+                                const query = inputSearch.value.trim();
+                                if (query) {
+                                    searchResults.classList.remove('hidden');
+                                }
+                                debouncedSearch(query);
+                            });
                             router.goto('/home');
                         }
                     }
@@ -84,6 +92,14 @@ export default {
                         const listItem = target.closest('LI');
                         if (listItem) {
                             const itemId = listItem.querySelector('a')!.href.split('/').pop();
+                            inputSearch.removeEventListener('input', () => {
+                                searchResults.classList.add('hidden');
+                                const query = inputSearch.value.trim();
+                                if (query) {
+                                    searchResults.classList.remove('hidden');
+                                }
+                                debouncedSearch(query);
+                            });
                             router.goto(`/places/${itemId}`);
                         }
                     }
@@ -97,7 +113,7 @@ export default {
         const debouncedSearch = debounce(search, 300);
 
         const searchResults = document.getElementById('search-results') as HTMLElement;
-        inputSearch.addEventListener('input', (event) => {
+        inputSearch.addEventListener('input', () => {
             searchResults.classList.add('hidden');
             const query = inputSearch.value.trim();
             if (query) {
diff --git a/src/pages/create-trip.ts b/src/pages/create-trip.ts
index e7aee1e..45c20d2 100644
--- a/src/pages/create-trip.ts
+++ b/src/pages/create-trip.ts
@@ -5,6 +5,7 @@ import User from '../utils/user';
 import logoImage from '../static/logo trip.svg';
 import footer from '../components/footer';
 import backButton from '../static/back button white.svg';
+import popUpMessage from '../components/pop-up-message';
 
 export default {
     /**
@@ -15,6 +16,7 @@ export default {
      */
     html:
         `
+        ${popUpMessage.html}
         <img src="${logoImage}" alt="Логотип" class="logo-image" id="home-logo">
         <main>
             <div class="create-trip-block">
@@ -30,9 +32,6 @@ export default {
                     <input class="border" type="date" id="startDate" name="startDate">
                     <label class="create-trip-text">Дата конца</label>
                     <input class="border" type="date" id="endDate" name="endDate">
-                    <label class="create-trip-text checkbox-button">
-                        <input type="checkbox" id="private-trip" name="private-trip"> Приватная поездка
-                    </label>
                     <button class="create-trip-button">Создать поездку</button>
                 </form>
             </div>
@@ -65,14 +64,26 @@ export default {
         const formDescription = (document.getElementById('description') as HTMLInputElement);
         const formStartDate = (document.getElementById('startDate') as HTMLInputElement);
         const formEndDate = (document.getElementById('endDate') as HTMLInputElement);
-        const formPrivateTrip = (document.getElementById('private-trip') as HTMLInputElement);
         const createTripForm = document.getElementById('create-trip-form') as HTMLElement;
         const errorMessage = document.getElementById('error-message') as HTMLElement;
 
         createTripForm.addEventListener('submit', async (event) => {
             event.preventDefault();
             try {
-                const res = await Api.postCreateTrip(Number(User.id), formName.value, 1, formDescription.value, formStartDate.value, formEndDate.value, formPrivateTrip.checked);
+                if (formStartDate.value === '' || formEndDate.value === '' || formName.value === '' || formDescription.value === '') {
+                    popUpMessage.showMessage('Заполните поля');
+                    return;
+                }
+                if (formStartDate.value > formEndDate.value) {
+                    popUpMessage.showMessage('Некорректная дата');
+                    return;
+                }
+
+                const tripsRes = await Api.postCreateTrip(Number(User.id), formName.value, 1, formDescription.value, formStartDate.value, formEndDate.value, false);
+                if (!tripsRes.ok) {
+                    popUpMessage.showMessage('Ошибка создания поездки');
+                    return;
+                }
                 await router.goto('/mytrips');
             } catch (e) {
                 errorMessage.textContent = 'Ошибка создания поездки';
diff --git a/src/pages/edit-trip.ts b/src/pages/edit-trip.ts
index caff631..a43d259 100644
--- a/src/pages/edit-trip.ts
+++ b/src/pages/edit-trip.ts
@@ -5,6 +5,7 @@ import User from '../utils/user';
 import logoImage from '../static/logo trip.svg';
 import footer from '../components/footer';
 import backButton from '../static/back button white.svg';
+import popUpMessage from '../components/pop-up-message';
 
 export default {
     /**
@@ -15,6 +16,7 @@ export default {
      */
     html:
         `
+        ${popUpMessage.html}
         <img src="${logoImage}" alt="Логотип" class="logo-image" id="home-logo">
         <main>
             <div class="create-trip-block">
@@ -30,9 +32,6 @@ export default {
                     <input class="border" type="date" id="startDate" name="startDate">
                     <label class="create-trip-text">Дата конца</label>
                     <input class="border" type="date" id="endDate" name="endDate">
-                    <label class="create-trip-text checkbox-button">
-                        <input type="checkbox" id="private-trip" name="private-trip"> Приватная поездка
-                    </label>
                     <button class="create-trip-button">Изменить поездку</button>
                 </form>
             </div>
@@ -65,23 +64,36 @@ export default {
         const resTrip = await Api.getTrip(itemId);
 
         const formName = (document.getElementById('name') as HTMLInputElement);
-        formName.value = resTrip.data.name;
+        formName.value = resTrip.data.trip.name;
         const formDescription = (document.getElementById('description') as HTMLInputElement);
-        formDescription.value = resTrip.data.description;
+        formDescription.value = resTrip.data.trip.description;
         const formStartDate = (document.getElementById('startDate') as HTMLInputElement);
-        formStartDate.value = resTrip.data.startDate;
+        let tempDate = resTrip.data.trip.startDate.split('.');
+        formStartDate.value = `${tempDate[2]}-${tempDate[1]}-${tempDate[0]}`;
         const formEndDate = (document.getElementById('endDate') as HTMLInputElement);
-        formEndDate.value = resTrip.data.endDate;
-        const formPrivateTrip = (document.getElementById('private-trip') as HTMLInputElement);
-        formPrivateTrip.checked = resTrip.data.private;
+        tempDate = resTrip.data.trip.endDate.split('.');
+        formEndDate.value = `${tempDate[2]}-${tempDate[1]}-${tempDate[0]}`;
         const createTripForm = document.getElementById('create-trip-form') as HTMLElement;
         const errorMessage = document.getElementById('error-message') as HTMLElement;
 
         createTripForm.addEventListener('submit', async (event) => {
             event.preventDefault();
             try {
-                const res = await Api.putTrip(itemId, Number(User.id), formName.value, 1, formDescription.value, formStartDate.value, formEndDate.value, formPrivateTrip.checked);
-                await router.goto(`/trips/${itemId}`);
+                if (formStartDate.value === '' || formEndDate.value === '' || formName.value === '' || formDescription.value === '') {
+                    popUpMessage.showMessage('Заполните поля');
+                    return;
+                }
+                if (formStartDate.value > formEndDate.value) {
+                    popUpMessage.showMessage('Некорректная дата');
+                    return;
+                }
+
+                const tripsRes = await Api.putTrip(itemId, Number(User.id), formName.value, 1, formDescription.value, formStartDate.value, formEndDate.value, false);
+                if (!tripsRes.ok) {
+                    popUpMessage.showMessage('Ошибка редактирования поездки');
+                    return;
+                }
+                await router.goto('/mytrips');
             } catch (e) {
                 errorMessage.textContent = 'Ошибка создания поездки';
                 errorMessage.classList.add('visible');
diff --git a/src/pages/homePage/attractions-load.ts b/src/pages/homePage/attractions-load.ts
index ea7ed26..73d5117 100644
--- a/src/pages/homePage/attractions-load.ts
+++ b/src/pages/homePage/attractions-load.ts
@@ -8,8 +8,35 @@ export default async function attractionsLoad(placeGallery: HTMLButtonElement, r
         // Загрузка достопримечательностей
         const attractionsResponse = await Api.getAttractions(Search.limit, Search.offset, Search.cityId, Search.categoryId, Search.filterId);
         const attractions = attractionsResponse.data;
-        const galleryElement = document.getElementById('gallery') as HTMLElement;
-        galleryElement.innerHTML = galleryTemplate({ attractions });
+
+        // Логика построчного разбиения на три колонки
+        let columnPlaces1 = [];
+        let columnPlaces2 = [];
+        let columnPlaces3 = [];
+
+        for (let i = 0; i < attractions.length - 1; i++) {
+            switch (i % 3) {
+            case 0:
+                columnPlaces1.push(attractions[i]);
+                break;
+            case 1:
+                columnPlaces2.push(attractions[i]);
+                break;
+            case 2:
+                columnPlaces3.push(attractions[i]);
+                break;
+            }
+        }
+
+        const column1 = document.getElementById('place-column-1') as HTMLElement;
+        const column2 = document.getElementById('place-column-2') as HTMLElement;
+        const column3 = document.getElementById('place-column-3') as HTMLElement;
+        let finalResultAttractions = columnPlaces1;
+        column1.innerHTML = galleryTemplate({ finalResultAttractions });
+        finalResultAttractions = columnPlaces2;
+        column2.innerHTML = galleryTemplate({ finalResultAttractions });
+        finalResultAttractions = columnPlaces3;
+        column3.innerHTML = galleryTemplate({ finalResultAttractions });
 
         placeGallery.addEventListener('click', (event) => {
             const target = event.target as HTMLElement;
diff --git a/src/pages/homePage/categoryButtonMount.ts b/src/pages/homePage/categoryButtonMount.ts
index 3125b4f..2019905 100644
--- a/src/pages/homePage/categoryButtonMount.ts
+++ b/src/pages/homePage/categoryButtonMount.ts
@@ -4,6 +4,13 @@ import attractionsLoad from './attractions-load';
 
 export default async function categoryButtonMount(categoryId: number, placeGallery: HTMLButtonElement, router: Router, button: HTMLButtonElement) {
     Search.categoryId === categoryId ? Search.categoryId = -1 : Search.categoryId = categoryId;
+
+    if (Search.categoryActiveElement && Search.categoryActiveElement !== button) {
+        Search.categoryActiveElement.classList.remove('active');
+    }
+
     button.classList.toggle('active');
+    Search.categoryActiveElement = button;
+
     await attractionsLoad(placeGallery, router);
 };
diff --git a/src/pages/homePage/home.hbs b/src/pages/homePage/home.hbs
index 9176a0f..d0a0ff5 100644
--- a/src/pages/homePage/home.hbs
+++ b/src/pages/homePage/home.hbs
@@ -1,4 +1,4 @@
-{{#each attractions}}
+{{#each finalResultAttractions}}
     <li class="gallery-item">
         <a href="/places/{{id}}"></a>
         <img src="{{imagePath}}" alt="{{name}}">
diff --git a/src/pages/homePage/home.ts b/src/pages/homePage/home.ts
index 66488c4..bff1d0e 100644
--- a/src/pages/homePage/home.ts
+++ b/src/pages/homePage/home.ts
@@ -34,7 +34,11 @@ export default {
                     <div class="filter" id="rating-filter">по рейтингу</div>
                     <div class="filter" id="popularity-filter">по популярности</div>
                 </div>
-                <ul class="gallery" id="gallery"></ul>
+                <div class="gallery" id="gallery">
+                    <ul class="place-column" id="place-column-1"></ul>
+                    <ul class="place-column" id="place-column-2"></ul>
+                    <ul class="place-column" id="place-column-3"></ul>
+                </div>
             </div>
         </main>
         ${footer.html}
@@ -111,24 +115,31 @@ export default {
         switch (Search.categoryId) {
         case 1:
             categoryOneButton.classList.add('active');
+            Search.categoryActiveElement = categoryOneButton;
             break;
         case 2:
             categoryTwoButton.classList.add('active');
+            Search.categoryActiveElement = categoryTwoButton;
             break;
         case 3:
             categoryThreeButton.classList.add('active');
+            Search.categoryActiveElement = categoryThreeButton;
             break;
         case 4:
             categoryFourButton.classList.add('active');
+            Search.categoryActiveElement = categoryFourButton;
             break;
         case 5:
             categoryFiveButton.classList.add('active');
+            Search.categoryActiveElement = categoryFiveButton;
             break;
         case 6:
             categorySixButton.classList.add('active');
+            Search.categoryActiveElement = categorySixButton;
             break;
         case 7:
             categorySevenButton.classList.add('active');
+            Search.categoryActiveElement = categorySevenButton;
             break;
         }
 
diff --git a/src/pages/placePage/place.ts b/src/pages/placePage/place.ts
index 243392d..6fc219d 100644
--- a/src/pages/placePage/place.ts
+++ b/src/pages/placePage/place.ts
@@ -10,10 +10,12 @@ import reviewsLoad from './reviews-load';
 import User from '../../utils/user';
 import galleryCategoriesTemplate from './categories.hbs';
 import Search from '../../utils/search-memory';
+import popUpMessage from '../../components/pop-up-message';
 
 export default {
     html:
         `${header.html}
+        ${popUpMessage.html}
         <main>
             <div class="place-block">
                 <div class="place-image grid-place-image">
@@ -140,15 +142,16 @@ export default {
 
         reviewFormButton.addEventListener('click', async () => {
             if (!reviewFormText.value) {
+                popUpMessage.showMessage('Пустой отзыв - не круто. Напишите о своих впечатлениях!');
                 return;
             }
             if (Number(formRatingInput.value) < 1 || Number(formRatingInput.value) > 5) {
-                alert('Некорректный рейтинг');
+                popUpMessage.showMessage('Введите оценку от 1 до 5');
                 return;
             }
             const res = await Api.postReview(Number(User.id), itemId, reviewFormText.value, Number(formRatingInput.value));
             if (!res.ok) {
-                console.log('Ошибка отправки отзыва');
+                popUpMessage.showMessage('Вы уже оставили отзыв!');
             }
             await reviewsLoad(itemId, router);
         });
diff --git a/src/pages/profilePage/profile.ts b/src/pages/profilePage/profile.ts
index d93289c..dffd6d5 100644
--- a/src/pages/profilePage/profile.ts
+++ b/src/pages/profilePage/profile.ts
@@ -11,7 +11,7 @@ import {emailRegex} from '../../components/validation';
 import footer from '../../components/footer';
 import backButton from '../../static/back button white.svg';
 import userMount from '../../components/user-mount';
-import closeButton from '../../static/close icon.svg';
+import popUpMessage from '../../components/pop-up-message';
 
 export default {
     /**
@@ -22,9 +22,7 @@ export default {
      */
     html: `
         <img src="${logoImage}" alt="Логотип" class="logo-image" id="logo-image">
-        <div class="error-window-message hidden hidden-animation" id="error-window-message">Ошибка загрузки аватарки
-            <img src="${closeButton}" class="error-close-button" id="error-close-button">
-        </div>
+        ${popUpMessage.html}
         <main>
             <div class="background-profile">
                 <div class="user-block">
@@ -114,14 +112,6 @@ export default {
         avatar.src = resProfile.data.avatarPath ?
             `/avatars/${resProfile.data.avatarPath}` : defaultAvatar;
 
-        const errorWindowMessage = document.getElementById('error-window-message') as HTMLElement;
-        const errorCloseButton = document.getElementById('error-close-button') as HTMLButtonElement;
-
-        errorCloseButton.addEventListener('click', () => {
-            errorWindowMessage.classList.add('hidden-animation');
-            setTimeout(() => errorWindowMessage.classList.add('hidden'), 300);
-        });
-
         avatar.addEventListener('click', () => {
             const avatarInputElement = document.createElement('input') as HTMLInputElement;
             avatarInputElement.type = 'file';
@@ -135,14 +125,16 @@ export default {
                     reader.addEventListener('load', async () => {
                         const basedAvatar = String(reader.result ? reader.result : '');
                         if (!basedAvatar) {
-                            errorWindowMessage.classList.remove('hidden');
-                            setTimeout(() => errorWindowMessage.classList.remove('hidden-animation'), 100);
+                            popUpMessage.showMessage('Ошибка загрузки аватарки');
                             return;
                         }
                         const res = await Api.putAvatar(User.id, basedAvatar);
+                        if (res.status === 413) {
+                            popUpMessage.showMessage('Слишком большое фото');
+                            return;
+                        }
                         if (!res.ok) {
-                            errorWindowMessage.classList.remove('hidden');
-                            setTimeout(() => errorWindowMessage.classList.remove('hidden-animation'), 100);
+                            popUpMessage.showMessage('Ошибка загрузки аватарки');
                             return;
                         }
                         await this.mount(router);
diff --git a/src/pages/profilePage/profileAchievements.hbs b/src/pages/profilePage/profileAchievements.hbs
index 764571e..1b406b3 100644
--- a/src/pages/profilePage/profileAchievements.hbs
+++ b/src/pages/profilePage/profileAchievements.hbs
@@ -1,7 +1,7 @@
 {{#each achievements}}
-    <li class="gallery-item-achievements">
-        <img src="{{../defaultAchievementIcon}}" alt="Значок достижения" class="gallery-item-achievements-img">
-        <div class="gallery-item-achievements-name">Название</div>
-        <div class="gallery-item-achievements-progressbar">54/10</div>
+    <li class="gallery-item-achievements" id="achievement-{{id}}">
+        <img src="/achievements/{{ iconPath }}" alt="Значок достижения" class="gallery-item-achievements-img">
+        <div class="gallery-item-achievements-name">{{ name }}</div>
+<!--        <div class="gallery-item-achievements-progressbar"></div>-->
     </li>
 {{/each}}
diff --git a/src/pages/profilePage/profileMenu.ts b/src/pages/profilePage/profileMenu.ts
index f4c09e2..462532f 100644
--- a/src/pages/profilePage/profileMenu.ts
+++ b/src/pages/profilePage/profileMenu.ts
@@ -33,11 +33,13 @@ export default async function updateMenu(activeMenuButton: HTMLElement) {
         galleryProfileElement.innerHTML =
             `<div class="please-block">
                 <img src="${palmsImgB}" class="please-img">
-                <div class="auth-please" id="auth-please">Достижения в разработке</div>
+                <div class="auth-please" id="auth-please">У вас пока нет достижений</div>
             </div>`;
-        // const achievementsResponse = await Api.getAchievements();
-        // const achievements = achievementsResponse.data;
-        // galleryProfileElement.innerHTML = galleryTemplateAchievements({ achievements, defaultAchievementIcon });
+        const achievementsResponse = await Api.getAchievements(User.id);
+        if (achievementsResponse.ok) {
+            const achievements = achievementsResponse.data;
+            galleryProfileElement.innerHTML = galleryTemplateAchievements({ achievements });
+        }
     }
 
 
diff --git a/src/pages/tripPage/authors.hbs b/src/pages/tripPage/authors.hbs
new file mode 100644
index 0000000..159ab88
--- /dev/null
+++ b/src/pages/tripPage/authors.hbs
@@ -0,0 +1,6 @@
+{{#each authors}}
+    <div class="authors-block">
+        <img src="/avatars/{{avatarPath}}" onerror="this.src='{{../avatarPng}}';" alt="Аватарка" class="author-avatar">
+        <div class="author-username">{{username}}</div>
+    </div>
+{{/each}}
\ No newline at end of file
diff --git a/src/pages/tripPage/mount-delete-photo-buttons.ts b/src/pages/tripPage/mount-delete-photo-buttons.ts
deleted file mode 100644
index ae1a9d3..0000000
--- a/src/pages/tripPage/mount-delete-photo-buttons.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import Api from '../../utils/Api';
-import mountPhotos from './mountPhotos';
-
-export default function deletePhotoButtonsMount(galleryItem: Element, itemId: number) {
-    let deleteButtons = galleryItem.querySelectorAll('.photo-delete-button');
-    deleteButtons.forEach(deleteButton => {
-        const deleteButtonElement = deleteButton as HTMLButtonElement;
-        deleteButtonElement.addEventListener('click', async () => {
-            const photoPath = deleteButtonElement.id;
-            const resDeletePhoto = await Api.deletePhoto(String(itemId), String(photoPath));
-            if (!resDeletePhoto.ok) {
-                console.log('Ошибка удаления фото');
-            }
-            await mountPhotos(galleryItem, itemId);
-        });
-    });
-};
diff --git a/src/pages/tripPage/mountPhotos.ts b/src/pages/tripPage/mountPhotos.ts
index 9d9ebba..06f1f92 100644
--- a/src/pages/tripPage/mountPhotos.ts
+++ b/src/pages/tripPage/mountPhotos.ts
@@ -1,14 +1,8 @@
 import Api from '../../utils/Api';
-import galleryPhotosTemplate from '../tripsPage/trips-photos.hbs';
-import deleteIcon from '../../static/delete.png';
-import deletePhotoButtonsMount from './mount-delete-photo-buttons';
+import galleryPhotosTemplate from './trip-photos.hbs';
 
-export default async function mountPhotos(galleryItem: Element, itemId: number) {
-    const resTrip = await Api.getTrip(itemId);
-    if (resTrip) {
-        const newTripPhotos = resTrip.data.photos;
-        galleryItem.innerHTML = galleryPhotosTemplate({newTripPhotos, deleteIcon});
-        // Монтирование кнопок удаления фото
-        deletePhotoButtonsMount(galleryItem, itemId);
+export default async function mountPhotos(galleryItem: Element, photos: { photoPath: string }[]) {
+    if (photos.length !== 0) {
+        galleryItem.innerHTML = galleryPhotosTemplate({photos});
     }
 };
diff --git a/src/pages/tripPage/trip-page.ts b/src/pages/tripPage/trip-page.ts
index 3c59d92..f8fa064 100644
--- a/src/pages/tripPage/trip-page.ts
+++ b/src/pages/tripPage/trip-page.ts
@@ -1,36 +1,34 @@
 import Api from '../../utils/Api';
+import User from '../../utils/user';
 import Router from '../../utils/Router';
 import header from '../../components/header';
 import footer from '../../components/footer';
 import backButtonIcon from '../../static/back button.svg';
-import editIcon from '../../static/edit white.svg';
 import shareIcon from '../../static/share.svg';
 import mountPhotos from './mountPhotos';
-import copyIcon from '../../static/copy.svg';
+import galleryAuthorsTemplate from './authors.hbs';
+import palmsImgB from '../../static/please black.svg';
+import popUpMessage from '../../components/pop-up-message';
 
 export default {
     html:`
         ${header.html}
         <main>
-            <div class="copy-message hidden hidden-animation" id="copy-message">Ссылка скопирована</div>
-            <div class="share-block hidden hidden-animation" id="share-block">
-                <div class="share-block-title grid-share-block-title">Поделиться поездкой</div>
-                <div class="share-link grid-share-link" id="share-link"></div>
-                <img src="${copyIcon}" class="copy-link-button grid-copy-link-button" id="copy-link-button">
-                <div class="read-mode grid-read-mode" id="read-mode-button">Чтение</div>
-                <div class="edit-mode grid-edit-mode" id="edit-mode-button">Редактирование</div>
-            </div>
-            <div class="blur-element hidden hidden-animation" id="blur-element"></div>
+            ${popUpMessage.html}
             <img src="${backButtonIcon}" alt="назад" class="trip-back-button grid-trip-back-button" id="trip-back-button">
             <div class="trip-title grid-trip-title" id="trip-title">Поездка</div>
-            <img src="${editIcon}" alt="редактировать" class="trip-edit-icon grid-trip-edit-icon" id="trip-edit-button">
             <img src="${shareIcon}" alt="поделиться" class="trip-share-icon grid-trip-share-icon" id="trip-share-button">
             <div class="trip-date grid-trip-date" id="trip-date">01.12.2024 - 08.12.2024</div>
             <div class="trip-description grid-trip-description" id="trip-description">Описание</div>
+            <div class="trip-authors-gallery grid-trip-authors-gallery" id="trip-authors-gallery">
+                    <div class="please-no-authors">Здесь будут ваши компаньоны</div>
+            </div>
             <div class="trip-gallery-photos grid-trip-gallery-photos">
-                <div class="add-photo-button" id="add-photo-button">Добавить фото</div>
                 <div class="trip-photos" id="trip-photos">
-
+                    <div class="please-block">
+                        <img src="${palmsImgB}" class="please-img" alt="Пальма">
+                        <div class="please-no-photo">Здесь будут фото</div>
+                    </div>
                 </div>
             </div>
         </main>
@@ -51,111 +49,38 @@ export default {
         const tripTitle = document.getElementById('trip-title') as HTMLElement;
         const tripDate = document.getElementById('trip-date') as HTMLElement;
         const tripDescription = document.getElementById('trip-description') as HTMLElement;
-
-        try {
-            const tripResponse = await Api.getTrip(itemId);
-            tripTitle.textContent = tripResponse.data.name;
-            tripDate.textContent = `${tripResponse.data.startDate} - ${tripResponse.data.endDate}`;
-            tripDescription.textContent = tripResponse.data.description;
-        } catch (e) {
-            console.log('Ошибка получения поездки');
+        const tripAuthorsGallery = document.getElementById('trip-authors-gallery') as HTMLElement;
+
+        const tripResponse = await Api.getTrip(itemId, User.id);
+        tripTitle.textContent = tripResponse.data.trip.name;
+        tripDate.textContent = `${tripResponse.data.trip.startDate} - ${tripResponse.data.trip.endDate}`;
+        tripDescription.textContent = tripResponse.data.trip.description;
+        const authors = tripResponse.data.users;
+        if (authors.length !== 0) {
+            tripAuthorsGallery.innerHTML = galleryAuthorsTemplate({ authors });
         }
-        
+
+        const photos = tripResponse.data.trip.photos;
         const galleryPhoto = document.getElementById('trip-photos') as HTMLElement;
         if (!galleryPhoto) {
             console.log('Блок фото не найден');
             return;
         }
+        await mountPhotos(galleryPhoto, photos);
 
-        await mountPhotos(galleryPhoto, itemId);
-
-        const addPhotoButton = document.getElementById('add-photo-button') as HTMLButtonElement;
-        addPhotoButton.addEventListener('click', async () => {
-            const tripPhotoInputElement = document.createElement('input') as HTMLInputElement;
-            tripPhotoInputElement.type = 'file';
-            tripPhotoInputElement.accept = 'image/*'; // Ограничиваем тип файлов на изображения
-            tripPhotoInputElement.multiple = true; // Разрешаем выбирать несколько фото
-            tripPhotoInputElement.style.display = 'none';
-
-            tripPhotoInputElement.addEventListener('change', async () => {
-                if (tripPhotoInputElement.files) {
-                    const files = tripPhotoInputElement.files;
-                    const base64Photos: string[] = [];
-
-                    for (let i = 0; i < files.length; i++) {
-                        const file = files[i];
-                        const reader = new FileReader();
-
-                        // Используем промисы для ожидания конвертации
-                        const base64 = await new Promise<string>((resolve, reject) => {
-                            reader.onload = () => resolve(String(reader.result));
-                            reader.onerror = () => reject('Ошибка чтения файла');
-                            reader.readAsDataURL(file);
-                        });
-
-                        base64Photos.push(base64);
-                    }
-
-                    const res = await Api.putPhotos(String(itemId), base64Photos);
-                    if (!res.ok) {
-                        alert('Ошибка загрузки фото');
-                        return;
-                    }
-
-                    // Получаем список фотографий
-                    await mountPhotos(galleryPhoto, itemId);
-                }
-            });
+        if (tripResponse.data.userAdded) {
+            popUpMessage.showMessage('Поездка добавлена');
+        }
 
-            tripPhotoInputElement.click();
-        });
+        if (window.location.pathname !== `trips/${itemId}` && User.id === '') {
+            popUpMessage.showMessage('Авторизуйтесь для добавления поездки');
+        }
 
         const shareButton = document.getElementById('trip-share-button') as HTMLButtonElement;
-        const shareBlock = document.getElementById('share-block') as HTMLElement;
-        const blurElement = document.getElementById('blur-element') as HTMLElement;
-        shareButton.addEventListener('click', () => {
-            shareBlock.classList.remove('hidden');
-            shareBlock.classList.remove('hidden-animation');
-            blurElement.classList.remove('hidden');
-            blurElement.classList.remove('hidden-animation');
-        });
-        blurElement.addEventListener('click', () => {
-            shareBlock.classList.add('hidden-animation');
-            shareBlock.classList.add('hidden');
-            blurElement.classList.add('hidden-animation');
-            blurElement.classList.add('hidden');
-        });
-
-        const editTripButton = document.getElementById('trip-edit-button') as HTMLButtonElement;
-        editTripButton.addEventListener('click', async () => {
-            await router.goto(`/edittrip/${itemId}`);
-        });
-
-        const copyLinkButton = document.getElementById('copy-link-button') as HTMLButtonElement;
-        const shareLinkElement = document.getElementById('share-link') as HTMLElement;
-        const copyMessage = document.getElementById('copy-message') as HTMLElement;
-        copyLinkButton.addEventListener('click', () => {
-            if (shareLinkElement.textContent) {
-                navigator.clipboard.writeText(shareLinkElement.textContent);
-                copyMessage.classList.remove('hidden');
-                setTimeout(() => copyMessage.classList.remove('hidden-animation'), 100);
-                setTimeout(() => {
-                    copyMessage.classList.add('hidden-animation');
-                    setTimeout (()=> copyMessage.classList.add('hidden'), 300);
-                }, 2000);
-            }
-        });
 
-        const readModeButton = document.getElementById('read-mode-button') as HTMLButtonElement;
-        readModeButton.addEventListener('click', async () => {
-            const resReadMode = await Api.postTripLink(itemId, 'reading');
-            shareLinkElement.textContent = resReadMode.data.link;
-        });
-
-        const editModeButton = document.getElementById('edit-mode-button') as HTMLButtonElement;
-        editModeButton.addEventListener('click', async () => {
-            const resEditMode = await Api.postTripLink(itemId, 'editing');
-            shareLinkElement.textContent = resEditMode.data.link;
+        shareButton.addEventListener('click', () => {
+            navigator.clipboard.writeText(`https://therewillbetrip.ru/trips/${itemId}`);
+            popUpMessage.showMessage('Ссылка скопирована');
         });
     },
 
diff --git a/src/pages/tripPage/trip-photos.hbs b/src/pages/tripPage/trip-photos.hbs
new file mode 100644
index 0000000..bd958a0
--- /dev/null
+++ b/src/pages/tripPage/trip-photos.hbs
@@ -0,0 +1,5 @@
+{{#each photos}}
+    <div class="delete-added-photo-block">
+        <img class="added-photo" src="/photos/{{photoPath}}" alt="Фото поездки">
+    </div>
+{{/each}}
\ No newline at end of file
diff --git a/src/pages/tripsPage/trips.hbs b/src/pages/tripsPage/trips.hbs
index 78a227d..6d00323 100644
--- a/src/pages/tripsPage/trips.hbs
+++ b/src/pages/tripsPage/trips.hbs
@@ -6,6 +6,8 @@
             <div class="gallery-trips-name gallery-trips-name-grid">{{name}}</div>
             <div class="gallery-trips-date gallery-trips-date-grid">{{startDate}} - {{endDate}}</div>
             <img src="/photos/{{photos.[0].photoPath}}" onerror="this.src='{{../palmsImg}}';" alt="Картинка поездки" class="gallery-item-trips-img gallery-item-trips-img-grid">
+            <img src="{{../copyLinkIcon}}" alt="Иконка ссылки" class="trips-share-icon trips-share-icon-grid">
+            <img src="{{../editIcon}}" alt="Иконка редактирования" class="trips-edit-icon trips-edit-icon-grid">
             <img src="{{../deleteIconWhite}}" alt="Иконка удаления" class="trips-delete-icon trips-delete-icon-grid">
         </div>
         <div class="gallery-item-trips-bottom-panel hidden hidden-animation" id="photo-gallery">
diff --git a/src/pages/tripsPage/trips.ts b/src/pages/tripsPage/trips.ts
index 9a7cdb2..d62fda5 100644
--- a/src/pages/tripsPage/trips.ts
+++ b/src/pages/tripsPage/trips.ts
@@ -4,10 +4,9 @@ import Api from '../../utils/Api';
 
 import openIcon from '../../static/open.png';
 import tripIcon from '../../static/trip_icon.png';
-import copyLinkIcon from '../../static/copylink.png';
-import deleteIcon from '../../static/delete.svg';
+import copyLinkIcon from '../../static/copy.svg';
 import deleteIconWhite from '../../static/delete white.svg';
-import editIcon from '../../static/edit.svg';
+import editIcon from '../../static/edit white.svg';
 import palmsImg from '../../static/please white.svg';
 import User from '../../utils/user';
 import header from '../../components/header';
@@ -15,6 +14,7 @@ import backButton from '../../static/back button white.svg';
 import footer from '../../components/footer';
 import deletePhotoButtonsMount from './mount-delete-photo-buttons';
 import mountPhotos from './mountPhotos';
+import popUpMessage from '../../components/pop-up-message';
 
 export default {
     /**
@@ -23,7 +23,18 @@ export default {
      *
      * @type {string}
      */
-    html: `${header.html}
+    html: `
+        ${header.html}
+        ${popUpMessage.html}
+            
+        <div class="share-block hidden hidden-animation" id="share-block">
+            <div class="share-block-title grid-share-block-title">Поделиться поездкой</div>
+            <div class="share-link grid-share-link" id="share-link"></div>
+            <div class="read-mode grid-read-mode" id="read-mode-button">Чтение</div>
+            <div class="edit-mode grid-edit-mode" id="edit-mode-button">Редактирование</div>
+        </div>
+        <div class="blur-element hidden hidden-animation" id="blur-element"></div>
+        
         <main>
             <div class="trips-block">
                 <div class="trips-title-row">
@@ -55,7 +66,6 @@ export default {
      * @returns {Promise<void>} Промис, который выполняется после установки обработчика события.
      */
     async mount(router: Router): Promise<void> {
-
         const backButton = document.getElementById('back-button') as HTMLButtonElement;
         const createTripButton = document.getElementById('trip-create-button') as HTMLButtonElement;
         const authPleaseBlock = document.getElementById('please-block') as HTMLElement;
@@ -147,9 +157,14 @@ export default {
                             base64Photos.push(base64);
                         }
 
-                        const res = await Api.putPhotos(parentItem.id, base64Photos);
+                        const res = await Api.postPhotos(parentItem.id, base64Photos);
+                        if (res.status === 413) {
+                            popUpMessage.showMessage('Слишком большое фото');
+                            return;
+                        }
+
                         if (!res.ok) {
-                            alert('Ошибка загрузки фото');
+                            popUpMessage.showMessage('Ошибка загрузки фото');
                             return;
                         }
 
@@ -175,6 +190,58 @@ export default {
             });
         });
 
+
+        document.querySelectorAll('.trips-edit-icon').forEach(icon => {
+            icon.addEventListener('click', async () => {
+                const parentItem = icon.closest('.gallery-item-trips');
+                if (parentItem) {
+                    const id = parentItem.id;
+                    await router.goto(`/edittrip/${id}`);
+                }
+            });
+        });
+
+        const shareBlock = document.getElementById('share-block') as HTMLElement;
+        const shareLink = document.getElementById('share-link') as HTMLElement;
+        const readModeButton = document.getElementById('read-mode-button') as HTMLButtonElement;
+        const editModeButton = document.getElementById('edit-mode-button') as HTMLButtonElement;
+        let id = '';
+        readModeButton.addEventListener('click', () => {
+            shareLink.textContent = `therewillbetrip.ru/trips/${id}`;
+            navigator.clipboard.writeText(`therewillbetrip.ru/trips/${id}`);
+            popUpMessage.showMessage('Ссылка скопирована');
+        });
+        editModeButton.addEventListener('click', async () => {
+            const resLink = await Api.postTripLink(id, 'editing');
+            shareLink.textContent = resLink.data.link;
+            navigator.clipboard.writeText(resLink.data.link);
+            popUpMessage.showMessage('Ссылка скопирована');
+        });
+
+        const blurElement = document.getElementById('blur-element') as HTMLElement;
+        blurElement.addEventListener('click', () => {
+            shareBlock.classList.add('hidden-animation');
+            setTimeout(() => shareBlock.classList.add('hidden'), 300);
+            blurElement.classList.add('hidden-animation');
+            setTimeout(() => blurElement.classList.add('hidden'), 300);
+        });
+
+        document.querySelectorAll('.trips-share-icon').forEach(icon => {
+            icon.addEventListener('click', async () => {
+                const parentItem = icon.closest('.gallery-item-trips');
+                if (parentItem) {
+                    id = parentItem.id;
+                    blurElement.classList.remove('hidden');
+                    setTimeout(() => blurElement.classList.remove('hidden-animation'), 100);
+                    shareBlock.classList.remove('hidden');
+                    setTimeout(() => shareBlock.classList.remove('hidden-animation'), 100);
+                    shareLink.textContent = `therewillbetrip.ru/trips/${id}`;
+                    navigator.clipboard.writeText(`therewillbetrip.ru/trips/${id}`);
+                    popUpMessage.showMessage('Ссылка скопирована');
+                }
+            });
+        });
+
         document.querySelectorAll('.gallery-trips-name').forEach(name => {
             name.addEventListener('click', async () => {
                 const parentItem = name.closest('.gallery-item-trips');
diff --git a/src/styles/error.styl b/src/styles/error.styl
index 1cc6ab2..c0d0067 100644
--- a/src/styles/error.styl
+++ b/src/styles/error.styl
@@ -10,34 +10,3 @@
 
     &.visible
         opacity 1
-
-.error-window-message
-    background myWhite
-    color myGrey
-    border-radius 10px
-    display block
-    opacity 1
-    position fixed
-    font-size 27px
-    padding 40px
-    text-align center
-    align-content center
-    z-index 999
-    top 50px
-    left 50%
-    box-shadow 0px 10px 20px 5px myShadow
-    transform translate(-50%, 0)
-    transition opacity 0.3s ease
-
-    &.hidden
-        display none
-
-    &.hidden-animation
-        opacity 0
-
-    .error-close-button
-        position absolute
-        width 25px
-        right 10px
-        top 10px
-        cursor pointer
diff --git a/src/styles/home-gallery.styl b/src/styles/home-gallery.styl
index 0954c7f..3785d6b 100644
--- a/src/styles/home-gallery.styl
+++ b/src/styles/home-gallery.styl
@@ -121,16 +121,26 @@
 
     .gallery
         padding 20px
-        list-style none
-        columns 3 300px
+        display grid
+        grid-template-columns 1fr 1fr 1fr
         margin-top 0
 
+        @media (max-width 700px)
+            display flex
+            flex-direction column
+
+        .place-column
+            list-style none
+            columns 1 auto
+            height 100%
+            width 100%
+            padding 0
+
     .gallery-item
         border-radius 20px
         position relative
         margin auto
         width 300px
-        height 100%
         cursor pointer
         -webkit-column-break-inside avoid /* Chrome, Safari, Opera */
         page-break-inside avoid /* Firefox */
diff --git a/src/styles/index.styl b/src/styles/index.styl
index f9a76f3..9628f84 100644
--- a/src/styles/index.styl
+++ b/src/styles/index.styl
@@ -5,6 +5,7 @@
 @import 'footer.styl'
 @import 'search.styl'
 @import 'csat.styl'
+@import 'pop-up-message.styl'
 
 @import 'home-gallery.styl'
 @import 'signin.styl'
diff --git a/src/styles/mixins.styl b/src/styles/mixins.styl
index 6c61f17..2968850 100644
--- a/src/styles/mixins.styl
+++ b/src/styles/mixins.styl
@@ -35,6 +35,10 @@ mixinFormBlock()
   height fit-content
   margin 40px auto
 
+  @media (max-width 700px)
+    margin 0 auto
+    width 90%
+
 mixinForm()
   display grid
   width 100%
diff --git a/src/styles/place.styl b/src/styles/place.styl
index 098d8d9..2105b74 100644
--- a/src/styles/place.styl
+++ b/src/styles/place.styl
@@ -76,6 +76,9 @@
       overflow auto
       z-index -1
 
+    @media (max-width 700px)
+      font-size 27px
+
   .back-button-block
     mixinBlock(myBlack)
     margin 0
@@ -268,6 +271,9 @@
         height 100%
         border-radius 20px
 
+        @media (max-width 700px)
+          width 85%
+
     .reviews-gallery
       display flex
       flex-direction row
diff --git a/src/styles/pop-up-message.styl b/src/styles/pop-up-message.styl
new file mode 100644
index 0000000..7004215
--- /dev/null
+++ b/src/styles/pop-up-message.styl
@@ -0,0 +1,23 @@
+.pop-up-message
+  background myWhite
+  color myGrey
+  border-radius 10px
+  display block
+  opacity 1
+  position fixed
+  font-size 27px
+  padding 40px
+  text-align center
+  align-content center
+  z-index 999
+  top 50px
+  left 50%
+  box-shadow 0px 10px 20px 5px myShadow
+  transform translate(-50%, 0)
+  transition opacity 0.3s ease
+
+  &.hidden
+    display none
+
+  &.hidden-animation
+    opacity 0
\ No newline at end of file
diff --git a/src/styles/profile.styl b/src/styles/profile.styl
index 12bc596..116f135 100644
--- a/src/styles/profile.styl
+++ b/src/styles/profile.styl
@@ -272,10 +272,17 @@
     padding 0
 
   .gallery-item-profile-trips
-    mixinGalleryItem(250px, 250px, myWhite)
+    margin 0
+    padding 15px
+    border-radius 20px
+    background myWhite
+    height 250px
+    width 250px
+    overflow hidden
+    border 2px solid myShadow
     display grid
     grid-template-rows repeat(4, 1fr)
-    grid-template-columns 1fr 1fr
+    grid-template-columns 25% 75%
     grid-template-areas "a b"\
     "c c"\
     "d d"\
@@ -327,9 +334,7 @@
 
   .gallery-item-achievements
     mixinGalleryItem(250px, 200px, myBlack)
-    grid-template-rows auto auto auto
-    grid-template-columns 100%
-    row-gap 0
+    height fit-content
     place-items center
 
   .gallery-item-achievements-img
@@ -343,9 +348,6 @@
     font-size 20px
     color myWhite
     text-align center
-    overflow hidden
-    white-space nowrap
-    text-overflow ellipsis
 
   .gallery-item-achievements-progressbar
     font-size 20px
diff --git a/src/styles/trip.styl b/src/styles/trip.styl
index 871fe0a..1c9b5fa 100644
--- a/src/styles/trip.styl
+++ b/src/styles/trip.styl
@@ -1,145 +1,14 @@
 .trip-page
   mixinSideMenu()
 
-  .copy-message
-    background myWhite
-    color myGrey
-    border-radius 10px
-    display block
-    opacity 1
-    position fixed
-    font-size 27px
-    padding 40px
-    text-align center
-    align-content center
-    z-index 999
-    top 50px
-    left 50%
-    box-shadow 0px 10px 20px 5px myShadow
-    transform translate(-50%, 0)
-    transition opacity 0.3s ease
-
-    &.hidden
-      display none
-
-    &.hidden-animation
-      opacity 0
-
-  .blur-element
-    position fixed
-    inset 0
-    width 100%
-    height 100%
-    backdrop-filter blur(5px)
-    background myShadow
-    display block
-    opacity 1
-    transition opacity 0.3s ease
-
-    &.hidden
-      display none
-
-    &.hidden-animation
-      opacity 1
-
-  .share-block
-    position fixed
-    left 50%
-    top 50%
-    transform translate(-50%, -50%)
-    background myWhite
-    width fit-content
-    height fit-content
-    padding 40px
-    justify-content center
-    align-content center
-    border-radius 20px
-    z-index 998
-    display grid
-    grid-template-rows 60px 40px 40px
-    grid-template-columns auto auto auto auto
-    grid-template-areas "a a a a"\
-    "b b b c"\
-    "d d e e"
-    row-gap 20px
-    column-gap 10px
-    opacity 1
-    transition opacity 0.3s ease
-
-    .grid-share-block-title
-      grid-area a
-
-    .grid-share-link
-      grid-area b
-
-    .grid-copy-link-button
-      grid-area c
-
-    .grid-read-mode
-      grid-area d
-
-    .grid-edit-mode
-      grid-area e
-
-
-    &.hidden
-      display none
-
-    &.hidden-animation
-      opacity 1
-
-    .share-link
-      border 2px solid myLightGrey
-      border-radius 10px
-      width 222px
-      padding 10px
-      overflow-x scroll
-      scrollbar-width none
-      height 100%
-
-    .copy-link-button
-      background myGrey
-      cursor pointer
-      height 100%
-      padding 5px
-      border-radius 10px
-
-    .share-block-title
-      color myBlack
-      font-size 27px
-      justify-self center
-
-    .read-mode
-      background myGrey
-      color myWhite
-      padding 5px 20px
-      cursor pointer
-      justify-self center
-      text-align center
-      align-content center
-      border-radius 10px
-      width 100%
-
-    .edit-mode
-      background myGrey
-      color myWhite
-      padding 5px 20px
-      cursor pointer
-      justify-self center
-      text-align center
-      align-content center
-      border-radius 10px
-      width 100%
-
-
   main
     mixinBlock(myWhite)
     display grid
     grid-template-columns 10% 1fr 1fr 1fr 1fr 4% 4%
     grid-template-rows 70px 70px auto auto
-    grid-template-areas "a b b b b c d"\
-    "g g g g e e e"\
-    "g g g g . . ."\
+    grid-template-areas "a b b b b . d"\
+    "c c c c e e e"\
+    "g g g g g g g"\
     "f f f f f f f"
     row-gap 20px
     column-gap 10px
@@ -149,6 +18,7 @@
 
     @media (max-width 700px)
       margin 15px
+      padding 25px
       grid-template-rows auto auto auto auto auto
       grid-template-columns 15% auto 15%
       grid-template-areas "b b b"\
@@ -163,7 +33,7 @@
     .grid-trip-title
       grid-area b
 
-    .grid-trip-edit-icon
+    .grid-trip-authors-gallery
       grid-area c
 
     .grid-trip-share-icon
@@ -178,20 +48,54 @@
     .grid-trip-description
       grid-area g
 
-    .trip-edit-icon
+    .trip-authors-gallery
+      display flex
+      flex-direction row
+      overflow-x scroll
+      scrollbar-width none
       width 100%
-      padding 5px
-      background myBlack
-      border-radius 10px
-      cursor pointer
-      transition all 0.3s ease
+      height 100%
+      align-items center
+      column-gap 10px
 
-      @media (max-width 700px)
-        justify-self center
-        width 40px
+      .please-no-authors
+        font-size 27px
+        color myBlack
 
-      &:hover
-        background myPink
+      .authors-block
+        background myBlack
+        align-content center
+        justify-content center
+        border-radius 15px
+        height 100%
+        width fit-content
+        display grid
+        grid-template-columns auto auto
+        padding 0 10px
+        column-gap 10px
+
+        @media (max-width 700px)
+          background none
+          padding 0
+          grid-template-columns auto
+
+        .author-avatar
+          width 50px
+          height 50px
+          background myBlack
+          border-radius 50%
+
+        .author-username
+          font-size 27px
+          color myWhite
+          white-space nowrap
+          overflow hidden
+          text-overflow ellipsis
+          text-align center
+          align-self center
+
+          @media (max-width 700px)
+            display none
 
     .trip-share-icon
       width 100%
@@ -226,6 +130,14 @@
       text-align center
       align-content center
       border-radius 10px
+      white-space nowrap
+      overflow hidden
+      text-overflow ellipsis
+
+      @media (max-width 700px)
+        width 100%
+        font-size 22px
+        padding 10px 20px
 
     .trip-date
       background myBlack
@@ -253,11 +165,37 @@
       display flex
       flex-direction row
       column-gap 20px
+      justify-content center
+      padding-bottom 30px
 
     .trip-photos
       display flex
+      flex-wrap wrap
       flex-direction row
       column-gap 20px
+      row-gap 20px
+
+      @media (max-width 700px)
+        column-gap 10px
+        row-gap 10px
+
+
+      .please-block
+        align-items center
+        display flex
+        flex-direction column
+
+        .please-img
+          height 200px
+          width 200px
+
+        .please-no-photo
+          font-size 24px
+          font-weight bold
+          color myBlack
+          margin auto
+          text-align center
+          width fit-content
 
     .add-photo-button
       color myWhite
diff --git a/src/styles/trips.styl b/src/styles/trips.styl
index 329df8d..8c0ef86 100644
--- a/src/styles/trips.styl
+++ b/src/styles/trips.styl
@@ -1,6 +1,117 @@
 .trips-page
   mixinSideMenu()
 
+  .blur-element
+    position fixed
+    inset 0
+    width 100%
+    height 100%
+    backdrop-filter blur(5px)
+    background myShadow
+    display block
+    opacity 1
+    transition opacity 0.3s ease
+    z-index 990
+
+    &.hidden
+      display none
+
+    &.hidden-animation
+      opacity 1
+
+  .share-block
+    position fixed
+    left 50%
+    top 50%
+    transform translate(-50%, -50%)
+    background myWhite
+    width 30%
+    height fit-content
+    padding 40px
+    justify-content center
+    align-content center
+    border-radius 20px
+    z-index 998
+    display grid
+    grid-template-rows auto auto auto
+    grid-template-columns 1fr 1fr
+    grid-template-areas "a a"\
+    "b b"\
+    "c d"
+    row-gap 15px
+    column-gap 10px
+    opacity 1
+    transition opacity 0.3s ease
+
+    @media (max-width 700px)
+      width 95%
+
+    .grid-share-block-title
+      grid-area a
+
+    .grid-share-link
+      grid-area b
+
+    .grid-read-mode
+      grid-area c
+
+    .grid-edit-mode
+      grid-area d
+
+
+    &.hidden
+      display none
+
+    &.hidden-animation
+      opacity 1
+
+    .share-link
+      border 2px solid myLightGrey
+      border-radius 10px
+      width 100%
+      padding 10px
+      overflow-x scroll
+      overflow-y hidden
+      scrollbar-width none
+      white-space nowrap
+      height 100%
+
+    .share-block-title
+      color myBlack
+      font-size 27px
+      justify-self center
+      text-align center
+
+    .read-mode
+      background myGrey
+      color myWhite
+      padding 5px 20px
+      cursor pointer
+      justify-self center
+      text-align center
+      align-content center
+      border-radius 10px
+      width 100%
+      transition background 0.3s ease
+
+      &:hover
+        background myPink
+
+    .edit-mode
+      background myGrey
+      color myWhite
+      padding 5px 20px
+      cursor pointer
+      justify-self center
+      text-align center
+      align-content center
+      border-radius 10px
+      width 100%
+      transition background 0.3s ease
+
+      &:hover
+        background myPink
+
   .trips-block
     mixinBlock(myBlack)
     display flex
@@ -82,24 +193,23 @@
       display grid
       gap 10px
       align-items center
-      grid-template-columns 10% 10% 50% 20% 5%
+      grid-template-columns 10% 10% 45% 15% 5% 5%
       grid-template-rows 1fr 1fr
-      grid-template-areas "a b c e g"\
-      "a b d e g"
+      grid-template-areas "a b c e f h"\
+      "a b d e g h"
 
       @media (max-width 700px)
-        grid-template-columns 15% 70% 15%
-        grid-template-areas "a c g"\
-        "a d g"
-
+        grid-template-rows 25% 30% 40%
+        grid-template-columns 1fr 1fr 1fr 1fr 1fr
+        grid-template-areas "a c c c c"\
+        "a d d d d"\
+        "a f g h ."
 
     .gallery-item-trips-bottom-panel
       display flex
       width 100%
       height 100%
       overflow-y hidden
-      overflow-x scroll
-      scrollbar-width none
       flex-direction row
       column-gap 20px
       opacity 1
@@ -116,6 +226,8 @@
         display flex
         flex-direction row
         column-gap 20px
+        overflow-x scroll
+        scrollbar-width none
 
       .add-photo-button
         color myWhite
@@ -184,10 +296,13 @@
       grid-area e
     .trips-edit-icon-grid
       grid-area f
-    .trips-delete-icon-grid
+    .trips-share-icon-grid
       grid-area g
+    .trips-delete-icon-grid
+      grid-area h
 
   .trips-trip-icon
+    display block
     width 65px
     height 65px
 
@@ -205,6 +320,7 @@
       display none
 
   .trips-open-icon
+    display block
     width 35px
     height 35px
     margin auto
@@ -216,6 +332,7 @@
       transform rotate(90deg)
 
   .trips-delete-icon
+    display block
     cursor pointer
     border-radius 10px
     height 100%
@@ -226,6 +343,43 @@
     &:hover
       background myRed
 
+    @media (max-width 700px)
+      width 32px
+      height 32px
+
+  .trips-edit-icon
+    display block
+    cursor pointer
+    border-radius 10px
+    height 100%
+    width 100%
+    background myBlack
+    transition background 0.3s ease
+    padding 5px
+
+    &:hover
+      background myPink
+
+    @media (max-width 700px)
+      width 32px
+      height 32px
+
+  .trips-share-icon
+    cursor pointer
+    border-radius 10px
+    height 100%
+    width 100%
+    background myBlack
+    transition background 0.3s ease
+    padding 5px
+
+    &:hover
+      background myPink
+
+    @media (max-width 700px)
+      width 32px
+      height 32px
+
   .trips-column-open
     display grid
     align-items center
diff --git a/src/utils/Api.ts b/src/utils/Api.ts
index 419dad5..6c95bd2 100644
--- a/src/utils/Api.ts
+++ b/src/utils/Api.ts
@@ -7,7 +7,7 @@ type JsonResponse<T> = {
     ok: boolean,
 }
 
-type Trip = {
+type Trips = {
     id: string,
     userId: number,
     name: string,
@@ -21,6 +21,28 @@ type Trip = {
     }[],
 }
 
+type Trip = {
+    trip: {
+        id: string,
+        userId: number,
+        name: string,
+        cityId: number,
+        description: string,
+        startDate: string,
+        endDate: string,
+        private: boolean,
+        photos: {
+            photoPath: string
+        }[],
+    },
+    users: {
+        username: string,
+        avatarPath: string,
+        email: string,
+    }[],
+    userAdded: boolean,
+}
+
 type TripPhoto = {
     photoPath: string
 };
@@ -111,6 +133,12 @@ type Avatar = {
     avatarPath: string,
 }
 
+type Author = {
+    login: string,
+    avatar_path: string | null,
+    email: string,
+}
+
 type Profile = {
     username: string,
     avatarPath: string | null,
@@ -135,8 +163,27 @@ type Link = {
     link: string,
 }
 
-export default {
+type Achievements = {
+        id: number,
+        name: string,
+        iconPath: string,
+}
 
+export default {
+    async getAchievements(userId: string): Promise<JsonResponse<Achievements[]>> {
+        const res = await RESTApi.get(`api/v1/users/${userId}/achievements`);
+        return {
+            data: Array.isArray(res.data) ? res.data.map( (achievement: any) =>
+                ({
+                    id: Number(achievement.id),
+                    name: String(achievement.name),
+                    iconPath: String(achievement.icon_path),
+                })) : [],
+            status: res.status,
+            ok: res.ok,
+        };
+    },
+    
     async getStat(surveyId: string) {
         const res = await RESTApi.get(`/api/v1/survey/stats/${surveyId}`);
         return {
@@ -272,7 +319,7 @@ export default {
         };
     },
 
-    async getUserTrips(id: string): Promise<JsonResponse<Trip[]>> {
+    async getUserTrips(id: string): Promise<JsonResponse<Trips[]>> {
         const res = await RESTApi.get(`/api/v1/users/${id}/trips`);
         return {
             data: Array.isArray(res.data) ? res.data.map( (trip) => ({
@@ -293,28 +340,40 @@ export default {
         };
     },
 
-    async getTrip(tripId: number): Promise<JsonResponse<Trip>> {
-        const res = await RESTApi.get(`/api/v1/trips/${tripId}`);
+    async getTrip(tripId: number, userId: string | undefined = undefined): Promise<JsonResponse<Trip>> {
+        let reqUrl = `/api/v1/trips/${tripId}`;
+        if (userId) {
+            reqUrl = reqUrl + `?user_id=${userId}`;
+        }
+        const res = await RESTApi.get(reqUrl);
         return {
             data: {
-                userId: Number(res.data.user_id),
-                id: String(res.data.id),
-                name: String(res.data.name),
-                cityId: Number(res.data.city_id),
-                description: String(res.data.description),
-                startDate: formatDate(res.data.start_date),
-                endDate: formatDate(res.data.end_date),
-                private: Boolean(res.data.private),
-                photos: Array.isArray(res.data.photos)
-                    ? res.data.photos.map((photo: any) => ({ photoPath: String(photo) }))
-                    : [],
+                trip: {
+                    userId: Number(res.data.trip.user_id),
+                    id: String(res.data.trip.id),
+                    name: String(res.data.trip.name),
+                    cityId: Number(res.data.trip.city_id),
+                    description: String(res.data.trip.description),
+                    startDate: formatDate(res.data.trip.start_date),
+                    endDate: formatDate(res.data.trip.end_date),
+                    private: Boolean(res.data.trip.private),
+                    photos: Array.isArray(res.data.trip.photos)
+                        ? res.data.trip.photos.map((photo: any) => ({ photoPath: String(photo) }))
+                        : [],
+                },
+                users: Array.isArray(res.data.users) ? res.data.users.map( (user: Author) => ({
+                    username: String(user.login),
+                    avatarPath: String(user.avatar_path),
+                    email: String(user.email),
+                })) : [],
+                userAdded: Boolean(res.data.user_added),
             },
             status: res.status,
             ok: res.ok,
         };
     },
 
-    async postTripLink(tripId: number, option: string): Promise<JsonResponse<Link>> {
+    async postTripLink(tripId: string, option: string): Promise<JsonResponse<Link>> {
         const res = await RESTApi.post(`/api/v1/trips/${tripId}/share?sharing_option=${option}`, {});
         return {
             data: {
@@ -431,6 +490,17 @@ export default {
         };
     },
 
+    async postPhotos(tripId: string, newPhotos: string[]): Promise<JsonResponse<TripPhoto[]>> {
+        const res = await RESTApi.post(`/api/v1/trips/${tripId}/photos`, {photos: newPhotos});
+        return {
+            data: Array.isArray(res.data) ? res.data.map( (photo) => ({
+                photoPath: String(photo.photoPath),
+            })) : [],
+            status: res.status,
+            ok: res.ok,
+        };
+    },
+
     async putTrip(tripId: number, userId:number, name: string, cityId: number, description: string, startDate: string, endDate: string, privateTrip: boolean): Promise<JsonResponse<Trip>> {
         const res = await RESTApi.put(`/api/v1/trips/${tripId}`, {user_id: userId, name, city_id: cityId, description: description, start_date: startDate, end_date: endDate, private_trip: privateTrip });
         return {
@@ -480,17 +550,6 @@ export default {
         };
     },
 
-    async putPhotos(tripId: string, newPhotos: string[]): Promise<JsonResponse<TripPhoto[]>> {
-        const res = await RESTApi.put(`/api/v1/trips/${tripId}/photos`, {photos: newPhotos});
-        return {
-            data: Array.isArray(res.data) ? res.data.map( (photo) => ({
-                photoPath: String(photo.photoPath),
-            })) : [],
-            status: res.status,
-            ok: res.ok,
-        };
-    },
-
     async deleteTrip(id: string): Promise<JsonResponse<Response>> {
         const res = await RESTApi.delete(`/api/v1/trips/${id}`, {id: id});
         return {
diff --git a/src/utils/search-memory.ts b/src/utils/search-memory.ts
index d11037d..0cae016 100644
--- a/src/utils/search-memory.ts
+++ b/src/utils/search-memory.ts
@@ -7,6 +7,7 @@ class Search {
     cityId: number;
     categoryId: number;
     filterId: number;
+    categoryActiveElement: HTMLButtonElement | null;
 
 
     private constructor() {
@@ -15,6 +16,7 @@ class Search {
         this.offset = 0;
         this.cityId = -1;
         this.categoryId = -1;
+        this.categoryActiveElement = null;
         this.filterId = -1;
     }
 
diff --git a/webpack.config.js b/webpack.config.js
index 2f079f7..0769ba7 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -89,7 +89,7 @@ module.exports = {
                         beautify: false, // Отключает форматирование выходного файла.
                     },
                     compress: {
-                        drop_console: true, // Удаляет все console.log
+                        // drop_console: true, // Удаляет все console.log
                         drop_debugger: true, // Удаляет все debugger
                         ecma: 2020, // Указывает стандарт ECMAScript для оптимизации
                     },