diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..6f3a291
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "liveServer.settings.port": 5501
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 39bd0c7..16c67af 100644
--- a/package.json
+++ b/package.json
@@ -48,16 +48,8 @@
       "react-app/jest"
     ]
   },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  }
+  "browserslist": [
+    "defaults",
+    "not ie 11" 
+  ]
 }
diff --git a/public/bonus.svg b/public/bonus.svg
index 1aaec19..94acde9 100644
--- a/public/bonus.svg
+++ b/public/bonus.svg
@@ -1,13 +1,14 @@
-<svg width="99" height="28" viewBox="0 0 99 28" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.766 20V8.4H5.942C8.102 8.4 10.022 8.96 10.022 11.264C10.022 12.368 9.558 13.36 8.742 13.824C9.846 14.288 10.502 15.152 10.502 16.576C10.502 19.04 8.662 20 6.342 20H1.766ZM3.398 14.656V18.624H6.358C8.022 18.624 8.822 17.92 8.822 16.592C8.822 15.232 8.006 14.656 6.262 14.656H3.398ZM3.398 9.776V13.36H6.198C7.542 13.36 8.374 12.848 8.374 11.488C8.374 10.288 7.494 9.776 6.198 9.776H3.398ZM13.4402 15.728C13.4402 18.032 14.6882 18.928 16.0162 18.928C17.3442 18.928 18.5922 17.936 18.5922 15.728C18.5922 13.424 17.3442 12.528 16.0162 12.528C14.6882 12.528 13.4402 13.376 13.4402 15.728ZM16.0162 11.248C18.0162 11.248 20.1442 12.608 20.1442 15.728C20.1442 18.848 18.0162 20.208 16.0162 20.208C14.0162 20.208 11.8882 18.848 11.8882 15.728C11.8882 12.608 14.0162 11.248 16.0162 11.248ZM23.3417 11.392V12.688C23.8377 11.872 24.6697 11.248 26.1257 11.248C28.2057 11.248 28.9577 12.592 28.9577 14.56V20H27.5017V14.992C27.5017 13.664 27.2777 12.512 25.6137 12.512C24.2057 12.512 23.3417 13.472 23.3417 15.328V20H21.8857V11.392H23.3417ZM36.4637 20V18.768C35.9677 19.584 35.1837 20.208 33.7597 20.208C31.7757 20.208 31.0077 18.864 31.0077 16.896V11.392H32.4637V16.464C32.4637 17.792 32.6717 18.944 34.2717 18.944C35.6637 18.944 36.4637 17.984 36.4637 16.128V11.392H37.9197V20H36.4637ZM46.6775 13.904H45.1575C44.9175 12.88 44.1495 12.48 43.1255 12.48C42.2775 12.48 41.3175 12.784 41.3175 13.568C41.3175 14.256 41.7975 14.56 42.6295 14.736L43.8455 14.976C45.4135 15.264 46.7895 15.888 46.7895 17.536C46.7895 19.248 45.2535 20.208 43.2855 20.208C41.0295 20.208 39.7655 18.72 39.5895 17.216H41.1255C41.3655 18.32 42.0375 18.976 43.3175 18.976C44.4215 18.976 45.3175 18.512 45.3175 17.696C45.3175 16.816 44.5015 16.48 43.5735 16.272L42.2935 16.016C41.1255 15.76 39.8455 15.248 39.8455 13.632C39.8455 12.112 41.3815 11.232 43.2855 11.232C45.1575 11.232 46.4055 12.256 46.6775 13.904ZM56.2358 16.176H49.6117C49.6597 18.032 51.0037 18.928 52.2677 18.928C53.5477 18.928 54.2517 18.352 54.6197 17.504H56.1237C55.7397 18.976 54.3637 20.208 52.2677 20.208C49.5477 20.208 48.0437 18.256 48.0437 15.712C48.0437 12.976 49.8677 11.248 52.2197 11.248C54.8597 11.248 56.4117 13.44 56.2358 16.176ZM52.2197 12.496C50.9397 12.496 49.7557 13.2 49.6277 14.928H54.6997C54.6517 13.712 53.7717 12.496 52.2197 12.496ZM64.4119 13.904H62.8919C62.6519 12.88 61.8839 12.48 60.8599 12.48C60.0119 12.48 59.0519 12.784 59.0519 13.568C59.0519 14.256 59.5319 14.56 60.3639 14.736L61.5799 14.976C63.1479 15.264 64.5239 15.888 64.5239 17.536C64.5239 19.248 62.9879 20.208 61.0199 20.208C58.7639 20.208 57.4999 18.72 57.3239 17.216H58.8599C59.0999 18.32 59.7719 18.976 61.0519 18.976C62.1559 18.976 63.0519 18.512 63.0519 17.696C63.0519 16.816 62.2359 16.48 61.3079 16.272L60.0279 16.016C58.8599 15.76 57.5799 15.248 57.5799 13.632C57.5799 12.112 59.1159 11.232 61.0199 11.232C62.8919 11.232 64.1399 12.256 64.4119 13.904Z" fill="#1D1D1D"/>
+<svg width="172" height="24" viewBox="0 0 172 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.79909 18V6.36364H8.82182V7.61364H3.20818V11.5455H8.45818V12.7955H3.20818V16.75H8.91273V18H1.79909ZM10.6343 18L14.1798 13.5682L10.6798 9.27273H12.2707L15.1798 13H15.907V9.27273H17.248V13H17.9525L20.8616 9.27273H22.4525L18.9752 13.5682L22.498 18H20.8843L17.9298 14.25H17.248V18H15.907V14.25H15.2252L12.248 18H10.6343ZM27.7139 18.1818C26.873 18.1818 26.1476 17.9962 25.5377 17.625C24.9317 17.25 24.4639 16.7273 24.1343 16.0568C23.8086 15.3826 23.6457 14.5985 23.6457 13.7045C23.6457 12.8106 23.8086 12.0227 24.1343 11.3409C24.4639 10.6553 24.9222 10.1212 25.5093 9.73864C26.1002 9.35227 26.7896 9.15909 27.5775 9.15909C28.032 9.15909 28.4809 9.23485 28.9241 9.38636C29.3673 9.53788 29.7707 9.78409 30.1343 10.125C30.498 10.4621 30.7877 10.9091 31.0036 11.4659C31.2195 12.0227 31.3275 12.7083 31.3275 13.5227V14.0909H24.6002V12.9318H29.9639C29.9639 12.4394 29.8654 12 29.6684 11.6136C29.4752 11.2273 29.1987 10.9223 28.8389 10.6989C28.4828 10.4754 28.0623 10.3636 27.5775 10.3636C27.0434 10.3636 26.5813 10.4962 26.1911 10.7614C25.8048 11.0227 25.5074 11.3636 25.2991 11.7841C25.0908 12.2045 24.9866 12.6553 24.9866 13.1364V13.9091C24.9866 14.5682 25.1002 15.1269 25.3275 15.5852C25.5586 16.0398 25.8786 16.3864 26.2877 16.625C26.6968 16.8598 27.1722 16.9773 27.7139 16.9773C28.0661 16.9773 28.3843 16.928 28.6684 16.8295C28.9563 16.7273 29.2044 16.5758 29.4127 16.375C29.6211 16.1705 29.782 15.9167 29.8957 15.6136L31.1911 15.9773C31.0548 16.4167 30.8256 16.803 30.5036 17.1364C30.1817 17.4659 29.7839 17.7235 29.3105 17.9091C28.837 18.0909 28.3048 18.1818 27.7139 18.1818ZM32.4355 20.5V16.75H33.1627C33.3408 16.5644 33.4942 16.3636 33.623 16.1477C33.7517 15.9318 33.8635 15.6761 33.9582 15.3807C34.0567 15.0814 34.14 14.7178 34.2082 14.2898C34.2764 13.858 34.337 13.3371 34.39 12.7273L34.6855 9.27273H40.2309V16.75H41.5718V20.5H40.2309V18H33.7764V20.5H32.4355ZM34.6855 16.75H38.89V10.5227H35.9355L35.7082 12.7273C35.6135 13.6402 35.4961 14.4375 35.3559 15.1193C35.2158 15.8011 34.9923 16.3447 34.6855 16.75ZM47.0107 18.1818C46.1698 18.1818 45.4445 17.9962 44.8346 17.625C44.2285 17.25 43.7607 16.7273 43.4312 16.0568C43.1054 15.3826 42.9426 14.5985 42.9426 13.7045C42.9426 12.8106 43.1054 12.0227 43.4312 11.3409C43.7607 10.6553 44.2191 10.1212 44.8062 9.73864C45.3971 9.35227 46.0865 9.15909 46.8744 9.15909C47.3289 9.15909 47.7778 9.23485 48.221 9.38636C48.6641 9.53788 49.0676 9.78409 49.4312 10.125C49.7948 10.4621 50.0846 10.9091 50.3005 11.4659C50.5164 12.0227 50.6244 12.7083 50.6244 13.5227V14.0909H43.8971V12.9318H49.2607C49.2607 12.4394 49.1623 12 48.9653 11.6136C48.7721 11.2273 48.4956 10.9223 48.1357 10.6989C47.7797 10.4754 47.3592 10.3636 46.8744 10.3636C46.3403 10.3636 45.8782 10.4962 45.488 10.7614C45.1016 11.0227 44.8043 11.3636 44.596 11.7841C44.3876 12.2045 44.2835 12.6553 44.2835 13.1364V13.9091C44.2835 14.5682 44.3971 15.1269 44.6244 15.5852C44.8554 16.0398 45.1755 16.3864 45.5846 16.625C45.9937 16.8598 46.4691 16.9773 47.0107 16.9773C47.363 16.9773 47.6812 16.928 47.9653 16.8295C48.2532 16.7273 48.5013 16.5758 48.7096 16.375C48.9179 16.1705 49.0789 15.9167 49.1926 15.6136L50.488 15.9773C50.3516 16.4167 50.1225 16.803 49.8005 17.1364C49.4785 17.4659 49.0808 17.7235 48.6073 17.9091C48.1338 18.0909 47.6016 18.1818 47.0107 18.1818ZM58.5051 13.0227V14.2727H53.6869V13.0227H58.5051ZM54.0051 9.27273V18H52.6641V9.27273H54.0051ZM59.5278 9.27273V18H58.1869V9.27273H59.5278ZM65.6357 18.1818C64.7948 18.1818 64.0695 17.9962 63.4596 17.625C62.8535 17.25 62.3857 16.7273 62.0562 16.0568C61.7304 15.3826 61.5676 14.5985 61.5676 13.7045C61.5676 12.8106 61.7304 12.0227 62.0562 11.3409C62.3857 10.6553 62.8441 10.1212 63.4312 9.73864C64.0221 9.35227 64.7115 9.15909 65.4994 9.15909C65.9539 9.15909 66.4028 9.23485 66.846 9.38636C67.2891 9.53788 67.6926 9.78409 68.0562 10.125C68.4198 10.4621 68.7096 10.9091 68.9255 11.4659C69.1414 12.0227 69.2494 12.7083 69.2494 13.5227V14.0909H62.5221V12.9318H67.8857C67.8857 12.4394 67.7873 12 67.5903 11.6136C67.3971 11.2273 67.1206 10.9223 66.7607 10.6989C66.4047 10.4754 65.9842 10.3636 65.4994 10.3636C64.9653 10.3636 64.5032 10.4962 64.113 10.7614C63.7266 11.0227 63.4293 11.3636 63.221 11.7841C63.0126 12.2045 62.9085 12.6553 62.9085 13.1364V13.9091C62.9085 14.5682 63.0221 15.1269 63.2494 15.5852C63.4804 16.0398 63.8005 16.3864 64.2096 16.625C64.6187 16.8598 65.0941 16.9773 65.6357 16.9773C65.988 16.9773 66.3062 16.928 66.5903 16.8295C66.8782 16.7273 67.1263 16.5758 67.3346 16.375C67.5429 16.1705 67.7039 15.9167 67.8176 15.6136L69.113 15.9773C68.9766 16.4167 68.7475 16.803 68.4255 17.1364C68.1035 17.4659 67.7058 17.7235 67.2323 17.9091C66.7588 18.0909 66.2266 18.1818 65.6357 18.1818ZM71.2891 18V9.27273H74.8573C75.7967 9.27273 76.5429 9.48485 77.096 9.90909C77.649 10.3333 77.9255 10.8939 77.9255 11.5909C77.9255 12.1212 77.7683 12.5322 77.4539 12.8239C77.1395 13.1117 76.7361 13.3068 76.2437 13.4091C76.5657 13.4545 76.8782 13.5682 77.1812 13.75C77.488 13.9318 77.7418 14.1818 77.9426 14.5C78.1433 14.8144 78.2437 15.2008 78.2437 15.6591C78.2437 16.1061 78.1301 16.5057 77.9028 16.858C77.6755 17.2102 77.3498 17.4886 76.9255 17.6932C76.5013 17.8977 75.9937 18 75.4028 18H71.2891ZM72.5619 16.7727H75.4028C75.8649 16.7727 76.2266 16.6629 76.488 16.4432C76.7494 16.2235 76.8801 15.9242 76.8801 15.5455C76.8801 15.0947 76.7494 14.7405 76.488 14.483C76.2266 14.2216 75.8649 14.0909 75.4028 14.0909H72.5619V16.7727ZM72.5619 12.9318H74.8573C75.2172 12.9318 75.5259 12.8826 75.7835 12.7841C76.041 12.6818 76.238 12.5379 76.3744 12.3523C76.5145 12.1629 76.5846 11.9394 76.5846 11.6818C76.5846 11.3144 76.4312 11.0265 76.1244 10.8182C75.8176 10.6061 75.3952 10.5 74.8573 10.5H72.5619V12.9318ZM86.1144 13.0227V14.2727H81.2962V13.0227H86.1144ZM81.6144 9.27273V18H80.2735V9.27273H81.6144ZM87.1372 9.27273V18H85.7962V9.27273H87.1372ZM90.7451 12.4318H93.2451C94.2678 12.4318 95.05 12.6913 95.5917 13.2102C96.1334 13.7292 96.4042 14.3864 96.4042 15.1818C96.4042 15.7045 96.283 16.1799 96.0406 16.608C95.7981 17.0322 95.4421 17.3712 94.9724 17.625C94.5027 17.875 93.9269 18 93.2451 18H89.586V9.27273H90.9269V16.75H93.2451C93.7754 16.75 94.211 16.6098 94.5519 16.3295C94.8928 16.0492 95.0633 15.6894 95.0633 15.25C95.0633 14.7879 94.8928 14.411 94.5519 14.1193C94.211 13.8277 93.7754 13.6818 93.2451 13.6818H90.7451V12.4318ZM97.7906 18V9.27273H99.1315V18H97.7906ZM102.927 16.0227L107.131 9.27273H108.677V18H107.336V11.25L103.154 18H101.586V9.27273H102.927V16.0227ZM106.245 6.36364H107.495C107.495 6.97727 107.283 7.47917 106.859 7.86932C106.435 8.25947 105.859 8.45455 105.131 8.45455C104.416 8.45455 103.845 8.25947 103.421 7.86932C103.001 7.47917 102.791 6.97727 102.791 6.36364H104.041C104.041 6.65909 104.122 6.91856 104.285 7.14205C104.452 7.36553 104.734 7.47727 105.131 7.47727C105.529 7.47727 105.813 7.36553 105.984 7.14205C106.158 6.91856 106.245 6.65909 106.245 6.36364ZM115.133 10.5227V9.27273H122.224V10.5227H119.36V18H118.019V10.5227H115.133ZM125.043 21.2727C124.816 21.2727 124.613 21.2538 124.435 21.2159C124.257 21.1818 124.134 21.1477 124.066 21.1136L124.407 19.9318C124.733 20.0152 125.021 20.0455 125.271 20.0227C125.521 20 125.742 19.8883 125.935 19.6875C126.132 19.4905 126.312 19.1705 126.475 18.7273L126.725 18.0455L123.498 9.27273H124.952L127.362 16.2273H127.452L129.862 9.27273H131.316L127.612 19.2727C127.445 19.7235 127.238 20.0966 126.992 20.392C126.746 20.6913 126.46 20.9129 126.134 21.0568C125.812 21.2008 125.449 21.2727 125.043 21.2727ZM133.086 21.2727V9.27273H134.381V10.6591H134.541C134.639 10.5076 134.775 10.3144 134.95 10.0795C135.128 9.84091 135.381 9.62879 135.711 9.44318C136.044 9.25379 136.495 9.15909 137.063 9.15909C137.798 9.15909 138.446 9.3428 139.006 9.71023C139.567 10.0777 140.005 10.5985 140.319 11.2727C140.633 11.947 140.791 12.7424 140.791 13.6591C140.791 14.5833 140.633 15.3845 140.319 16.0625C140.005 16.7367 139.569 17.2595 139.012 17.6307C138.455 17.9981 137.813 18.1818 137.086 18.1818C136.525 18.1818 136.077 18.089 135.739 17.9034C135.402 17.714 135.143 17.5 134.961 17.2614C134.779 17.0189 134.639 16.8182 134.541 16.6591H134.427V21.2727H133.086ZM134.404 13.6364C134.404 14.2955 134.501 14.8769 134.694 15.3807C134.887 15.8807 135.169 16.2727 135.541 16.5568C135.912 16.8371 136.366 16.9773 136.904 16.9773C137.465 16.9773 137.933 16.8295 138.308 16.5341C138.686 16.2348 138.97 15.8333 139.16 15.3295C139.353 14.822 139.45 14.2576 139.45 13.6364C139.45 13.0227 139.355 12.4697 139.166 11.9773C138.98 11.4811 138.698 11.089 138.319 10.8011C137.944 10.5095 137.472 10.3636 136.904 10.3636C136.359 10.3636 135.9 10.5019 135.529 10.7784C135.158 11.0511 134.878 11.4337 134.688 11.9261C134.499 12.4148 134.404 12.9848 134.404 13.6364Z" fill="#1D1D1D"/>
 <g clip-path="url(#clip0_0_17)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M77.4847 20.9645C74.9856 18.3467 75.6848 13.5071 79.0997 10.0959C82.5379 6.6614 87.4464 5.98354 90.0476 8.57071C90.1433 8.66633 90.2346 8.76506 90.3214 8.86673L91.1674 9.71179C93.7686 12.299 93.1239 17.2586 89.6858 20.6931C87.65 22.7267 85.1053 23.8 82.8208 23.8C81.2487 23.8 79.8011 23.2916 78.7379 22.2296L77.5052 20.9868C77.4979 20.9797 77.4911 20.9722 77.4847 20.9645ZM79.5182 10.5365C81.4409 8.6159 83.8386 7.59911 85.9534 7.59911C87.3785 7.59911 88.6565 8.06231 89.6065 9.01131C91.9703 11.3612 91.2803 15.8916 88.0797 19.0888C84.8791 22.286 80.3551 22.9639 77.9914 20.6141C75.639 18.2528 76.3175 13.7337 79.5182 10.5365ZM81.803 20.9529C80.6268 20.9529 79.575 20.5801 78.7946 19.8119C77.822 18.8403 77.4487 17.4055 77.7315 15.7673C78.0142 14.1631 78.8964 12.5587 80.2197 11.237C81.5429 9.91509 83.1489 9.03387 84.7548 8.75143C86.3835 8.45769 87.8311 8.84181 88.8037 9.81341C89.7764 10.785 90.1496 12.2199 89.8669 13.8579C89.5841 15.4623 88.702 17.0665 87.3787 18.3883C85.7049 20.0604 83.6239 20.9529 81.803 20.9529ZM85.8067 9.25982C85.5013 9.25982 85.1959 9.28242 84.868 9.35021C83.3864 9.61005 81.8935 10.4348 80.6607 11.6662C79.428 12.8976 78.6023 14.4003 78.3422 15.869C78.0934 17.3037 78.4101 18.5578 79.2357 19.3825C80.9661 21.1111 84.4382 20.4785 86.9603 17.959C88.1931 16.7276 89.0187 15.225 89.2788 13.7563C89.5276 12.3215 89.2109 11.0675 88.3853 10.2427C87.7407 9.59875 86.8472 9.25982 85.8067 9.25982Z" fill="#1D1D1D"/>
-<path d="M93.4095 3.57935C93.8537 3.48243 94.1601 4.0132 93.8541 4.34942L92.0013 6.38494C91.8996 6.49673 91.8583 6.65088 91.8905 6.79856L92.4773 9.48777C92.5742 9.93195 92.0434 10.2384 91.7072 9.93236L89.6717 8.07959C89.5599 7.97783 89.4058 7.93653 89.2581 7.96876L86.5689 8.55555C86.1247 8.65247 85.8183 8.1217 86.1243 7.78548L87.9771 5.74996C88.0788 5.63817 88.1202 5.48402 88.0879 5.33634L87.5011 2.64713C87.4042 2.20294 87.935 1.8965 88.2712 2.20254L90.3067 4.05531C90.4185 4.15707 90.5727 4.19837 90.7203 4.16614L93.4095 3.57935Z" fill="#FFCF08"/>
-<path d="M96.8931 8.67839C97.3373 8.58147 97.6438 9.11224 97.3378 9.44846L96.4849 10.3854C96.3831 10.4972 96.3418 10.6514 96.3741 10.799L96.6442 12.0369C96.7411 12.4811 96.2103 12.7875 95.8741 12.4815L94.9371 11.6287C94.8253 11.5269 94.6712 11.4856 94.5235 11.5178L93.2857 11.7879C92.8414 11.8849 92.535 11.3541 92.841 11.0178L93.6939 10.0809C93.7957 9.96911 93.8369 9.81496 93.8047 9.66728L93.5346 8.42943C93.4377 7.98523 93.9685 7.67879 94.3047 7.98482L95.2417 8.83767C95.3534 8.93942 95.5076 8.98072 95.6552 8.9485L96.8931 8.67839Z" fill="#FFCF08"/>
+<path d="M168.39 6C168.39 4.34297 169.733 3 171.39 3C169.733 3 168.39 1.65703 168.39 0C168.39 1.65703 167.047 3 165.39 3C167.047 3 168.39 4.34297 168.39 6Z" fill="black"/>
+<path d="M169.14 9C169.14 10.2427 168.133 11.25 166.89 11.25C168.133 11.25 169.14 12.2573 169.14 13.5C169.14 12.2573 170.147 11.25 171.39 11.25C170.147 11.25 169.14 10.2427 169.14 9Z" fill="black"/>
+<path d="M157.89 9C157.89 6.51469 159.905 4.5 162.39 4.5C159.905 4.5 157.89 2.48531 157.89 0C157.89 2.48531 155.875 4.5 153.39 4.5C155.875 4.5 157.89 6.51469 157.89 9Z" fill="black"/>
+<path d="M163.89 4.5L147.39 21L150.39 24L166.89 7.5L163.89 4.5ZM161.329 9.31078L163.45 7.18969L164.2 7.93969L162.079 10.0608L161.329 9.31078Z" fill="black"/>
 </g>
 <defs>
 <clipPath id="clip0_0_17">
-<rect width="28" height="27" fill="white" transform="translate(70.39 0.5)"/>
+<rect width="24" height="24" fill="white" transform="translate(147.39)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/public/favicon.ico b/public/favicon.ico
index a11777c..92589a2 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/favorites.svg b/public/favorites.svg
index 0a6b8cd..f5535e3 100644
--- a/public/favorites.svg
+++ b/public/favorites.svg
@@ -1,8 +1,8 @@
-<svg width="127" height="49" viewBox="0 0 127 49" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="144" height="49" viewBox="0 0 144 49" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_0_50)">
 <path fill-rule="evenodd" clip-rule="evenodd" d="M33.7818 18.0905C31.8338 16.0982 28.6283 16.0982 26.6803 18.0905L26.3 18.4794L25.9197 18.0905C23.9717 16.0982 20.7662 16.0982 18.8182 18.0905C16.9311 20.0205 16.9311 23.1043 18.8182 25.0342L25.1607 31.5209C25.7857 32.1601 26.8143 32.1601 27.4393 31.5209L33.7818 25.0342C35.6689 23.1043 35.6689 20.0205 33.7818 18.0905Z" fill="#1D1D1D"/>
 </g>
-<path d="M46.5871 30.5V19.625H53.6521V20.945H48.1171V24.245H53.3371V25.565H48.1171V30.5H46.5871ZM59.8556 27.125V26.615C57.3806 26.855 55.8056 27.23 55.8056 28.34C55.8056 29.105 56.3906 29.615 57.3656 29.615C58.6406 29.615 59.8556 29.03 59.8556 27.125ZM57.0656 30.695C55.5506 30.695 54.2906 29.855 54.2906 28.37C54.2906 26.465 56.4506 25.895 59.7506 25.535V25.34C59.7506 23.855 58.9406 23.375 57.9206 23.375C56.7806 23.375 56.1356 23.975 56.0756 24.98H54.6656C54.7856 23.24 56.3456 22.265 57.9056 22.265C60.1406 22.265 61.1306 23.315 61.1156 25.595L61.1006 27.455C61.0856 28.82 61.1456 29.735 61.3106 30.5H59.9306C59.8856 30.2 59.8406 29.87 59.8256 29.39C59.3306 30.23 58.5056 30.695 57.0656 30.695ZM63.5113 22.43L65.7013 28.61L67.8913 22.43H69.3013L66.2563 30.5H65.0413L61.9963 22.43H63.5113ZM71.1694 26.495C71.1694 28.655 72.3394 29.495 73.5844 29.495C74.8294 29.495 75.9994 28.565 75.9994 26.495C75.9994 24.335 74.8294 23.495 73.5844 23.495C72.3394 23.495 71.1694 24.29 71.1694 26.495ZM73.5844 22.295C75.4594 22.295 77.4544 23.57 77.4544 26.495C77.4544 29.42 75.4594 30.695 73.5844 30.695C71.7094 30.695 69.7144 29.42 69.7144 26.495C69.7144 23.57 71.7094 22.295 73.5844 22.295ZM83.107 22.4V23.855C82.822 23.81 82.567 23.795 82.342 23.795C81.082 23.795 80.452 24.485 80.452 26.27V30.5H79.087V22.43H80.422V23.84C80.827 22.925 81.637 22.43 82.702 22.385C82.837 22.385 82.942 22.385 83.107 22.4ZM84.4191 22.43H85.7841V30.5H84.4191V22.43ZM84.4191 19.625H85.7841V21.275H84.4191V19.625ZM88.3393 22.43V20.405H89.7043V22.43H91.2343V23.525H89.7043V28.31C89.7043 29.15 89.7643 29.36 90.5443 29.36H91.2343V30.5H90.2443C88.6993 30.5 88.3393 30.155 88.3393 28.475V23.525H87.0643V22.43H88.3393ZM99.879 26.915H93.669C93.714 28.655 94.974 29.495 96.159 29.495C97.359 29.495 98.019 28.955 98.364 28.16H99.774C99.414 29.54 98.124 30.695 96.159 30.695C93.609 30.695 92.199 28.865 92.199 26.48C92.199 23.915 93.909 22.295 96.114 22.295C98.589 22.295 100.044 24.35 99.879 26.915ZM96.114 23.465C94.914 23.465 93.804 24.125 93.684 25.745H98.439C98.394 24.605 97.569 23.465 96.114 23.465ZM107.544 24.785H106.119C105.894 23.825 105.174 23.45 104.214 23.45C103.419 23.45 102.519 23.735 102.519 24.47C102.519 25.115 102.969 25.4 103.749 25.565L104.889 25.79C106.359 26.06 107.649 26.645 107.649 28.19C107.649 29.795 106.209 30.695 104.364 30.695C102.249 30.695 101.064 29.3 100.899 27.89H102.339C102.564 28.925 103.194 29.54 104.394 29.54C105.429 29.54 106.269 29.105 106.269 28.34C106.269 27.515 105.504 27.2 104.634 27.005L103.434 26.765C102.339 26.525 101.139 26.045 101.139 24.53C101.139 23.105 102.579 22.28 104.364 22.28C106.119 22.28 107.289 23.24 107.544 24.785Z" fill="#1D1D1D"/>
+<path d="M46.3329 18.5909H47.6326V27.1776H47.7392L53.7051 18.5909H54.9835V29.5H53.6625V20.9347H53.5559L47.6113 29.5H46.3329V18.5909ZM56.9451 27.4119H58.2874C58.3158 27.7812 58.4827 28.0618 58.7881 28.2536C59.097 28.4453 59.4983 28.5412 59.9919 28.5412C60.4962 28.5412 60.9277 28.4382 61.2863 28.2322C61.645 28.0227 61.8243 27.6854 61.8243 27.2202C61.8243 26.9467 61.7568 26.7088 61.6219 26.5064C61.487 26.3004 61.297 26.1406 61.0519 26.027C60.8069 25.9134 60.5175 25.8565 60.1837 25.8565H58.7774V24.7273H60.1837C60.6844 24.7273 61.0537 24.6136 61.2916 24.3864C61.5331 24.1591 61.6539 23.875 61.6539 23.5341C61.6539 23.1683 61.5242 22.8754 61.265 22.6552C61.0058 22.4315 60.6382 22.3196 60.1624 22.3196C59.683 22.3196 59.2835 22.4279 58.9639 22.6445C58.6443 22.8576 58.4756 23.1328 58.4578 23.4702H57.1368C57.151 23.0298 57.286 22.641 57.5416 22.3036C57.7973 21.9627 58.1453 21.6964 58.5857 21.5046C59.026 21.3093 59.5303 21.2116 60.0985 21.2116C60.6737 21.2116 61.1727 21.3129 61.5953 21.5153C62.0214 21.7141 62.3499 21.9858 62.5807 22.3303C62.8151 22.6712 62.9323 23.0582 62.9323 23.4915C62.9323 23.9531 62.8027 24.326 62.5434 24.6101C62.2842 24.8942 61.9593 25.0966 61.5686 25.2173V25.3026C61.8776 25.3239 62.1457 25.4233 62.373 25.6009C62.6038 25.7749 62.7831 26.0039 62.911 26.288C63.0388 26.5685 63.1027 26.8793 63.1027 27.2202C63.1027 27.7173 62.9696 28.1506 62.7032 28.5199C62.4369 28.8857 62.0711 29.1697 61.6059 29.3722C61.1407 29.571 60.6098 29.6705 60.0132 29.6705C59.4344 29.6705 58.9159 29.5763 58.4578 29.3881C57.9997 29.1964 57.6357 28.9318 57.3659 28.5945C57.0995 28.2536 56.9593 27.8594 56.9451 27.4119ZM70.941 18.25L71.5802 19.017C71.3316 19.2585 71.044 19.4272 70.7172 19.5231C70.3905 19.619 70.0212 19.6776 69.6093 19.6989C69.1974 19.7202 68.7393 19.7415 68.235 19.7628C67.6668 19.7841 67.1963 19.9226 66.8234 20.1783C66.4506 20.4339 66.1629 20.8033 65.9605 21.2862C65.7581 21.7692 65.6285 22.3622 65.5716 23.0653H65.6782C65.9552 22.554 66.3387 22.1776 66.8288 21.9361C67.3188 21.6946 67.8444 21.5739 68.4055 21.5739C69.0447 21.5739 69.6199 21.723 70.1313 22.0213C70.6427 22.3196 71.0475 22.7617 71.3458 23.3477C71.6441 23.9336 71.7932 24.6562 71.7932 25.5156C71.7932 26.3714 71.6405 27.1101 71.3351 27.7315C71.0333 28.353 70.6089 28.8324 70.0621 29.1697C69.5187 29.5036 68.8813 29.6705 68.1498 29.6705C67.4182 29.6705 66.7773 29.4982 66.2268 29.1538C65.6764 28.8058 65.2485 28.2908 64.9431 27.609C64.6377 26.9237 64.485 26.0767 64.485 25.0682V24.1946C64.485 22.3729 64.794 20.9915 65.4118 20.0504C66.0333 19.1094 66.9672 18.6229 68.2137 18.5909C68.654 18.5767 69.0464 18.5732 69.3909 18.5803C69.7354 18.5874 70.0354 18.5714 70.2911 18.5323C70.5468 18.4933 70.7634 18.3991 70.941 18.25ZM68.1498 28.5412C68.6434 28.5412 69.0677 28.4169 69.4229 28.1683C69.7815 27.9197 70.0567 27.57 70.2485 27.119C70.4403 26.6644 70.5361 26.13 70.5361 25.5156C70.5361 24.919 70.4385 24.4112 70.2432 23.9922C70.0514 23.5732 69.7762 23.2536 69.4175 23.0334C69.0589 22.8132 68.6292 22.7031 68.1285 22.7031C67.7627 22.7031 67.4342 22.7653 67.143 22.8896C66.8518 23.0138 66.6033 23.1967 66.3973 23.4382C66.1913 23.6797 66.0315 23.9744 65.9179 24.3224C65.8078 24.6705 65.7492 25.0682 65.7421 25.5156C65.7421 26.4318 65.9569 27.1651 66.3866 27.7156C66.8163 28.266 67.404 28.5412 68.1498 28.5412ZM73.7162 32.5682V21.3182H74.9307V22.6179H75.0798C75.1721 22.4759 75.3 22.2947 75.4633 22.0746C75.6302 21.8509 75.8682 21.652 76.1771 21.478C76.4896 21.3004 76.9122 21.2116 77.4449 21.2116C78.1338 21.2116 78.741 21.3839 79.2666 21.7283C79.7922 22.0728 80.2023 22.5611 80.4971 23.1932C80.7918 23.8253 80.9392 24.571 80.9392 25.4304C80.9392 26.2969 80.7918 27.0479 80.4971 27.6836C80.2023 28.3157 79.794 28.8058 79.2719 29.1538C78.7499 29.4982 78.148 29.6705 77.4662 29.6705C76.9406 29.6705 76.5198 29.5835 76.2038 29.4094C75.8877 29.2319 75.6444 29.0312 75.474 28.8075C75.3035 28.5803 75.1721 28.392 75.0798 28.2429H74.9733V32.5682H73.7162ZM74.952 25.4091C74.952 26.027 75.0425 26.5721 75.2236 27.0444C75.4047 27.5131 75.6693 27.8807 76.0173 28.147C76.3653 28.4098 76.7915 28.5412 77.2957 28.5412C77.8213 28.5412 78.2599 28.4027 78.6114 28.1257C78.9665 27.8452 79.2329 27.4687 79.4104 26.9964C79.5915 26.5206 79.6821 25.9915 79.6821 25.4091C79.6821 24.8338 79.5933 24.3153 79.4158 23.8537C79.2417 23.3885 78.9772 23.021 78.6221 22.7511C78.2705 22.4776 77.8284 22.3409 77.2957 22.3409C76.7844 22.3409 76.3547 22.4705 76.0067 22.7298C75.6587 22.9854 75.3959 23.3441 75.2183 23.8058C75.0408 24.2638 74.952 24.7983 74.952 25.4091ZM85.2645 29.6918C84.746 29.6918 84.2755 29.5941 83.8529 29.3988C83.4303 29.1999 83.0947 28.9141 82.8462 28.5412C82.5976 28.1648 82.4733 27.7102 82.4733 27.1776C82.4733 26.7088 82.5656 26.3288 82.7503 26.0376C82.9349 25.7429 83.1817 25.5121 83.4907 25.3452C83.7996 25.1783 84.1405 25.054 84.5134 24.9723C84.8898 24.8871 85.268 24.8196 85.648 24.7699C86.1452 24.706 86.5482 24.658 86.8572 24.6261C87.1697 24.5906 87.3969 24.532 87.539 24.4503C87.6846 24.3686 87.7574 24.2266 87.7574 24.0241V23.9815C87.7574 23.456 87.6136 23.0476 87.3259 22.7564C87.0418 22.4652 86.6104 22.3196 86.0315 22.3196C85.4314 22.3196 84.9609 22.451 84.6199 22.7138C84.279 22.9766 84.0393 23.2571 83.9008 23.5554L82.7077 23.1293C82.9207 22.6321 83.2048 22.245 83.5599 21.968C83.9186 21.6875 84.3092 21.4922 84.7318 21.3821C85.1579 21.2685 85.577 21.2116 85.9889 21.2116C86.2517 21.2116 86.5535 21.2436 86.8944 21.3075C87.2389 21.3679 87.5709 21.494 87.8905 21.6857C88.2137 21.8775 88.4818 22.1669 88.6949 22.554C88.9079 22.9411 89.0145 23.4595 89.0145 24.1094V29.5H87.7574V28.392H87.6935C87.6082 28.5696 87.4662 28.7596 87.2673 28.962C87.0685 29.1644 86.8039 29.3366 86.4736 29.4787C86.1434 29.6207 85.7403 29.6918 85.2645 29.6918ZM85.4562 28.5625C85.9534 28.5625 86.3724 28.4648 86.7133 28.2695C87.0578 28.0742 87.317 27.8221 87.491 27.5131C87.6686 27.2042 87.7574 26.8793 87.7574 26.5384V25.3878C87.7041 25.4517 87.5869 25.5103 87.4058 25.5636C87.2283 25.6133 87.0223 25.6577 86.7879 25.6967C86.5571 25.7322 86.3316 25.7642 86.1114 25.7926C85.8948 25.8175 85.719 25.8388 85.5841 25.8565C85.2574 25.8991 84.952 25.9684 84.6679 26.0643C84.3873 26.1566 84.1601 26.2969 83.9861 26.4851C83.8156 26.6697 83.7304 26.9219 83.7304 27.2415C83.7304 27.6783 83.892 28.0085 84.2151 28.2322C84.5418 28.4524 84.9555 28.5625 85.4562 28.5625ZM96.7848 24.8338V26.0057H92.2678V24.8338H96.7848ZM92.5661 21.3182V29.5H91.309V21.3182H92.5661ZM97.7436 21.3182V29.5H96.4865V21.3182H97.7436ZM105.515 24.8338V26.0057H100.998V24.8338H105.515ZM101.297 21.3182V29.5H100.039V21.3182H101.297ZM106.474 21.3182V29.5H105.217V21.3182H106.474ZM112.094 29.6705C111.355 29.6705 110.707 29.4947 110.15 29.1431C109.596 28.7915 109.162 28.2997 108.85 27.6676C108.541 27.0355 108.386 26.2969 108.386 25.4517C108.386 24.5994 108.541 23.8555 108.85 23.2198C109.162 22.5842 109.596 22.0906 110.15 21.739C110.707 21.3874 111.355 21.2116 112.094 21.2116C112.832 21.2116 113.479 21.3874 114.033 21.739C114.59 22.0906 115.023 22.5842 115.332 23.2198C115.645 23.8555 115.801 24.5994 115.801 25.4517C115.801 26.2969 115.645 27.0355 115.332 27.6676C115.023 28.2997 114.59 28.7915 114.033 29.1431C113.479 29.4947 112.832 29.6705 112.094 29.6705ZM112.094 28.5412C112.655 28.5412 113.116 28.3974 113.479 28.1097C113.841 27.8221 114.109 27.4439 114.283 26.9751C114.457 26.5064 114.544 25.9986 114.544 25.4517C114.544 24.9048 114.457 24.3952 114.283 23.9229C114.109 23.4506 113.841 23.0689 113.479 22.7777C113.116 22.4865 112.655 22.3409 112.094 22.3409C111.533 22.3409 111.071 22.4865 110.709 22.7777C110.347 23.0689 110.078 23.4506 109.904 23.9229C109.73 24.3952 109.643 24.9048 109.643 25.4517C109.643 25.9986 109.73 26.5064 109.904 26.9751C110.078 27.4439 110.347 27.8221 110.709 28.1097C111.071 28.3974 111.533 28.5412 112.094 28.5412ZM121.15 29.6705C120.362 29.6705 119.682 29.4964 119.11 29.1484C118.542 28.7969 118.104 28.3068 117.795 27.6783C117.489 27.0462 117.337 26.3111 117.337 25.473C117.337 24.6349 117.489 23.8963 117.795 23.2571C118.104 22.6143 118.533 22.1136 119.084 21.755C119.638 21.3928 120.284 21.2116 121.023 21.2116C121.449 21.2116 121.87 21.2827 122.285 21.4247C122.701 21.5668 123.079 21.7976 123.42 22.1172C123.761 22.4332 124.032 22.8523 124.235 23.3743C124.437 23.8963 124.538 24.5391 124.538 25.3026V25.8352H118.231V24.7486H123.26C123.26 24.2869 123.168 23.875 122.983 23.5128C122.802 23.1506 122.543 22.8647 122.205 22.6552C121.871 22.4457 121.477 22.3409 121.023 22.3409C120.522 22.3409 120.089 22.4652 119.723 22.7138C119.361 22.9588 119.082 23.2784 118.887 23.6726C118.691 24.0668 118.594 24.4893 118.594 24.9403V25.6648C118.594 26.2827 118.7 26.8065 118.913 27.2362C119.13 27.6623 119.43 27.9872 119.813 28.2109C120.197 28.4311 120.643 28.5412 121.15 28.5412C121.481 28.5412 121.779 28.495 122.045 28.4027C122.315 28.3068 122.548 28.1648 122.743 27.9766C122.938 27.7848 123.089 27.5469 123.196 27.2628L124.41 27.6037C124.283 28.0156 124.068 28.3778 123.766 28.6903C123.464 28.9993 123.091 29.2408 122.647 29.4148C122.203 29.5852 121.704 29.6705 121.15 29.6705Z" fill="#1D1D1D"/>
 <defs>
 <clipPath id="clip0_0_50">
 <rect width="20" height="20" fill="white" transform="translate(16.3 14.5)"/>
diff --git a/public/index.html b/public/index.html
index 369d5cd..bda80fa 100644
--- a/public/index.html
+++ b/public/index.html
@@ -25,10 +25,10 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>Russpass MAGNUM OPUS</title>
   </head>
   <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <noscript>Включите JavaScript чтобы насладится нашим шикарном приложением</noscript>
     <div id="root"></div>
     <!--
       This HTML file is a template.
diff --git a/public/profile.svg b/public/profile.svg
index 570a720..e94d29a 100644
--- a/public/profile.svg
+++ b/public/profile.svg
@@ -1,8 +1,8 @@
-<svg width="108" height="49" viewBox="0 0 108 49" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="111" height="49" viewBox="0 0 111 49" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_0_55)">
 <path fill-rule="evenodd" clip-rule="evenodd" d="M26.96 16.25C24.7049 16.25 22.8767 18.0782 22.8767 20.3333C22.8767 22.5885 24.7049 24.4167 26.96 24.4167C29.2152 24.4167 31.0433 22.5885 31.0433 20.3333C31.0433 18.0782 29.2152 16.25 26.96 16.25ZM24.46 26.25C22.2049 26.25 20.3767 28.0782 20.3767 30.3333C20.3767 31.668 21.4587 32.75 22.7934 32.75H31.1267C32.4614 32.75 33.5433 31.668 33.5433 30.3333C33.5433 28.0782 31.7152 26.25 29.46 26.25H24.46Z" fill="#1D1D1D"/>
 </g>
-<path d="M46.4298 18.9H50.0618C52.8938 18.9 54.8778 19.54 54.8778 22.404C54.8778 25.284 52.8938 25.908 50.0618 25.908H48.0618V30.5H46.4298V18.9ZM50.1898 20.276H48.0618V24.484H50.1898C51.9018 24.484 53.2138 24.308 53.2138 22.404C53.2138 20.516 51.9018 20.276 50.1898 20.276ZM60.5094 21.86V23.412C60.2054 23.364 59.9334 23.348 59.6934 23.348C58.3494 23.348 57.6774 24.084 57.6774 25.988V30.5H56.2214V21.892H57.6454V23.396C58.0774 22.42 58.9414 21.892 60.0774 21.844C60.2214 21.844 60.3334 21.844 60.5094 21.86ZM62.7446 26.228C62.7446 28.532 63.9926 29.428 65.3206 29.428C66.6486 29.428 67.8966 28.436 67.8966 26.228C67.8966 23.924 66.6486 23.028 65.3206 23.028C63.9926 23.028 62.7446 23.876 62.7446 26.228ZM65.3206 21.748C67.3206 21.748 69.4486 23.108 69.4486 26.228C69.4486 29.348 67.3206 30.708 65.3206 30.708C63.3206 30.708 61.1926 29.348 61.1926 26.228C61.1926 23.108 63.3206 21.748 65.3206 21.748ZM71.6363 21.892V21.268C71.6363 19.476 71.9883 18.9 73.9563 18.9H74.7083V20.116H73.9883C73.2203 20.116 73.0923 20.292 73.0923 21.188V21.892H74.7083V23.06H73.0923V30.5H71.6363V23.06H70.4363V21.892H71.6363ZM76.2839 21.892H77.7399V30.5H76.2839V21.892ZM76.2839 18.9H77.7399V20.66H76.2839V18.9ZM81.5055 18.9V30.5H80.0495V18.9H81.5055ZM91.4151 26.676H84.7911C84.8391 28.532 86.1831 29.428 87.4471 29.428C88.7271 29.428 89.4311 28.852 89.7991 28.004H91.3031C90.9191 29.476 89.5431 30.708 87.4471 30.708C84.7271 30.708 83.2231 28.756 83.2231 26.212C83.2231 23.476 85.0471 21.748 87.3991 21.748C90.0391 21.748 91.5911 23.94 91.4151 26.676ZM87.3991 22.996C86.1191 22.996 84.9351 23.7 84.8071 25.428H89.8791C89.8311 24.212 88.9511 22.996 87.3991 22.996Z" fill="#1D1D1D"/>
+<path d="M47.0097 30.5V18.8636H51.0779C51.8885 18.8636 52.5571 19.0038 53.0836 19.2841C53.6101 19.5606 54.0022 19.9337 54.2597 20.4034C54.5173 20.8693 54.6461 21.3864 54.6461 21.9545C54.6461 22.4545 54.5571 22.8674 54.3791 23.1932C54.2048 23.5189 53.9738 23.7765 53.6859 23.9659C53.4018 24.1553 53.0931 24.2955 52.7597 24.3864V24.5C53.1158 24.5227 53.4738 24.6477 53.8336 24.875C54.1935 25.1023 54.4946 25.428 54.737 25.8523C54.9794 26.2765 55.1006 26.7955 55.1006 27.4091C55.1006 27.9924 54.9681 28.517 54.7029 28.983C54.4378 29.4489 54.0192 29.8182 53.4472 30.0909C52.8753 30.3636 52.131 30.5 51.2143 30.5H47.0097ZM48.4188 29.25H51.2143C52.1347 29.25 52.7881 29.072 53.1745 28.7159C53.5647 28.3561 53.7597 27.9205 53.7597 27.4091C53.7597 27.0152 53.6594 26.6515 53.4586 26.3182C53.2578 25.9811 52.9719 25.7121 52.6006 25.5114C52.2294 25.3068 51.79 25.2045 51.2825 25.2045H48.4188V29.25ZM48.4188 23.9773H51.0325C51.4567 23.9773 51.8393 23.8939 52.1802 23.7273C52.5249 23.5606 52.7976 23.3258 52.9984 23.0227C53.2029 22.7197 53.3052 22.3636 53.3052 21.9545C53.3052 21.4432 53.1272 21.0095 52.7711 20.6534C52.415 20.2936 51.8506 20.1136 51.0779 20.1136H48.4188V23.9773ZM58.3933 24.9318H60.8933C61.916 24.9318 62.6982 25.1913 63.2399 25.7102C63.7815 26.2292 64.0524 26.8864 64.0524 27.6818C64.0524 28.2045 63.9311 28.6799 63.6887 29.108C63.4463 29.5322 63.0902 29.8712 62.6205 30.125C62.1508 30.375 61.5751 30.5 60.8933 30.5H57.2342V21.7727H58.5751V29.25H60.8933C61.4236 29.25 61.8592 29.1098 62.2001 28.8295C62.541 28.5492 62.7114 28.1894 62.7114 27.75C62.7114 27.2879 62.541 26.911 62.2001 26.6193C61.8592 26.3277 61.4236 26.1818 60.8933 26.1818H58.3933V24.9318ZM65.4387 30.5V21.7727H66.7796V30.5H65.4387ZM70.5751 28.5227L74.7796 21.7727H76.3251V30.5H74.9842V23.75L70.8024 30.5H69.2342V21.7727H70.5751V28.5227ZM73.8933 18.8636H75.1433C75.1433 19.4773 74.9311 19.9792 74.5069 20.3693C74.0827 20.7595 73.5069 20.9545 72.7796 20.9545C72.0637 20.9545 71.4936 20.7595 71.0694 20.3693C70.6489 19.9792 70.4387 19.4773 70.4387 18.8636H71.6887C71.6887 19.1591 71.7702 19.4186 71.933 19.642C72.0997 19.8655 72.3819 19.9773 72.7796 19.9773C73.1774 19.9773 73.4614 19.8655 73.6319 19.642C73.8061 19.4186 73.8933 19.1591 73.8933 18.8636ZM77.5935 23.0227V21.7727H84.6845V23.0227H81.8208V30.5H80.4799V23.0227H77.5935ZM87.9813 28.5227L92.1859 21.7727H93.7313V30.5H92.3904V23.75L88.2086 30.5H86.6404V21.7727H87.9813V28.5227Z" fill="#1D1D1D"/>
 <defs>
 <clipPath id="clip0_0_55">
 <rect width="20" height="20" fill="white" transform="translate(16.96 14.5)"/>
diff --git a/public/search.svg b/public/search.svg
index 6614377..05f28d3 100644
--- a/public/search.svg
+++ b/public/search.svg
@@ -1,17 +1,17 @@
-<svg width="79" height="39" viewBox="0 0 79 39" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.28601 15.86C1.28601 13.636 3.60601 12.692 5.47801 12.692C7.57402 12.692 9.41401 13.636 9.87802 15.86H8.29401C7.91002 14.532 6.56601 14.068 5.41401 14.068C4.51801 14.068 2.95001 14.468 2.95001 15.764C2.95001 16.788 3.75001 17.3 4.83802 17.54L6.18201 17.844C7.95801 18.228 10.086 18.9 10.086 21.236C10.086 23.492 7.97402 24.708 5.67001 24.708C2.93401 24.708 1.20601 23.204 0.902015 20.9H2.50201C2.80601 22.5 3.91001 23.332 5.70201 23.332C7.43002 23.332 8.40602 22.532 8.40602 21.38C8.40602 20.148 7.35002 19.668 5.91002 19.332L4.47002 19.028C2.87001 18.676 1.28601 17.78 1.28601 15.86ZM19.6264 20.676H13.0024C13.0504 22.532 14.3944 23.428 15.6584 23.428C16.9384 23.428 17.6424 22.852 18.0104 22.004H19.5144C19.1304 23.476 17.7544 24.708 15.6584 24.708C12.9384 24.708 11.4344 22.756 11.4344 20.212C11.4344 17.476 13.2584 15.748 15.6104 15.748C18.2504 15.748 19.8024 17.94 19.6264 20.676ZM15.6104 16.996C14.3304 16.996 13.1464 17.7 13.0184 19.428H18.0904C18.0424 18.212 17.1624 16.996 15.6104 16.996ZM26.6691 20.9V20.356C24.0291 20.612 22.3491 21.012 22.3491 22.196C22.3491 23.012 22.9731 23.556 24.0131 23.556C25.3731 23.556 26.6691 22.932 26.6691 20.9ZM23.6931 24.708C22.0771 24.708 20.7331 23.812 20.7331 22.228C20.7331 20.196 23.0371 19.588 26.5571 19.204V18.996C26.5571 17.412 25.6931 16.9 24.6051 16.9C23.3891 16.9 22.7011 17.54 22.6371 18.612H21.1331C21.2611 16.756 22.9251 15.716 24.5891 15.716C26.9731 15.716 28.0291 16.836 28.0131 19.268L27.9971 21.252C27.9811 22.708 28.0451 23.684 28.2211 24.5H26.7491C26.7011 24.18 26.6531 23.828 26.6371 23.316C26.1091 24.212 25.2291 24.708 23.6931 24.708ZM34.4706 15.86V17.412C34.1666 17.364 33.8946 17.348 33.6546 17.348C32.3106 17.348 31.6386 18.084 31.6386 19.988V24.5H30.1826V15.892H31.6066V17.396C32.0386 16.42 32.9026 15.892 34.0386 15.844C34.1826 15.844 34.2946 15.844 34.4706 15.86ZM39.2819 15.748C41.3939 15.748 42.6739 17.3 42.8819 18.772H41.4099C41.2019 17.748 40.3219 17.028 39.1859 17.028C37.9059 17.028 36.7059 18.036 36.7059 20.196C36.7059 22.372 37.9059 23.428 39.1859 23.428C40.4179 23.428 41.2659 22.596 41.4739 21.7H42.9779C42.6739 23.316 41.1539 24.708 39.1379 24.708C36.6579 24.708 35.1219 22.836 35.1219 20.212C35.1219 17.652 36.7379 15.748 39.2819 15.748ZM46.0761 12.9V17.188C46.5721 16.372 47.4041 15.748 48.8601 15.748C50.9401 15.748 51.6921 17.092 51.6921 19.06V24.5H50.2361V19.492C50.2361 18.164 50.0121 17.012 48.3481 17.012C46.9401 17.012 46.0761 17.972 46.0761 19.828V24.5H44.6201V12.9H46.0761Z" fill="#1D1D1D"/>
+<svg width="151" height="39" viewBox="0 0 151 39" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.82183 12.8636V14.1136H3.2082V24.5H1.79911V12.8636H8.82183ZM13.2139 24.6818C12.373 24.6818 11.6476 24.4962 11.0377 24.125C10.4317 23.75 9.96388 23.2273 9.63433 22.5568C9.30858 21.8826 9.1457 21.0985 9.1457 20.2045C9.1457 19.3106 9.30858 18.5227 9.63433 17.8409C9.96388 17.1553 10.4222 16.6212 11.0093 16.2386C11.6002 15.8523 12.2896 15.6591 13.0775 15.6591C13.5321 15.6591 13.9809 15.7348 14.4241 15.8864C14.8673 16.0379 15.2707 16.2841 15.6343 16.625C15.998 16.9621 16.2877 17.4091 16.5037 17.9659C16.7196 18.5227 16.8275 19.2083 16.8275 20.0227V20.5909H10.1002V19.4318H15.4639C15.4639 18.9394 15.3654 18.5 15.1684 18.1136C14.9752 17.7273 14.6987 17.4223 14.3389 17.1989C13.9828 16.9754 13.5624 16.8636 13.0775 16.8636C12.5434 16.8636 12.0813 16.9962 11.6912 17.2614C11.3048 17.5227 11.0074 17.8636 10.7991 18.2841C10.5908 18.7045 10.4866 19.1553 10.4866 19.6364V20.4091C10.4866 21.0682 10.6002 21.6269 10.8275 22.0852C11.0586 22.5398 11.3787 22.8864 11.7877 23.125C12.1968 23.3598 12.6722 23.4773 13.2139 23.4773C13.5662 23.4773 13.8843 23.428 14.1684 23.3295C14.4563 23.2273 14.7044 23.0758 14.9127 22.875C15.1211 22.6705 15.2821 22.4167 15.3957 22.1136L16.6912 22.4773C16.5548 22.9167 16.3256 23.303 16.0037 23.6364C15.6817 23.9659 15.284 24.2235 14.8105 24.4091C14.337 24.5909 13.8048 24.6818 13.2139 24.6818ZM24.7082 19.5227V20.7727H19.89V19.5227H24.7082ZM20.2082 15.7727V24.5H18.8673V15.7727H20.2082ZM25.7309 15.7727V24.5H24.39V15.7727H25.7309ZM31.8389 24.6818C30.998 24.6818 30.2726 24.4962 29.6627 24.125C29.0567 23.75 28.5889 23.2273 28.2593 22.5568C27.9336 21.8826 27.7707 21.0985 27.7707 20.2045C27.7707 19.3106 27.9336 18.5227 28.2593 17.8409C28.5889 17.1553 29.0472 16.6212 29.6343 16.2386C30.2252 15.8523 30.9146 15.6591 31.7025 15.6591C32.1571 15.6591 32.6059 15.7348 33.0491 15.8864C33.4923 16.0379 33.8957 16.2841 34.2593 16.625C34.623 16.9621 34.9127 17.4091 35.1287 17.9659C35.3446 18.5227 35.4525 19.2083 35.4525 20.0227V20.5909H28.7252V19.4318H34.0889C34.0889 18.9394 33.9904 18.5 33.7934 18.1136C33.6002 17.7273 33.3237 17.4223 32.9639 17.1989C32.6078 16.9754 32.1874 16.8636 31.7025 16.8636C31.1684 16.8636 30.7063 16.9962 30.3162 17.2614C29.9298 17.5227 29.6324 17.8636 29.4241 18.2841C29.2158 18.7045 29.1116 19.1553 29.1116 19.6364V20.4091C29.1116 21.0682 29.2252 21.6269 29.4525 22.0852C29.6836 22.5398 30.0037 22.8864 30.4127 23.125C30.8218 23.3598 31.2972 23.4773 31.8389 23.4773C32.1912 23.4773 32.5093 23.428 32.7934 23.3295C33.0813 23.2273 33.3294 23.0758 33.5377 22.875C33.7461 22.6705 33.9071 22.4167 34.0207 22.1136L35.3162 22.4773C35.1798 22.9167 34.9506 23.303 34.6287 23.6364C34.3067 23.9659 33.909 24.2235 33.4355 24.4091C32.962 24.5909 32.4298 24.6818 31.8389 24.6818ZM37.4923 27.7727V15.7727H38.7877V17.1591H38.9468C39.0453 17.0076 39.1817 16.8144 39.3559 16.5795C39.534 16.3409 39.7877 16.1288 40.1173 15.9432C40.4506 15.7538 40.9014 15.6591 41.4696 15.6591C42.2044 15.6591 42.8521 15.8428 43.4127 16.2102C43.9733 16.5777 44.4108 17.0985 44.7252 17.7727C45.0396 18.447 45.1968 19.2424 45.1968 20.1591C45.1968 21.0833 45.0396 21.8845 44.7252 22.5625C44.4108 23.2367 43.9752 23.7595 43.4184 24.1307C42.8616 24.4981 42.2196 24.6818 41.4923 24.6818C40.9317 24.6818 40.4828 24.589 40.1457 24.4034C39.8086 24.214 39.5491 24 39.3673 23.7614C39.1855 23.5189 39.0453 23.3182 38.9468 23.1591H38.8332V27.7727H37.4923ZM38.8105 20.1364C38.8105 20.7955 38.9071 21.3769 39.1002 21.8807C39.2934 22.3807 39.5756 22.7727 39.9468 23.0568C40.318 23.3371 40.7726 23.4773 41.3105 23.4773C41.8711 23.4773 42.3389 23.3295 42.7139 23.0341C43.0927 22.7348 43.3768 22.3333 43.5662 21.8295C43.7593 21.322 43.8559 20.7576 43.8559 20.1364C43.8559 19.5227 43.7612 18.9697 43.5718 18.4773C43.3862 17.9811 43.104 17.589 42.7252 17.3011C42.3502 17.0095 41.8787 16.8636 41.3105 16.8636C40.765 16.8636 40.3067 17.0019 39.9355 17.2784C39.5643 17.5511 39.284 17.9337 39.0946 18.4261C38.9052 18.9148 38.8105 19.4848 38.8105 20.1364ZM49.8105 24.7045C49.2574 24.7045 48.7555 24.6004 48.3048 24.392C47.854 24.1799 47.4961 23.875 47.2309 23.4773C46.9658 23.0758 46.8332 22.5909 46.8332 22.0227C46.8332 21.5227 46.9317 21.1174 47.1287 20.8068C47.3256 20.4924 47.5889 20.2462 47.9184 20.0682C48.248 19.8902 48.6116 19.7576 49.0093 19.6705C49.4108 19.5795 49.8143 19.5076 50.2196 19.4545C50.7499 19.3864 51.1798 19.3352 51.5093 19.3011C51.8427 19.2633 52.0851 19.2008 52.2366 19.1136C52.3919 19.0265 52.4696 18.875 52.4696 18.6591V18.6136C52.4696 18.053 52.3162 17.6174 52.0093 17.3068C51.7063 16.9962 51.2461 16.8409 50.6287 16.8409C49.9885 16.8409 49.4866 16.9811 49.123 17.2614C48.7593 17.5417 48.5037 17.8409 48.3559 18.1591L47.0832 17.7045C47.3105 17.1742 47.6135 16.7614 47.9923 16.4659C48.3749 16.1667 48.7915 15.9583 49.2423 15.8409C49.6968 15.7197 50.1438 15.6591 50.5832 15.6591C50.8635 15.6591 51.1855 15.6932 51.5491 15.7614C51.9165 15.8258 52.2707 15.9602 52.6116 16.1648C52.9563 16.3693 53.2423 16.678 53.4696 17.0909C53.6968 17.5038 53.8105 18.0568 53.8105 18.75V24.5H52.4696V23.3182H52.4014C52.3105 23.5076 52.159 23.7102 51.9468 23.9261C51.7347 24.142 51.4525 24.3258 51.1002 24.4773C50.748 24.6288 50.318 24.7045 49.8105 24.7045ZM50.015 23.5C50.5453 23.5 50.9923 23.3958 51.3559 23.1875C51.7233 22.9792 51.9999 22.7102 52.1855 22.3807C52.3749 22.0511 52.4696 21.7045 52.4696 21.3409V20.1136C52.4127 20.1818 52.2877 20.2443 52.0946 20.3011C51.9052 20.3542 51.6855 20.4015 51.4355 20.4432C51.1893 20.4811 50.9487 20.5152 50.7139 20.5455C50.4828 20.572 50.2953 20.5947 50.1514 20.6136C49.8029 20.6591 49.4771 20.733 49.1741 20.8352C48.8749 20.9337 48.6324 21.0833 48.4468 21.2841C48.265 21.4811 48.1741 21.75 48.1741 22.0909C48.1741 22.5568 48.3465 22.9091 48.6912 23.1477C49.0396 23.3826 49.4809 23.5 50.015 23.5ZM63.1215 15.7727V23.25H64.3488V27.3182H63.0079V24.5H56.2579V15.7727H57.5988V23.25H61.7806V15.7727H63.1215ZM67.7551 22.5227L71.9596 15.7727H73.5051V24.5H72.1642V17.75L67.9823 24.5H66.4142V15.7727H67.7551V22.5227ZM81.211 24.5V17H78.8929C78.3701 17 77.9591 17.1212 77.6599 17.3636C77.3607 17.6061 77.211 17.9394 77.211 18.3636C77.211 18.7803 77.3455 19.108 77.6144 19.3466C77.8872 19.5852 78.2603 19.7045 78.7338 19.7045H81.5519V20.9545H78.7338C78.1429 20.9545 77.6334 20.8504 77.2054 20.642C76.7773 20.4337 76.4478 20.1364 76.2167 19.75C75.9857 19.3598 75.8701 18.8977 75.8701 18.3636C75.8701 17.8258 75.9913 17.3636 76.2338 16.9773C76.4762 16.5909 76.8228 16.2936 77.2735 16.0852C77.7281 15.8769 78.2679 15.7727 78.8929 15.7727H82.4838V24.5H81.211ZM75.3929 24.5L77.8701 20.1591H79.3247L76.8474 24.5H75.3929ZM88.9454 17.0227V15.7727H96.0363V17.0227H93.1727V24.5H91.8318V17.0227H88.9454ZM98.8559 27.7727C98.6287 27.7727 98.426 27.7538 98.248 27.7159C98.0699 27.6818 97.9468 27.6477 97.8787 27.6136L98.2196 26.4318C98.5453 26.5152 98.8332 26.5455 99.0832 26.5227C99.3332 26.5 99.5548 26.3883 99.748 26.1875C99.9449 25.9905 100.125 25.6705 100.288 25.2273L100.538 24.5455L97.3105 15.7727H98.765L101.174 22.7273H101.265L103.674 15.7727H105.129L101.424 25.7727C101.257 26.2235 101.051 26.5966 100.805 26.892C100.559 27.1913 100.273 27.4129 99.9468 27.5568C99.6249 27.7008 99.2612 27.7727 98.8559 27.7727ZM106.899 27.7727V15.7727H108.194V17.1591H108.353C108.452 17.0076 108.588 16.8144 108.762 16.5795C108.94 16.3409 109.194 16.1288 109.524 15.9432C109.857 15.7538 110.308 15.6591 110.876 15.6591C111.611 15.6591 112.258 15.8428 112.819 16.2102C113.38 16.5777 113.817 17.0985 114.131 17.7727C114.446 18.447 114.603 19.2424 114.603 20.1591C114.603 21.0833 114.446 21.8845 114.131 22.5625C113.817 23.2367 113.381 23.7595 112.825 24.1307C112.268 24.4981 111.626 24.6818 110.899 24.6818C110.338 24.6818 109.889 24.589 109.552 24.4034C109.215 24.214 108.955 24 108.774 23.7614C108.592 23.5189 108.452 23.3182 108.353 23.1591H108.239V27.7727H106.899ZM108.217 20.1364C108.217 20.7955 108.313 21.3769 108.506 21.8807C108.7 22.3807 108.982 22.7727 109.353 23.0568C109.724 23.3371 110.179 23.4773 110.717 23.4773C111.277 23.4773 111.745 23.3295 112.12 23.0341C112.499 22.7348 112.783 22.3333 112.972 21.8295C113.166 21.322 113.262 20.7576 113.262 20.1364C113.262 19.5227 113.167 18.9697 112.978 18.4773C112.792 17.9811 112.51 17.589 112.131 17.3011C111.756 17.0095 111.285 16.8636 110.717 16.8636C110.171 16.8636 109.713 17.0019 109.342 17.2784C108.971 17.5511 108.69 17.9337 108.501 18.4261C108.311 18.9148 108.217 19.4848 108.217 20.1364ZM119.217 24.7045C118.664 24.7045 118.162 24.6004 117.711 24.392C117.26 24.1799 116.902 23.875 116.637 23.4773C116.372 23.0758 116.239 22.5909 116.239 22.0227C116.239 21.5227 116.338 21.1174 116.535 20.8068C116.732 20.4924 116.995 20.2462 117.325 20.0682C117.654 19.8902 118.018 19.7576 118.416 19.6705C118.817 19.5795 119.221 19.5076 119.626 19.4545C120.156 19.3864 120.586 19.3352 120.916 19.3011C121.249 19.2633 121.491 19.2008 121.643 19.1136C121.798 19.0265 121.876 18.875 121.876 18.6591V18.6136C121.876 18.053 121.722 17.6174 121.416 17.3068C121.113 16.9962 120.652 16.8409 120.035 16.8409C119.395 16.8409 118.893 16.9811 118.529 17.2614C118.166 17.5417 117.91 17.8409 117.762 18.1591L116.489 17.7045C116.717 17.1742 117.02 16.7614 117.399 16.4659C117.781 16.1667 118.198 15.9583 118.649 15.8409C119.103 15.7197 119.55 15.6591 119.989 15.6591C120.27 15.6591 120.592 15.6932 120.955 15.7614C121.323 15.8258 121.677 15.9602 122.018 16.1648C122.363 16.3693 122.649 16.678 122.876 17.0909C123.103 17.5038 123.217 18.0568 123.217 18.75V24.5H121.876V23.3182H121.808C121.717 23.5076 121.565 23.7102 121.353 23.9261C121.141 24.142 120.859 24.3258 120.506 24.4773C120.154 24.6288 119.724 24.7045 119.217 24.7045ZM119.421 23.5C119.952 23.5 120.399 23.3958 120.762 23.1875C121.13 22.9792 121.406 22.7102 121.592 22.3807C121.781 22.0511 121.876 21.7045 121.876 21.3409V20.1136C121.819 20.1818 121.694 20.2443 121.501 20.3011C121.311 20.3542 121.092 20.4015 120.842 20.4432C120.596 20.4811 120.355 20.5152 120.12 20.5455C119.889 20.572 119.702 20.5947 119.558 20.6136C119.209 20.6591 118.883 20.733 118.58 20.8352C118.281 20.9337 118.039 21.0833 117.853 21.2841C117.671 21.4811 117.58 21.75 117.58 22.0909C117.58 22.5568 117.753 22.9091 118.097 23.1477C118.446 23.3826 118.887 23.5 119.421 23.5Z" fill="#1D1D1D"/>
 <g clip-path="url(#clip0_0_24)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M67.1414 11.25C63.8277 11.25 61.1414 13.9363 61.1414 17.25C61.1414 20.5637 63.8277 23.25 67.1414 23.25C70.4551 23.25 73.1414 20.5637 73.1414 17.25C73.1414 15.6587 72.5092 14.1326 71.384 13.0074C70.2588 11.8821 68.7327 11.25 67.1414 11.25ZM59.6414 17.25C59.6414 13.1079 62.9993 9.75 67.1414 9.75C69.1305 9.75 71.0382 10.5402 72.4447 11.9467C73.8512 13.3532 74.6414 15.2609 74.6414 17.25C74.6414 21.3921 71.2835 24.75 67.1414 24.75C62.9993 24.75 59.6414 21.3921 59.6414 17.25ZM76.3634 24.9304L74.2345 23.212C73.9124 22.892 73.396 22.892 73.0739 23.212C72.9069 23.3802 72.813 23.6087 72.813 23.847C72.813 24.0854 72.9069 24.3139 73.0739 24.4821L74.8406 26.5069C75.2713 26.9422 75.9696 26.9422 76.4003 26.5069C76.831 26.0715 76.831 25.3657 76.4003 24.9304H76.3634ZM62.14 17.25C62.14 14.4886 64.3786 12.25 67.14 12.25C68.4661 12.25 69.7379 12.7768 70.6755 13.7145C71.6132 14.6521 72.14 15.9239 72.14 17.25C72.14 20.0114 69.9014 22.25 67.14 22.25C64.3786 22.25 62.14 20.0114 62.14 17.25Z" fill="#1D1D1D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M139.141 11.25C135.828 11.25 133.141 13.9363 133.141 17.25C133.141 20.5637 135.828 23.25 139.141 23.25C142.455 23.25 145.141 20.5637 145.141 17.25C145.141 15.6587 144.509 14.1326 143.384 13.0074C142.259 11.8821 140.733 11.25 139.141 11.25ZM131.641 17.25C131.641 13.1079 134.999 9.75 139.141 9.75C141.131 9.75 143.038 10.5402 144.445 11.9467C145.851 13.3532 146.641 15.2609 146.641 17.25C146.641 21.3921 143.284 24.75 139.141 24.75C134.999 24.75 131.641 21.3921 131.641 17.25ZM148.363 24.9304L146.235 23.212C145.912 22.892 145.396 22.892 145.074 23.212C144.907 23.3802 144.813 23.6087 144.813 23.847C144.813 24.0854 144.907 24.3139 145.074 24.4821L146.841 26.5069C147.271 26.9422 147.97 26.9422 148.4 26.5069C148.831 26.0715 148.831 25.3657 148.4 24.9304H148.363ZM134.14 17.25C134.14 14.4886 136.379 12.25 139.14 12.25C140.466 12.25 141.738 12.7768 142.676 13.7145C143.613 14.6522 144.14 15.9239 144.14 17.25C144.14 20.0114 141.901 22.25 139.14 22.25C136.379 22.25 134.14 20.0114 134.14 17.25Z" fill="#1D1D1D"/>
 </g>
 <g clip-path="url(#clip1_0_24)">
-<path d="M58.5787 31.6321C65.1385 31.1691 71.5974 30.8774 78.2387 30.8774" stroke="#FFCF08" stroke-width="0.754717" stroke-linejoin="round"/>
+<path d="M130.579 31.6321C137.138 31.1691 143.597 30.8774 150.239 30.8774" stroke="#FFCF08" stroke-width="0.754717" stroke-linejoin="round"/>
 </g>
 <defs>
 <clipPath id="clip0_0_24">
-<rect width="20" height="20" fill="white" transform="translate(58.39 8.5)"/>
+<rect width="20" height="20" fill="white" transform="translate(130.39 8.5)"/>
 </clipPath>
 <clipPath id="clip1_0_24">
-<rect width="20" height="1.50943" fill="white" transform="translate(58.39 30.5)"/>
+<rect width="20" height="1.50943" fill="white" transform="translate(130.39 30.5)"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/src/client/config.ts b/src/client/config.ts
index 7964b79..cf36c66 100644
--- a/src/client/config.ts
+++ b/src/client/config.ts
@@ -1 +1 @@
-export const origin = 'https://dev2.akarpov.ru/'
\ No newline at end of file
+export const origin = 'https://0e06-92-100-146-65.ngrok-free.app/'
\ No newline at end of file
diff --git a/src/client/index.ts b/src/client/index.ts
index 6a2581d..e316436 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -1,60 +1,103 @@
-import axios from 'axios';
-import { origin } from './config';
-
-
-export const register = async (username: string, password: string) => {
-    await axios.post(
-        origin + 'api/auth/register/',
-        {
-            'username': username,
-            'email': username,
-            'password': password
-        }
-    )
-}
-
-export const signin = async (username: string, password: string) => {
-    const response = await axios.post(
-        origin + 'api/auth/token/',
-        {
-            'username': username,
-            'password': password
-        }
-    );
-    return response.data;
-}
-
-
-export const startTinder = async () => {
-    const data = await axios.get(
-        origin + 'api/tinder/start',
-        {
-            headers: {
-                'Authorization': 'Bearer ' + localStorage.getItem('token')
-            }
-        }
-    );
-    return data.data;
-}
-
-export const swipe = async (itemId: string, type: string) => {
-    var url = origin + 'api/tinder/' + itemId + '/proceed/';
-    console.log(url, itemId)
-    try{
-        const data = await axios.post(
-            url,
-            {
-                'action': type,
-            },
-            {
-                headers: {
-                    'Authorization': 'Bearer ' + localStorage.getItem('token')
-                }
-            }
-        );
-        return data.data;
-    } catch {
-        return false
-    }
-
+import axios from 'axios';
+import { origin } from './config';
+
+
+export const register = async (username: string, password: string) => {
+    await axios.post(
+        origin + 'api/auth/register/',
+        {
+            'username': username,
+            'email': username,
+            'password': password
+        }
+    )
+}
+
+export const signin = async (username: string, password: string) => {
+    const response = await axios.post(
+        origin + 'api/auth/token/',
+        {
+            'username': username,
+            'password': password
+        }
+    );
+    return response.data;
+}
+
+
+export const startTinder = async () => {
+    const data = await axios.get(
+        origin + 'api/tinder/start',
+        {
+            headers: {
+                'Authorization': 'Bearer ' + localStorage.getItem('token')
+            }
+        }
+    );
+    return data.data;
+}
+
+export const swipe = async (itemId: string, type: string) => {
+    var url = origin + 'api/tinder/' + itemId + '/proceed/';
+    console.log(url, itemId)
+    try{
+        const data = await axios.post(
+            url,
+            {
+                'action': type,
+            },
+            {
+                headers: {
+                    'Authorization': 'Bearer ' + localStorage.getItem('token')
+                }
+            }
+        );
+        return data.data;
+    } catch {
+        return false
+    }
+
+}
+
+export const dailySelectionGenerate = async () => {
+    var data = await axios.get(
+        origin + 'api/recommendations/get_daily_selection/',
+        {
+            headers: {
+                'Authorization': 'Bearer ' + localStorage.getItem('token')
+            }
+        }
+    );
+    return data.data;
+}
+
+export const dailySelectionBuild = async (buildData: any) => {
+    var data = await axios.post(
+        origin + 'api/recommendations/generate_daily_selection/',
+        {nodes: buildData},
+        {
+            headers: {
+                'Authorization': 'Bearer ' + localStorage.getItem('token')
+            }
+        }
+    );
+    return data.data;
+}
+
+
+export const saveTinderPath = async (tinderData: any) => {
+    await axios.post(
+        origin + 'api/route/save', {
+            "points": [{
+                date: '2000-01-01',
+                paths: tinderData
+            },]
+        },
+        
+        {
+            headers: {
+                'Authorization': 'Bearer ' + localStorage.getItem('token')
+            }
+        }
+    )
 }
\ No newline at end of file
diff --git a/src/consts.tsx b/src/consts.tsx
index a6ca788..5fdea72 100644
--- a/src/consts.tsx
+++ b/src/consts.tsx
@@ -7,9 +7,18 @@ import axios from "axios";
 //   });
 
 
-export const backend = axios.create({
+export let backend = axios.create({
     baseURL: 'https://0e06-92-100-146-65.ngrok-free.app/api/',
     timeout: 100000,
     headers: {'Authorization': 'Bearer ' + localStorage.getItem('token')}
   }
-)
\ No newline at end of file
+)
+
+export const updateBackend = () =>{
+    backend = axios.create({
+      baseURL: 'https://0e06-92-100-146-65.ngrok-free.app/api/',
+      timeout: 100000,
+      headers: {'Authorization': 'Bearer ' + localStorage.getItem('token')}
+    }
+  )
+}
\ No newline at end of file
diff --git a/src/elements/Card/index.tsx b/src/elements/Card/index.tsx
index a40f97c..33a0131 100644
--- a/src/elements/Card/index.tsx
+++ b/src/elements/Card/index.tsx
@@ -20,7 +20,7 @@ interface ITinderCard{
 
 export const TinderCardContent: react.FC<ITinderCard> = (props) => {
     return <Card className='tinder-card__card'>
-        <img src='/sample.jpg' width={200} height={200}></img>
+        <img src='/generateTour.png' width={300} height={300}></img>
         <div className="tinder__content">
             <span><strong>Название:</strong> {props.title}</span>
 
diff --git a/src/elements/Card/style.css b/src/elements/Card/style.css
index 52dd920..6a2f351 100644
--- a/src/elements/Card/style.css
+++ b/src/elements/Card/style.css
@@ -1,36 +1,37 @@
-.card__container{
-    background-color: white;
-    border-radius: 15px;
-}
-.tinder-card__card{
-    border-radius: 0px!important;
-    display: flex;
-    flex-direction: column;
-    border: none!important;
-    gap: 10px;
-}
-
-.tinder__content{
-    display: flex;
-    flex-direction: column;
-    border: none!important;
-    gap: 5px;
-    padding: 10px;
-    max-width: 180px;
-}
-
-.tin{
-    display: flex;
-    flex-direction: column;
-    gap: 20px;
-}
-
-.tin-dir{
-    display: flex;
-    width: 700px;
-    gap: 10px;
-}
-
-.main-btn{
-    background-color: #FFCF08;
+.card__container{
+    background-color: white;
+    border-radius: 15px;
+}
+.tinder-card__card{
+    border-radius: 0px!important;
+    display: flex;
+    flex-direction: column;
+    border: none!important;
+    gap: 10px;
+}
+
+.tinder__content{
+    display: flex;
+    flex-direction: column;
+    border: none!important;
+    gap: 5px;
+    padding: 10px;
+    max-width: 280px;
+    height: 210px;
+}
+
+.tin{
+    display: flex;
+    flex-direction: column;
+    gap: 20px;
+}
+
+.tin-dir{
+    display: flex;
+    width: 700px;
+    gap: 10px;
+}
+
+.main-btn{
+    background-color: #FFCF08;
 }
\ No newline at end of file
diff --git a/src/elements/ChoiceIcon/style.css b/src/elements/ChoiceIcon/style.css
index 72c150c..95a4a52 100644
--- a/src/elements/ChoiceIcon/style.css
+++ b/src/elements/ChoiceIcon/style.css
@@ -41,4 +41,17 @@
     align-items: center;
     justify-content: center;
     gap:10px
+}
+@media screen and (max-device-width: 500px) {
+    .choiceIconWrapper{
+        gap:15px
+    }
+    .choiceBtn{
+        width: 20px;
+        padding: 10px;
+    }
+    .choiceBtnActive{
+        width: 20px;
+        padding: 10px;
+    }
 }
\ No newline at end of file
diff --git a/src/elements/Header/index.tsx b/src/elements/Header/index.tsx
index 933afb1..de0ae13 100644
--- a/src/elements/Header/index.tsx
+++ b/src/elements/Header/index.tsx
@@ -9,13 +9,12 @@ export const RusPassHeader:React.FC = () =>{
             <div className="headerWrapper">
                 <div className="iconWrapper">
                     <img className="headerIcon" src='/logo.svg' onClick={()=>navigate('/')}></img>
-                    <img className="headerIcon" src='/menu.svg' onClick={()=>navigate('/')}></img>
-                    <img className="headerIcon" src='/bonus.svg' onClick={()=>navigate('/event-match')}></img>
-                    <img className="headerIcon" src='/search.svg' onClick={()=>navigate('/')}></img>
+                    <img className="headerIcon delete600" src='/menu.svg' onClick={()=>navigate('/')}></img>
+                    <img className="headerIcon delete600" src='/bonus.svg' onClick={()=>navigate('/event-match')}></img>
+                    <img className="headerIcon delete600" src='/search.svg' onClick={()=>navigate('/')}></img>
                 </div>
                 <div className="iconWrapper">
-                    <img className="headerIcon" src='/language.svg'></img>
-                    <img className="headerIcon" src='/support.svg'></img>
+                    <img className="headerIcon delete600" src='/language.svg'></img>
                     <img className="headerIcon" src='/favorites.svg' onClick={()=>navigate('/favorites')}></img>
                     <img className="headerIcon" src='/profile.svg'onClick={()=>navigate('/login')} ></img>
                 </div>
diff --git a/src/elements/Header/style.css b/src/elements/Header/style.css
index c05c560..a76ca42 100644
--- a/src/elements/Header/style.css
+++ b/src/elements/Header/style.css
@@ -24,4 +24,24 @@
 
 .headerIcon:hover{
     transform: scale(1.05);
+}
+
+@media screen and (max-device-width: 1000px) {
+    .headerWrapper{
+        flex-wrap: wrap;
+    }
+}
+
+@media screen and (max-device-width: 600px) {
+    .delete600{
+        display: none;
+    }
+}
+
+@media screen and (max-device-width: 400px) {
+    .padding{
+        padding-left: 15px;
+        padding-right: 15px;
+        width: calc(100% - 30px);
+    }
 }
\ No newline at end of file
diff --git a/src/elements/HotelCard/index.tsx b/src/elements/HotelCard/index.tsx
index 79c0b04..0b867e6 100644
--- a/src/elements/HotelCard/index.tsx
+++ b/src/elements/HotelCard/index.tsx
@@ -58,11 +58,12 @@ export const HotelCard:React.FC<HotelCardIE> = (props) =>{
                             </div>
                         </div>
                         <div>
-                            {props.rooms.map((room)=><div>
+                            {props.rooms != null? props.rooms.map((room)=><div>
                                 <h5>{room.name}</h5>
                                 <div>{room.description}</div>
                             </div>
-                            )}
+                            ) : null
+                        }
                         </div>
                         <Button className="" onClick={()=>setOpened(!opened)}>Закрыть</Button>
                     </div>
diff --git a/src/elements/Prefernces/index.tsx b/src/elements/Prefernces/index.tsx
index 79599cd..3a909a4 100644
--- a/src/elements/Prefernces/index.tsx
+++ b/src/elements/Prefernces/index.tsx
@@ -12,17 +12,9 @@ import { AttractionCard, AttractionCardIE } from "../AttractionCard";
 import { useNavigate } from "react-router-dom";
 export const Prefernces = () =>{
     const [activeTab, setActiveTab] = useState(1)
-    const [cities, setCities] = useState([])
-    const [regions, setRegions] = useState([])
     const [hotels, setHotels] = useState([])
     const [events, setEvents] = useState([])
 
-    useEffect(()=>{
-        if (cities.length == 0){
-            backend.get('/data/cities').then((response)=>setCities(response.data))
-            backend.get('/data/regions').then((response)=>setRegions(response.data))
-        }
-    })
    
 
     const transportOptions = {
@@ -255,7 +247,7 @@ export const Prefernces = () =>{
           label: `Проживание`,
           children: <div>
                         <div>
-                            <h2>Где вы предпочитаете остановится</h2>
+                            <h2>Где вы предпочитаете остановиться</h2>
                             <ChoiceIcon {...hotelOptions}></ChoiceIcon>
                         </div>
                         <div>
@@ -263,7 +255,7 @@ export const Prefernces = () =>{
                             <ChoiceIcon {...ratingOptions}></ChoiceIcon>
                         </div>
                         <div>
-                            <h2>Выберите понравившеися вам отели</h2>
+                            <h2>Выберите понравившиеся вам отели</h2>
                             <div className='hotelsCardWrapper'>
                                     {
                                         hotels.length == 0? <Spin></Spin>:
diff --git a/src/elements/Prefernces/style.css b/src/elements/Prefernces/style.css
index 25aedf2..2bb31b9 100644
--- a/src/elements/Prefernces/style.css
+++ b/src/elements/Prefernces/style.css
@@ -3,12 +3,13 @@
     position: fixed;
     top:0px;
     right:0px;
-    height: 100vh;
+    height: calc(100vh - 50px);
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
     padding: 25px;
     background-color: white;
+    overflow-y: scroll;
 }
 
 .prefsHeadWrapper{
@@ -20,7 +21,7 @@
 }
 
 .prefsbg{
-    position: absolute;
+    position: fixed;
     right: 0;
     top:0;
     width: 100%;
@@ -39,4 +40,19 @@
     align-items: center;
     overflow-y: scroll;
     margin-bottom: 15px;
+}
+
+@media screen and (max-device-width: 700px) {
+    .prefs{
+        width: calc(100% - 50px);
+    }
+}
+@media screen and (max-device-width: 600px) {
+    h2{
+        font-size: 16px;
+    }
+}
+
+@media screen and (max-device-width: 500px) {
+    
 }
\ No newline at end of file
diff --git a/src/elements/RouteCard/style.css b/src/elements/RouteCard/style.css
index fd05a41..fdd434c 100644
--- a/src/elements/RouteCard/style.css
+++ b/src/elements/RouteCard/style.css
@@ -157,4 +157,29 @@
 
 .likeBtn:hover{
     opacity: 0.5;
+}
+
+@media screen and (max-device-width: 600px) {
+    .tourcard-block{
+        width: 300px;
+        gap:15px;
+        padding: 15px;
+    }
+    .titleText{
+        font-size: 18px;
+        line-height: 22px;
+    }
+
+    .cardInfo{
+        font-size: 14px;
+    }
+    .tourCardSidebar{
+        width: calc(100% - 150px);
+    }
+}
+
+@media screen and (max-device-width: 400px) {
+    .tourcard-block{
+        width: 280px;
+    }
 }
\ No newline at end of file
diff --git a/src/elements/Search/index.tsx b/src/elements/Search/index.tsx
index 8d93138..73107f0 100644
--- a/src/elements/Search/index.tsx
+++ b/src/elements/Search/index.tsx
@@ -1,14 +1,13 @@
-import { AutoComplete, DatePicker, Input, Checkbox, Select, Radio, Space } from 'antd';
-import react, { useEffect, useState } from 'react'
+import { DatePicker, Checkbox, Select, Radio, Space } from 'antd';
+import { useEffect, useState } from 'react'
 import { useNavigate } from 'react-router-dom';
-import { backend } from '../../consts';
+import { backend, updateBackend } from '../../consts';
 import { Button } from '../../elements/Button';
 
 import './style.css'
 import dayjs from 'dayjs';
 import type { RangePickerProps } from 'antd/es/date-picker';
 import type { Dayjs } from 'dayjs';
-import { propTypes } from 'react-tinder-card';
 
 type RangeValue = [Dayjs | null, Dayjs | null] | null;
 
@@ -19,7 +18,9 @@ export const Search:React.FC<{onSearch?:()=>void}> = (props) =>{
     
 
     useEffect(()=>{
-        if (cities.length == 0){
+        if (cities.length == 0 && localStorage.getItem('token') != null){
+            updateBackend()
+            console.log(localStorage.getItem('token'))
             backend.get('/data/cities').then((response)=>setCities(response.data))
         }
     })
@@ -79,12 +80,10 @@ export const Search:React.FC<{onSearch?:()=>void}> = (props) =>{
     }
 
 
-    let searchParams = {}
  
-    if (datesValue.length == 2){
-       searchParams = {
-          date_from: new Date((datesValue as any)[0]).toISOString().split('T')[0],
-          date_to: new Date((datesValue as any)[1]).toISOString().split('T')[0],
+       let searchParams = {
+          date_from: datesValue.length == 2? new Date((datesValue as any)[0]).toISOString().split('T')[0]:null,
+          date_to: datesValue.length == 2? new Date((datesValue as any)[1]).toISOString().split('T')[0]:null,
           city: city,
           stars:stars,
           what_to_see:whatToSee,
@@ -94,7 +93,7 @@ export const Search:React.FC<{onSearch?:()=>void}> = (props) =>{
           with_animals: withAnimals,
           movement: transport
        }
-    }
+    
 
     const disabledDate: RangePickerProps['disabledDate'] = (current:any) => {
       if (!dates) {
@@ -106,6 +105,8 @@ export const Search:React.FC<{onSearch?:()=>void}> = (props) =>{
 
        return current && current < dayjs().endOf('day') || !!tooEarly || !!tooLate;;
      };
+
+
      const onOpenChange = (open: boolean) => {
       if (open) {
         setDates([null, null]);
@@ -129,7 +130,7 @@ export const Search:React.FC<{onSearch?:()=>void}> = (props) =>{
                      <img src='/filter.svg'></img>
                      <div>Фильтры</div>
                   </div>
-                  <img src='/react.svg'></img>
+                  <img className='rectIMG' src='/react.svg'></img>
                   <Select
                      className='antdBorder'
                      showSearch
@@ -148,7 +149,7 @@ export const Search:React.FC<{onSearch?:()=>void}> = (props) =>{
                      )}
                   />
 
-                  <img src='/react.svg'></img>
+                  <img className='rectIMG' src='/react.svg'></img>
                   <RangePicker
                      disabledDate={disabledDate}
                      onCalendarChange={(val) => {
@@ -158,7 +159,7 @@ export const Search:React.FC<{onSearch?:()=>void}> = (props) =>{
                      changeOnBlur
                      onChange={(e)=>setDatesValue(e as any)}
                   ></RangePicker>
-                  <img src='/react.svg'></img>
+                  <img className='rectIMG' src='/react.svg'></img>
                   <Button className='btn-y' onClick={()=>onNavigate()}>Сгенерировать</Button>
                </div>
                {
diff --git a/src/pages/EventMatch/index.tsx b/src/pages/EventMatch/index.tsx
index b9ed8e8..de2bb29 100644
--- a/src/pages/EventMatch/index.tsx
+++ b/src/pages/EventMatch/index.tsx
@@ -1,93 +1,113 @@
-import react, { useRef } from 'react'
-import TinderCard from 'react-tinder-card'
-import './style.css'
-import { Block } from '../../elements/Block'
-import { Card, TinderCardContent } from '../../elements/Card'
-import { Button } from '../../elements/Button'
-import { startTinder, swipe, } from '../../client'
-import {useNavigate} from 'react-router-dom';
-
-interface IEventData{
-    title: string;
-    description: string;
-    id: string;
-}
-
-
-export const EventMatch: react.FC = () => {
-    const ref = useRef(null);
-    const navigate = useNavigate();
-    const started = useRef(false);
-    const swiping = useRef(false);
-    const [cardData, setCardData] = react.useState({title: "", description: "", id: ''} as IEventData);
-    const data  = react.useRef({title: "", description: "", id: ''} as IEventData)
-
-
-    if (!started.current) {
-        started.current = true;
-        startTinder().then((e) => {
-            
-            data.current = {
-                title: e.title,
-                description: e.description.split(' ').slice(0, 10).join(' '),
-                id: e.oid
-            };
-            setCardData({
-                title: e.title,
-                description: e.description.split(' ').slice(0, 10).join(' '),
-                id: e.oid
-            });
-        })
-    }
-
-
-    return <div className='centered tin'>
-    <Block className='tinder-block'>
-        <TinderCard ref={ref} onSwipe={(type) => {
-            console.log("swipe");
-            if (swiping.current) return;
-            swiping.current = true;
-            swipe(data.current.id, type).then((e) => {
-                if (!e) {
-                    navigate('/');
-                    return;
-                }
-                data.current = {
-                    title: e.event.title,
-                    description: e.event.description.split(' ').slice(0, 10).join(' '),
-                    id: e.event.oid
-                };
-                setCardData(
-                    {
-                        title: e.event.title,
-                        description: e.event.description.split(' ').slice(0, 10).join(' '),
-                        id: e.event.oid
-                    }
-                );
-                setTimeout(() => {
-                    (ref.current as any).restoreCard();
-                    swiping.current = false;
-                }, 2000);
-            })
-            
-        }}>
-            <Card className=''>
-                <TinderCardContent
-                    title={data.current.title}
-                    description={data.current.description}
-                ></TinderCardContent>
-            </Card>
-        </TinderCard>
-    </Block>
-
-    <Block className='tin-dir'>
-        <Button className='' onClick={() => {
-            (ref.current as any).swipe('left')
-        }}>Не нравится</Button>
-        <Button className='main-btn'>На главную</Button>
-        <Button className='' onClick={() => {
-            (ref.current as any).swipe('right')
-        }}>Нравится</Button>
-    </Block>
-   </div>
+import react, { useRef, useState } from 'react'
+import TinderCard from 'react-tinder-card'
+import './style.css'
+import { Block } from '../../elements/Block'
+import { Card, TinderCardContent } from '../../elements/Card'
+import { Button } from '../../elements/Button'
+import { dailySelectionBuild, dailySelectionGenerate, saveTinderPath, startTinder, swipe, } from '../../client'
+import {useNavigate} from 'react-router-dom';
+import { MyMap } from '../../elements/map'
+import { RusPassHeader } from '../../elements/Header'
+
+interface IEventData{
+    title: string;
+    description: string;
+    id: string;
+}
+
+
+export const EventMatch: react.FC = () => {
+    const ref = useRef(null);
+    const navigate = useNavigate();
+    const started = useRef(false);
+    const [dailyData, setDailyData] = useState([]);
+    const [resData, setResData] = useState<any[]>([]);
+    const queried = useRef(false);
+    const [answerData, setAnswerData] = useState([]);
+
+    if (!started.current) {
+        started.current = true;
+        dailySelectionGenerate().then((e) => {
+            console.log(e)
+            setDailyData(e.events);
+        })
+    }
+
+    return <div className='centered tin'>
+        <RusPassHeader></RusPassHeader>
+    <Block className='tinder-block'>
+        {
+            dailyData.map((e) => {
+                return <TinderCard 
+                    ref={ref} 
+                    className='card'
+                    onSwipe={(type) => {
+                        console.log(dailyData.indexOf(e))
+                        if (dailyData.indexOf(e) == 0) {
+                            if (!resData.length) return;
+                            if (!queried.current) {
+                                dailySelectionBuild(resData).then((e) => {
+                                    setAnswerData(e.path);
+                                });
+                                queried.current = true;
+                            }
+                        }
+                        
+                        if (type == 'right') {
+                            setResData(resData.concat([
+                                {
+                                    'action': 'right',
+                                    'oid': (e as any).oid
+                                } as any
+                            ]))
+                        }
+                        
+                    }}
+                >
+        
+                    <Card className=''>
+                        <TinderCardContent
+                            title={dailyData.length ? (e as any).title : ""}
+                            description={dailyData.length ? (e as any).description.slice(0, 70) : ""}
+                        ></TinderCardContent>
+                    </Card>
+                </TinderCard>
+            })
+        }
+        <div className='cont-span'>
+        {
+            dailyData.length && !answerData.length ?
+            (!queried.current ? 
+            <div className='span-cont'><span className='span-er'>Вы не выбрали ни одного события, Мы не можем сгенерировать вам маршрут. Возвращяйтесь к нам завтра. <a 
+            href="" onClick={() => {
+                navigate('/');
+            }}
+            >Вернуться на главную</a></span></div> : <span>Подождите немного, мы генерируем для вас ежедневный маршрут</span>) : answerData.length ? <MyMap points={
+                answerData.filter((e: any) => e.type == 'point').map((e: any) => {return {
+                    cords: [e.point.lat, e.point.lon],
+                    title: e.point.title,
+                    description: ""
+                }})
+                
+            }></MyMap> : <></>
+        }
+        {
+            answerData.length ? <div className='btns'>
+            <Button onClick={() => {
+                saveTinderPath(answerData);
+                navigate('/');
+            }} className=''>
+                Сохранить
+            </Button>
+            <Button onClick={() => {
+                navigate('/');
+            }} className=''>
+                На главную
+            </Button>
+            </div> : <></>
+        }
+        </div>
+        
+    </Block>
+   </div>
 }
\ No newline at end of file
diff --git a/src/pages/EventMatch/style.css b/src/pages/EventMatch/style.css
index e421adb..98f9659 100644
--- a/src/pages/EventMatch/style.css
+++ b/src/pages/EventMatch/style.css
@@ -1,9 +1,59 @@
-.tinder-block{
-    width: 700px;
-    display: flex;
-    justify-content: center;
-}
-
-.main-btn{
-    background-color: #FFCF08;
+.tinder-block{
+    width: 700px;
+    display: flex;
+    justify-content: center;
+}
+
+.main-btn{
+    background-color: #FFCF08;
+}
+
+.tinder-block{
+    height: 600px;
+}
+
+.card{
+    position: absolute;
+}
+.span-er{
+    width: 250px;
+    text-align: center;
+}
+a{
+    color: black;
+}
+a:visited{
+    color: black;
+}
+
+.btns{
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+    margin-top: 20px;
+}
+
+.cont-span{
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+    width: 500px;
+}
+
+.span-cont{
+    display: flex;
+    justify-content: center;
+    
+}
+
+@media screen and (max-device-width: 800px) {
+    .tinder-block{
+        width: auto;
+        padding: 10px;
+    }
+    .cont-span{
+        width: auto;
+        padding: 50px;
+        align-items:   center ;
+    }
 }
\ No newline at end of file
diff --git a/src/pages/Login/index.tsx b/src/pages/Login/index.tsx
index e5d9a95..f125745 100644
--- a/src/pages/Login/index.tsx
+++ b/src/pages/Login/index.tsx
@@ -25,6 +25,7 @@ export const Login: react.FC = () => {
             <Input placeholder='Пароль' className='reg-input' onChange={setPassword}/>
             <Button className='' onClick={() => {
                     signin(username, password).then((e) => {
+                        console.log(e)
                         localStorage.setItem('token', e.access);
                         localStorage.setItem('firstAuth', 'true');
 
@@ -36,9 +37,9 @@ export const Login: react.FC = () => {
                 <span>или</span>
                 <div className="sep-item"></div>
             </div>
-            <YandexLogin clientID={clientID} onSuccess={() => {}}>
-                <button className="btn-y">Yandex login</button>
-            </YandexLogin>
+            <Button className='login-btn-y' onClick={()=>navigate('/register')}>Зарегистрироваться</Button>
+
+
         </Block>
     </div>
 }
\ No newline at end of file
diff --git a/src/pages/Login/style.css b/src/pages/Login/style.css
index 2bf7a67..2cc26ad 100644
--- a/src/pages/Login/style.css
+++ b/src/pages/Login/style.css
@@ -20,8 +20,7 @@
     width: 400px;
 }
 
-.btn-y{
-    width: 440px!important;
+.login-btn-y{
     background-color: #FFCF08;
     border-radius: 10px;
     padding: 15px 50px;
diff --git a/src/pages/Main/index.tsx b/src/pages/Main/index.tsx
index 17a2f01..70d17c7 100644
--- a/src/pages/Main/index.tsx
+++ b/src/pages/Main/index.tsx
@@ -1,7 +1,7 @@
 import { AutoComplete, DatePicker, Input, Checkbox, Select, Radio, Space, Spin } from 'antd';
-import react, { useEffect, useState } from 'react'
+import react, { useEffect, useRef, useState } from 'react'
 import { useNavigate } from 'react-router-dom';
-import { backend } from '../../consts';
+import { backend, updateBackend } from '../../consts';
 import { Button } from '../../elements/Button';
 import { FavoriteCard, FavoriteCardIE } from '../../elements/FavoriteCard';
 import { GenerateCard } from '../../elements/GenerateCard';
@@ -21,31 +21,42 @@ export const Main: react.FC = () => {
    let navigate = useNavigate()
 
    let token = localStorage.getItem('token')
-
    let firstAuth = localStorage.getItem('firstAuth')
+   console.log(token)
+
+   const queried = useRef(false);
 
    useEffect(()=>{
+      updateBackend()
+
+      const dataLoad = async () =>{
+         const favorites = await backend.get('user/favorite')
+         const events = await backend.get('recommendations/recommendations/')
+         return {
+            favorites, events
+         }
+      }
+
+      if (!queried.current && localStorage.getItem('token') != null && localStorage.getItem('firstAuth') != 'true') {
+         queried.current = true;
+         dataLoad().then((data) => {
+             setFavorites(data.favorites.data as any);
+             setEvents(data.events.data as any);
+         })
+      }
+
       if (null == localStorage.getItem('token')){
          navigate('/login')
       }
-      if (favorites.length == 0){
-         backend.get('user/favorite').then((e)=>setFavorites(e.data))
-      }
-      if (events.length == 0){
-         backend.get('recommendations/recommendations/').then((e)=>setEvents(e.data as any));
-      }
+
+      // if (favorites.length == 0){
+      //    backend.get('user/favorite').then((e)=>setFavorites(e.data))
+      // }
+      // if (events.length == 0){
+      //    backend.get('recommendations/recommendations/').then((e)=>setEvents(e.data as any));
+      // }
    })
-   
-   
-
-   const favoriteCardProps = {
-      imageURL:'restourant.png',
-      title:'Кафе Сказка',
-      location:'Казань'
-   } as FavoriteCardIE
-
-
-  
+     
    return (
       <div className='mainWrapper'>
          {
@@ -53,7 +64,10 @@ export const Main: react.FC = () => {
          }
          <RusPassHeader></RusPassHeader>
          <div className='headMainWrapper'>
-            <img  className='backgroundIMG' src='background.png'></img>
+            <div className='backgroundMainIMG'>
+               <div className='imgHeader'>Сгенерируйте ваш идеальный тур</div>
+               <div className='imgDescr'>Туры, достопримечательности, отели  - все в одном cервисе</div>
+            </div>
             <Search onSearch={()=>null}></Search>
          </div>
          <div className='mainCard'>
@@ -102,7 +116,7 @@ export const Main: react.FC = () => {
             </div>
          </div>
 
-         <a href='/'>Документация</a>
+         <a href='https://1drv.ms/w/s!AuaFmGWFNV5Np0OhMmVtxPXlG2Ob?e=f7NDCp'>Документация</a>
 
          <div className='mainIconWrapper'>
             <img className='mainIcon' src='icons/yt.svg'></img>
diff --git a/src/pages/Main/style.css b/src/pages/Main/style.css
index 8b63555..91776eb 100644
--- a/src/pages/Main/style.css
+++ b/src/pages/Main/style.css
@@ -1,6 +1,6 @@
 .mainCard{
     background-color: #FFFBF3;
-    width: сalc(100%-100px);
+    width: calc(100%-100px);
     margin: 0px 50px;
     display: flex;
     flex-direction: column;
@@ -9,9 +9,9 @@
     padding: 50px;
     width: calc(100% - 200px);
 }
+
 .mainCard>h2{
     display: inline-block;
-    width: 400px;
 }
 
 .cardWrapper{
@@ -24,9 +24,10 @@
 
 .fav-wrapper{
     display: flex;
-    justify-content: space-between;
+    justify-content: center;
     gap: 25px;
     flex-wrap: wrap;
+    align-items: center;
 }
 
 .grey{
@@ -80,8 +81,18 @@
 
 }
 
-.backgroundIMG{
-    width: calc(100% - 100px);
+.backgroundMainIMG{
+    width: calc(100% - 260px);
+    height: 25vh;
+    background-image: url('../../../public/background.png');
+    background-size: cover;
+    border-radius: 48px;
+    display: flex;
+    padding: 80px;
+    flex-direction: column;
+    align-items: center;
+    justify-content: flex-end;
+    gap:20px
 }
 
 .rowWrapper{
@@ -121,3 +132,51 @@
 .ant-select-selector, .ant-picker{
     border: 0px !important;
 }
+
+.imgHeader{
+    font-style: normal;
+    font-weight: 600;
+    font-size: 44px;
+    line-height: 46px;
+    color: #FFFFFF;
+    text-align: center;
+}
+
+.imgDescr{
+    font-style: normal;
+    font-weight: 500;
+    font-size: 20px;
+    line-height: 24px;
+
+    display: flex;
+    align-items: flex-end;
+    text-align: center;
+
+
+    color: #FFFFFF;
+
+}
+
+@media screen and (max-device-width: 700px) {
+    .imgHeader{
+        font-size: 24px;
+        line-height: 28px;
+    }
+    .imgDescr{
+        font-size: 18px;
+        line-height: 22px;
+    }
+    .mainCard{
+        padding: 25px !important;
+        margin: 0px 25px !important;
+        border-radius: 20px !important;
+    }
+}
+
+@media screen and (max-device-width: 500px) {
+    .backgroundMainIMG{
+        width: calc(100% - 90px) !important;
+        padding: 20px !important;
+        padding-bottom: 60px !important;
+    }
+}
\ No newline at end of file
diff --git a/src/pages/Register/index.tsx b/src/pages/Register/index.tsx
index c91ac33..12835cc 100644
--- a/src/pages/Register/index.tsx
+++ b/src/pages/Register/index.tsx
@@ -38,9 +38,8 @@ export const Register: react.FC = () => {
                 <span>или</span>
                 <div className="sep-item"></div>
             </div>
-            <YandexLogin clientID={clientID} onSuccess={() => {}}>
-                <button className="btn-y">Yandex login</button>
-            </YandexLogin>
+            <Button className='login-btn-y' onClick={()=>navigate('/login')}>Войти</Button>
+
         </Block>
     </div>
 }
\ No newline at end of file
diff --git a/src/pages/Register/style.css b/src/pages/Register/style.css
index 2bf7a67..f809105 100644
--- a/src/pages/Register/style.css
+++ b/src/pages/Register/style.css
@@ -20,12 +20,23 @@
     width: 400px;
 }
 
-.btn-y{
-    width: 440px!important;
+.login-btn-y{
     background-color: #FFCF08;
     border-radius: 10px;
     padding: 15px 50px;
     outline: none;
     border: none;
     cursor: pointer;
+}
+
+@media screen and (max-device-width: 600px) {
+    .reg-input{
+        width: 280px !important;
+    }
+}
+
+@media screen and (max-device-width: 600px) {
+    .reg-input{
+        width: 200px !important;
+    }
 }
\ No newline at end of file
diff --git a/src/pages/SearchPage/index.tsx b/src/pages/SearchPage/index.tsx
index 4270216..9647b45 100644
--- a/src/pages/SearchPage/index.tsx
+++ b/src/pages/SearchPage/index.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { useParams } from "react-router-dom";
 import { backend } from "../../consts";
 import { RouteCard, RouteCardIE } from "../../elements/RouteCard";
@@ -11,18 +11,28 @@ import { EventCard } from "../../elements/EventCard";
 
 export const SearchPage:React.FC = () =>{
     let { prefs } = useParams();
-    const [cities, setCities] = useState([])
 
     const [data, setData] = useState([])
     const [events, setEvents] = useState([])
-    useEffect(()=>{
-        if (cities.length == 0){
-            backend.get('/data/cities').then((response)=>setCities(response.data))
-            backend.post('/route/build',JSON.parse(prefs as string)).then((r)=>setData(r.data as any))
-            backend.post('/recommendations/build_events/',JSON.parse(prefs as string)).then((r)=>setEvents(r.data as any))
-        }
-    })
 
+    const queried = useRef(false);
+    useEffect(()=>{
+
+        const dataLoad = async (prefs: string) => {
+            const routes = await backend.post('/route/build',JSON.parse(prefs as string))
+            const events = await backend.post('/recommendations/build_events/',JSON.parse(prefs as string))
+            return {
+              routes, events
+            }
+        }
+        if (!queried.current) {
+            queried.current = true;
+            dataLoad(prefs as string).then((data) => {
+                setData(data.routes.data as any);
+                setEvents(data.events.data as any);
+            })
+        }
+    }, [prefs])
     console.log(events)
 
     let newData;
@@ -62,21 +72,12 @@ export const SearchPage:React.FC = () =>{
     const onSearch = () =>{
         setData([])
     }
-    const contentStyle: React.CSSProperties = {
-        height: '160px',
-        color: '#fff',
-        lineHeight: '160px',
-        textAlign: 'center',
-        background: '#364d79',
-      };
+
  
     return(
         <div className="mainWrapper">
             <RusPassHeader></RusPassHeader>
            
-               
-               
-    
             <h1>Посмотрите, что мы нашли по вашему запросу</h1>
             <Search onSearch={()=>onSearch()}></Search>
             {
@@ -112,7 +113,7 @@ export const SearchPage:React.FC = () =>{
                 
             }
 
-                    <a href='/'>Документация</a>
+                    <a href='https://1drv.ms/w/s!AuaFmGWFNV5Np0OhMmVtxPXlG2Ob?e=f7NDCp'>Документация</a>
 
                     <div className='mainIconWrapper'>
                         <img className='mainIcon' src='/icons/yt.svg'></img>
diff --git a/src/pages/SearchPage/style.css b/src/pages/SearchPage/style.css
index 48dcf9c..5f3d1d5 100644
--- a/src/pages/SearchPage/style.css
+++ b/src/pages/SearchPage/style.css
@@ -1,6 +1,5 @@
 .mainCard{
     background-color: #FFFBF3;
-    width: сalc(100%-100px);
     margin: 0px 50px;
     display: flex;
     flex-direction: column;
@@ -21,7 +20,7 @@
 
 .fav-wrapper{
     display: flex;
-    justify-content: space-between;
+    justify-content: center;
     gap: 25px;
     flex-wrap: wrap;
 }
@@ -53,6 +52,7 @@
     justify-content: center;
     align-items: center;
     padding-bottom: 100px;
+    width: 100%;
     
 }
 
@@ -118,3 +118,42 @@
 .ant-select-selector, .ant-picker{
     border: 0px !important;
 }
+
+
+@media screen and (max-device-width: 1000px) {
+    .toolsMainWrapper{
+        flex-wrap: wrap;
+        align-items: center;
+        justify-content: center;
+        padding: 10px 15px;
+    }
+    .rectIMG{
+        display: none;
+    }
+    .mainCard{
+        padding: 25px !important;
+        margin: 0px 25px !important;
+        border-radius: 20px !important;
+    }
+   
+}
+@media screen and (max-device-width: 700px) {
+    h1{
+        font-size: 24px;
+        text-align: center;
+    }
+}
+
+@media screen and (max-device-width: 500px) {
+    .mainCard{
+        margin: 0px 15px !important;
+        padding: 10px;
+        width: calc(100% - 100px);
+    }
+    h1{
+        width: 100%;
+        font-size: 16px;
+        text-align: center;
+        margin-top: -50px;
+    }
+}
diff --git a/src/router.tsx b/src/router.tsx
index 950efbf..73a5ff3 100644
--- a/src/router.tsx
+++ b/src/router.tsx
@@ -1,5 +1,5 @@
 import {
-    createBrowserRouter
+    createBrowserRouter, createHashRouter
 } from 'react-router-dom'
 import App from './App'
 import { Register } from './pages/Register';
@@ -7,8 +7,8 @@ import { Login } from './pages/Login';
 import { Main } from './pages/Main';
 import { EventMatch } from './pages/EventMatch';
 import { GenerateTour } from './pages/GenerateTour';
-import { Prefernces } from './elements/Prefernces';
 import { SearchPage } from './pages/SearchPage';
+import { Prefernces } from './elements/Prefernces';
 
 
 const routes = [
@@ -47,4 +47,4 @@ const routes = [
 
 ]
 
-export const router = createBrowserRouter(routes);
+export const router = createHashRouter(routes);