From e8493d53f82333364de2eec3f916f20040ecc3a1 Mon Sep 17 00:00:00 2001
From: Fluffy <michal-gdula@protonmail.com>
Date: Thu, 25 Apr 2024 19:18:28 +0100
Subject: [PATCH] Create Container style Make some styles for mobile Create
 Logo for the website Clean up styles for the millionth time

---
 front/public/Logo.svg                         | 19 +++++
 front/public/LogoAlt.svg                      | 19 +++++
 front/src/pages/PageCart.svelte               | 18 ++++-
 front/src/pages/PageContact.svelte            | 61 +++------------
 front/src/pages/PageIndex.svelte              | 77 ++++++++++++-------
 front/src/pages/PageMenu.svelte               | 75 ++++--------------
 .../pages/elements/AnnouncementBanner.svelte  |  4 +-
 front/src/pages/elements/NavigationBar.svelte |  3 +-
 front/src/styles/_announcement_banner.scss    | 26 ++++---
 front/src/styles/_container.scss              | 25 ++++++
 front/src/styles/_navigation_bar.scss         |  9 ++-
 front/src/styles/_reset.scss                  | 13 ++++
 front/src/styles/main.scss                    |  1 +
 front/src/testData.js                         |  2 +-
 14 files changed, 199 insertions(+), 153 deletions(-)
 create mode 100644 front/public/Logo.svg
 create mode 100644 front/public/LogoAlt.svg
 create mode 100644 front/src/styles/_container.scss

diff --git a/front/public/Logo.svg b/front/public/Logo.svg
new file mode 100644
index 0000000..ab041ae
--- /dev/null
+++ b/front/public/Logo.svg
@@ -0,0 +1,19 @@
+<svg width="192" height="40" viewBox="0 0 192 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_5_3)">
+<path d="M21.56 6.84V13.48H19.16C18.9733 12.2533 18.5733 11.28 17.96 10.56C17.3733 9.81333 16.5733 9.44 15.56 9.44H13.96V6.84H21.56ZM14.12 26.16C14.12 26.96 14.2933 27.5733 14.64 28C15.0133 28.4 15.6133 28.6667 16.44 28.8V31H5.8V28.8C6.62667 28.6667 7.21333 28.4 7.56 28C7.93333 27.6 8.12 27.0133 8.12 26.24V6.84H14.12V26.16ZM0.64 6.84H8.6V9.44H6.64C5.62667 9.44 4.8 9.81333 4.16 10.56C3.54667 11.28 3.17333 12.2533 3.04 13.48H0.64V6.84ZM32.2259 27.4L32.7859 28.64C32.0659 29.4667 31.2259 30.12 30.2659 30.6C29.3326 31.08 28.2659 31.32 27.0659 31.32C25.4393 31.32 24.1193 30.88 23.1059 30C22.0926 29.0933 21.5859 27.9467 21.5859 26.56C21.5859 24.8267 22.3459 23.44 23.8659 22.4C25.3859 21.3333 27.3859 20.8 29.8659 20.8H32.9059V23.04H31.1059C30.1193 23.04 29.3193 23.2667 28.7059 23.72C28.0926 24.1467 27.7859 24.72 27.7859 25.44C27.7859 26.1067 28.0659 26.64 28.6259 27.04C29.1859 27.44 29.9193 27.64 30.8259 27.64C31.0926 27.64 31.3459 27.6267 31.5859 27.6C31.8259 27.5467 32.0393 27.48 32.2259 27.4ZM38.0659 24.68C38.0659 25.48 38.2393 26.08 38.5859 26.48C38.9593 26.8533 39.5193 27.12 40.2659 27.28V29.48L35.5059 31.28H34.3059L32.1059 27.92V18.04C32.1059 17.1067 31.8659 16.3867 31.3859 15.88C30.9059 15.3733 30.2793 15.12 29.5059 15.12C28.6793 15.12 27.9326 15.4133 27.2659 16C26.6259 16.56 26.1459 17.44 25.8259 18.64H23.2259V13.88C24.3193 13.4 25.4259 13.0267 26.5459 12.76C27.6926 12.4667 28.9193 12.32 30.2259 12.32C31.6393 12.32 32.9326 12.56 34.1059 13.04C35.3059 13.4933 36.2659 14.24 36.9859 15.28C37.7059 16.32 38.0659 17.68 38.0659 19.36V24.68ZM48.4994 31.28C47.086 31.28 45.8994 31.1467 44.9394 30.88C43.9794 30.6133 43.1794 30.3067 42.5394 29.96V24.96H45.1394C45.3527 26.1067 45.7527 26.9867 46.3394 27.6C46.9527 28.2133 47.8327 28.52 48.9794 28.52C49.7527 28.52 50.3527 28.3333 50.7794 27.96C51.206 27.5867 51.4194 27.0933 51.4194 26.48C51.4194 26 51.1927 25.6 50.7394 25.28C50.3127 24.9333 49.7527 24.6133 49.0594 24.32C48.3927 24.0267 47.6727 23.72 46.8994 23.4C46.126 23.0533 45.3927 22.6667 44.6994 22.24C44.0327 21.7867 43.4727 21.24 43.0194 20.6C42.5927 19.96 42.3794 19.1733 42.3794 18.24C42.3794 17.0133 42.686 15.96 43.2994 15.08C43.9127 14.2 44.7927 13.52 45.9394 13.04C47.086 12.56 48.446 12.32 50.0194 12.32C51.2994 12.32 52.3794 12.4267 53.2594 12.64C54.166 12.8533 55.0194 13.1467 55.8194 13.52V18.08H53.2194C53.0327 17.04 52.646 16.28 52.0594 15.8C51.4994 15.32 50.8194 15.08 50.0194 15.08C49.326 15.08 48.7927 15.2667 48.4194 15.64C48.046 16.0133 47.8594 16.4667 47.8594 17C47.8594 17.48 48.0727 17.8933 48.4994 18.24C48.9527 18.56 49.526 18.8667 50.2194 19.16C50.9394 19.4533 51.686 19.7733 52.4594 20.12C53.2327 20.44 53.966 20.8133 54.6594 21.24C55.3794 21.6667 55.9527 22.1867 56.3794 22.8C56.8327 23.4133 57.0594 24.1733 57.0594 25.08C57.0594 27 56.286 28.52 54.7394 29.64C53.2194 30.7333 51.1394 31.28 48.4994 31.28ZM71.3688 15.56H62.2488V12.6H71.3688V15.56ZM71.6088 27.4L72.2888 29.44C71.5421 29.92 70.6088 30.3467 69.4888 30.72C68.3954 31.0933 67.3021 31.28 66.2088 31.28C64.4221 31.28 62.9954 30.7467 61.9288 29.68C60.8621 28.5867 60.3288 27.1867 60.3288 25.48V15.56H58.6888V13.2C59.8354 12.8 60.8354 12.2 61.6888 11.4C62.5688 10.5733 63.1688 9.58667 63.4888 8.44H66.2888V24.72C66.2888 25.6267 66.5688 26.36 67.1288 26.92C67.7154 27.48 68.4621 27.76 69.3688 27.76C69.7154 27.76 70.0754 27.7333 70.4488 27.68C70.8221 27.6 71.2088 27.5067 71.6088 27.4ZM86.0953 14.8V12.6H93.4153V14.8C92.9353 15.0667 92.522 15.4 92.1753 15.8C91.8553 16.2 91.562 16.6933 91.2953 17.28L85.2553 30.68L82.0953 39H76.2553V37.6L82.8953 29.4L82.4953 32.2L74.9353 17.28C74.6686 16.7467 74.402 16.2667 74.1353 15.84C73.8953 15.4133 73.5086 15.0667 72.9753 14.8V12.6H82.3753V14.8C81.7886 14.8 81.3753 15.0267 81.1353 15.48C80.922 15.9067 80.9486 16.4533 81.2153 17.12L85.5353 27.72L82.9753 29.24L87.5353 17.28C87.8286 16.48 87.8153 15.8667 87.4953 15.44C87.1753 15.0133 86.7086 14.8 86.0953 14.8Z" fill="#443023"/>
+<mask id="mask0_5_3" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="114" y="0" width="78" height="38">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M119.386 2.80517C119.393 2.57069 119.348 2.3392 119.255 2.11928C119.077 1.69954 118.738 1.35465 118.322 1.09748C117.492 0.583728 116.265 0.358072 114.914 0.593113C114.642 0.640467 114.46 0.899396 114.507 1.17145C114.555 1.4435 114.814 1.62565 115.086 1.5783C116.246 1.37641 117.214 1.58769 117.796 1.94781C118.087 2.12758 118.258 2.32886 118.334 2.50991C118.406 2.67803 118.409 2.85596 118.314 3.05449L117.972 3.77039L118.765 3.77039C119.904 3.77038 120.736 4.1618 121.218 4.86417C121.39 5.11429 121.483 5.44798 121.482 5.76505C121.481 6.0947 121.382 6.31239 121.286 6.40364L120.764 6.90069L121.412 7.21564C122.24 7.61757 122.429 7.99264 122.466 8.17495C122.54 8.54668 122.46 8.71831 122.354 8.8474C122.234 8.99365 122.072 9.10377 121.831 9.26727C121.766 9.31167 121.695 9.36 121.617 9.41405L120.813 9.97426L121.739 10.2966C122.236 10.4697 122.394 10.7161 122.455 10.8959C122.527 11.1066 122.498 11.3263 122.468 11.4645C122.394 11.8016 122.305 12.0481 122.168 12.2356C122.04 12.4099 121.845 12.5677 121.486 12.6759L120.565 12.9541L121.322 13.548C121.573 13.7444 121.673 13.9419 121.699 14.1108C121.725 14.2821 121.684 14.4881 121.533 14.7163C121.223 15.185 120.479 15.6817 119.307 15.8858L118.383 16.0467L119.032 16.7242C119.301 17.0058 119.388 17.2148 119.408 17.3507C119.425 17.4739 119.396 17.5921 119.3 17.7253C119.082 18.0295 118.583 18.3156 117.973 18.5278C117.713 18.6186 117.575 18.9036 117.666 19.1644C117.756 19.4252 119.322 19.0653 119.583 18.9745C120.229 18.7498 119.704 18.8782 120.113 18.3085C120.331 18.0048 120.458 17.6314 120.398 17.2085C120.372 17.0331 120.317 16.8611 120.233 16.6925C121.205 16.3964 121.956 15.8899 122.367 15.2683C122.627 14.8751 122.758 14.422 122.687 13.9597C122.653 13.7336 122.572 13.5204 122.452 13.3238C122.661 13.1854 122.834 13.0189 122.975 12.8265C123.236 12.4705 123.36 12.0615 123.444 11.6797C123.489 11.478 123.561 11.0424 123.402 10.5734C123.302 10.2809 123.122 10.0029 122.837 9.76967C122.942 9.68153 123.042 9.58562 123.127 9.48112C123.442 9.09731 123.574 8.61354 123.446 7.97837C123.346 7.47759 122.991 6.99962 122.334 6.58393C122.437 6.32347 122.481 6.03787 122.482 5.76804C122.483 5.27517 122.344 4.73691 122.043 4.2982C121.436 3.4142 120.492 2.93274 119.386 2.80517Z" fill="#111111"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M122.077 22.0329C122.147 21.8107 122.162 21.5752 122.123 21.3365C122.047 20.8784 121.78 20.4524 121.418 20.091C120.692 19.3664 119.473 18.7822 117.994 18.5849C117.72 18.5484 117.468 18.7406 117.432 19.0144C117.395 19.2881 117.588 19.5396 117.861 19.5761C119.175 19.7514 120.174 20.2624 120.711 20.7987C120.981 21.0679 121.106 21.3137 121.136 21.4993C121.163 21.6615 121.126 21.8081 120.981 21.9538L120.388 22.5499L121.195 22.7861C122.442 23.1513 123.238 23.7987 123.561 24.6146C123.673 24.8991 123.678 25.2292 123.594 25.5111C123.508 25.8016 123.354 25.9674 123.224 26.0243L122.48 26.3508L123.107 26.868C123.898 27.5207 123.986 27.9365 123.977 28.0958C123.965 28.286 123.923 28.3995 123.88 28.4709C123.839 28.5405 123.78 28.5977 123.691 28.651C123.52 28.753 123.31 28.8076 123.007 28.8865C122.926 28.9077 122.838 28.9306 122.742 28.9567L121.674 29.2474L122.598 29.8566C123.107 30.1922 123.202 30.4846 123.217 30.6555C123.233 30.8574 123.151 31.0399 123.083 31.1562C122.914 31.4447 122.756 31.6434 122.561 31.7746C122.376 31.8993 122.113 31.9922 121.68 31.9815L120.597 31.9547L121.279 32.7961C121.5 33.0694 121.544 33.2822 121.527 33.4273C121.511 33.5715 121.425 33.7401 121.203 33.9062C120.74 34.2519 119.794 34.4925 118.464 34.3151L117.434 34.1777L117.97 35.0684C118.183 35.423 118.211 35.6394 118.197 35.7544C118.185 35.8497 118.136 35.9401 117.998 36.0352C117.849 36.1381 117.619 36.2262 117.315 36.2876C117.016 36.348 116.677 36.3766 116.334 36.3811C116.058 36.3847 115.837 36.6114 115.841 36.8875C115.844 37.1636 116.071 37.3846 116.347 37.381C116.732 37.376 117.137 37.3439 117.513 37.2678C117.884 37.1928 118.26 37.0687 118.565 36.8591C118.881 36.6418 119.134 36.3195 119.189 35.8776C119.21 35.7126 119.201 35.5441 119.166 35.3728C120.266 35.3986 121.194 35.1612 121.802 34.7072C122.188 34.4181 122.466 34.0213 122.521 33.5403C122.546 33.3234 122.523 33.1081 122.459 32.8983C122.705 32.8349 122.924 32.7362 123.12 32.604C123.499 32.349 123.748 31.9987 123.946 31.6615C124.051 31.4819 124.256 31.0805 124.213 30.5719C124.188 30.2688 124.078 29.9641 123.861 29.6725C123.981 29.6266 124.097 29.5733 124.203 29.5101C124.408 29.3881 124.598 29.2204 124.739 28.9828C124.88 28.7471 124.955 28.4712 124.975 28.1572C125.006 27.6401 124.757 27.0842 124.188 26.5028C124.358 26.2934 124.479 26.0454 124.553 25.7955C124.695 25.3176 124.692 24.7567 124.491 24.2469C124.085 23.2217 123.212 22.4859 122.077 22.0329Z" fill="#111111"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M122.077 5.5L118.765 2.29038L115 0.5H191.5V37.5H116.5V36.5H118.197L119.032 35.0684L121.802 34.1777V32.604L123.88 31.1562L123.107 29.5101L124.491 28.9828L123.88 26.868L124.213 24.7771L122.561 22.5499L119.408 19.1644L120 16.5L121.195 16.0467L123 11L122.077 5.5Z" fill="#111111"/>
+</mask>
+<g mask="url(#mask0_5_3)">
+<rect x="100" y="1" width="91" height="36" rx="2" fill="#443023"/>
+<path d="M116.16 19.92L116.12 19.36C117.72 19.36 119.12 19.6133 120.32 20.12C121.547 20.6267 122.507 21.3333 123.2 22.24C123.893 23.1467 124.24 24.2 124.24 25.4C124.24 26.7067 123.827 27.8667 123 28.88C122.173 29.8667 121.013 30.64 119.52 31.2C118.053 31.7333 116.32 32 114.32 32H110.96V29.24L112.92 29.12C113.907 29.0667 114.747 28.88 115.44 28.56C116.16 28.24 116.707 27.8 117.08 27.24C117.48 26.6533 117.68 25.9867 117.68 25.24C117.68 24.4133 117.48 23.7067 117.08 23.12C116.707 22.5333 116.133 22.0667 115.36 21.72C114.587 21.3467 113.6 21.12 112.4 21.04L110.96 20.92V18.4L112.56 18.28C114.213 18.1467 115.413 17.7333 116.16 17.04C116.933 16.3467 117.32 15.4267 117.32 14.28C117.32 13.1867 116.92 12.32 116.12 11.68C115.32 11.0133 114.28 10.64 113 10.56L110.96 10.44V7.84H113.68C115.627 7.84 117.333 8.12 118.8 8.68C120.267 9.21333 121.413 9.97333 122.24 10.96C123.067 11.92 123.48 13.0533 123.48 14.36C123.48 15.4533 123.173 16.4267 122.56 17.28C121.947 18.1067 121.093 18.76 120 19.24C118.907 19.6933 117.627 19.92 116.16 19.92ZM111.72 7.84V32H103.4V29.8C104.173 29.6133 104.747 29.3333 105.12 28.96C105.52 28.5867 105.72 28.0133 105.72 27.24V12.6C105.72 11.8267 105.533 11.24 105.16 10.84C104.813 10.4133 104.227 10.1467 103.4 10.04V7.84H111.72ZM128.233 8.28C128.233 7.34667 128.579 6.56 129.273 5.92C129.966 5.28 130.806 4.96 131.793 4.96C132.779 4.96 133.606 5.28 134.273 5.92C134.939 6.56 135.273 7.34667 135.273 8.28C135.273 9.24 134.939 10.0533 134.273 10.72C133.606 11.36 132.779 11.68 131.793 11.68C130.806 11.68 129.966 11.36 129.273 10.72C128.579 10.0533 128.233 9.24 128.233 8.28ZM137.193 32H126.833V29.8C127.633 29.5867 128.193 29.2933 128.513 28.92C128.859 28.52 129.033 27.92 129.033 27.12V20.36C129.033 19.5867 128.859 19.0133 128.513 18.64C128.166 18.2667 127.606 18 126.833 17.84V15.64L132.473 13.6H134.993V27.24C134.993 28.0133 135.166 28.5867 135.513 28.96C135.886 29.3333 136.446 29.6133 137.193 29.8V32ZM151.298 16.56H142.178V13.6H151.298V16.56ZM151.538 28.4L152.218 30.44C151.472 30.92 150.538 31.3467 149.418 31.72C148.325 32.0933 147.232 32.28 146.138 32.28C144.352 32.28 142.925 31.7467 141.858 30.68C140.792 29.5867 140.258 28.1867 140.258 26.48V16.56H138.618V14.2C139.765 13.8 140.765 13.2 141.618 12.4C142.498 11.5733 143.098 10.5867 143.418 9.44H146.218V25.72C146.218 26.6267 146.498 27.36 147.058 27.92C147.645 28.48 148.392 28.76 149.298 28.76C149.645 28.76 150.005 28.7333 150.378 28.68C150.752 28.6 151.138 28.5067 151.538 28.4ZM169.554 27.68L170.394 29.96C169.648 30.44 168.621 30.9467 167.314 31.48C166.034 32.0133 164.541 32.28 162.834 32.28C161.021 32.28 159.381 31.9067 157.914 31.16C156.474 30.4133 155.328 29.36 154.474 28C153.621 26.64 153.194 25.0267 153.194 23.16C153.194 21.2933 153.608 19.6267 154.434 18.16C155.288 16.6667 156.448 15.4933 157.914 14.64C159.381 13.76 161.048 13.32 162.914 13.32C164.728 13.32 166.234 13.76 167.434 14.64C168.661 15.4933 169.581 16.6533 170.194 18.12C170.808 19.5867 171.114 21.2267 171.114 23.04H159.034V20.48L165.554 20.12C165.554 19.4267 165.448 18.8 165.234 18.24C165.048 17.68 164.741 17.24 164.314 16.92C163.914 16.5733 163.408 16.4 162.794 16.4C161.994 16.4 161.354 16.6933 160.874 17.28C160.394 17.8667 160.048 18.5867 159.834 19.44C159.648 20.2933 159.554 21.12 159.554 21.92C159.554 23.8667 160.048 25.4667 161.034 26.72C162.021 27.9467 163.341 28.56 164.994 28.56C165.661 28.56 166.421 28.4667 167.274 28.28C168.128 28.0933 168.888 27.8933 169.554 27.68ZM179.64 32.28C178.227 32.28 177.04 32.1467 176.08 31.88C175.12 31.6133 174.32 31.3067 173.68 30.96V25.96H176.28C176.493 27.1067 176.893 27.9867 177.48 28.6C178.093 29.2133 178.973 29.52 180.12 29.52C180.893 29.52 181.493 29.3333 181.92 28.96C182.347 28.5867 182.56 28.0933 182.56 27.48C182.56 27 182.333 26.6 181.88 26.28C181.453 25.9333 180.893 25.6133 180.2 25.32C179.533 25.0267 178.813 24.72 178.04 24.4C177.267 24.0533 176.533 23.6667 175.84 23.24C175.173 22.7867 174.613 22.24 174.16 21.6C173.733 20.96 173.52 20.1733 173.52 19.24C173.52 18.0133 173.827 16.96 174.44 16.08C175.053 15.2 175.933 14.52 177.08 14.04C178.227 13.56 179.587 13.32 181.16 13.32C182.44 13.32 183.52 13.4267 184.4 13.64C185.307 13.8533 186.16 14.1467 186.96 14.52V19.08H184.36C184.173 18.04 183.787 17.28 183.2 16.8C182.64 16.32 181.96 16.08 181.16 16.08C180.467 16.08 179.933 16.2667 179.56 16.64C179.187 17.0133 179 17.4667 179 18C179 18.48 179.213 18.8933 179.64 19.24C180.093 19.56 180.667 19.8667 181.36 20.16C182.08 20.4533 182.827 20.7733 183.6 21.12C184.373 21.44 185.107 21.8133 185.8 22.24C186.52 22.6667 187.093 23.1867 187.52 23.8C187.973 24.4133 188.2 25.1733 188.2 26.08C188.2 28 187.427 29.52 185.88 30.64C184.36 31.7333 182.28 32.28 179.64 32.28Z" fill="#E1DCD3"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_5_3">
+<rect width="192" height="40" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/front/public/LogoAlt.svg b/front/public/LogoAlt.svg
new file mode 100644
index 0000000..203865c
--- /dev/null
+++ b/front/public/LogoAlt.svg
@@ -0,0 +1,19 @@
+<svg width="192" height="40" viewBox="0 0 192 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_5_3)">
+<path d="M21.56 6.84V13.48H19.16C18.9733 12.2533 18.5733 11.28 17.96 10.56C17.3733 9.81333 16.5733 9.44 15.56 9.44H13.96V6.84H21.56ZM14.12 26.16C14.12 26.96 14.2933 27.5733 14.64 28C15.0133 28.4 15.6133 28.6667 16.44 28.8V31H5.8V28.8C6.62667 28.6667 7.21333 28.4 7.56 28C7.93333 27.6 8.12 27.0133 8.12 26.24V6.84H14.12V26.16ZM0.64 6.84H8.6V9.44H6.64C5.62667 9.44 4.8 9.81333 4.16 10.56C3.54667 11.28 3.17333 12.2533 3.04 13.48H0.64V6.84ZM32.2259 27.4L32.7859 28.64C32.0659 29.4667 31.2259 30.12 30.2659 30.6C29.3326 31.08 28.2659 31.32 27.0659 31.32C25.4393 31.32 24.1193 30.88 23.1059 30C22.0926 29.0933 21.5859 27.9467 21.5859 26.56C21.5859 24.8267 22.3459 23.44 23.8659 22.4C25.3859 21.3333 27.3859 20.8 29.8659 20.8H32.9059V23.04H31.1059C30.1193 23.04 29.3193 23.2667 28.7059 23.72C28.0926 24.1467 27.7859 24.72 27.7859 25.44C27.7859 26.1067 28.0659 26.64 28.6259 27.04C29.1859 27.44 29.9193 27.64 30.8259 27.64C31.0926 27.64 31.3459 27.6267 31.5859 27.6C31.8259 27.5467 32.0393 27.48 32.2259 27.4ZM38.0659 24.68C38.0659 25.48 38.2393 26.08 38.5859 26.48C38.9593 26.8533 39.5193 27.12 40.2659 27.28V29.48L35.5059 31.28H34.3059L32.1059 27.92V18.04C32.1059 17.1067 31.8659 16.3867 31.3859 15.88C30.9059 15.3733 30.2793 15.12 29.5059 15.12C28.6793 15.12 27.9326 15.4133 27.2659 16C26.6259 16.56 26.1459 17.44 25.8259 18.64H23.2259V13.88C24.3193 13.4 25.4259 13.0267 26.5459 12.76C27.6926 12.4667 28.9193 12.32 30.2259 12.32C31.6393 12.32 32.9326 12.56 34.1059 13.04C35.3059 13.4933 36.2659 14.24 36.9859 15.28C37.7059 16.32 38.0659 17.68 38.0659 19.36V24.68ZM48.4994 31.28C47.086 31.28 45.8994 31.1467 44.9394 30.88C43.9794 30.6133 43.1794 30.3067 42.5394 29.96V24.96H45.1394C45.3527 26.1067 45.7527 26.9867 46.3394 27.6C46.9527 28.2133 47.8327 28.52 48.9794 28.52C49.7527 28.52 50.3527 28.3333 50.7794 27.96C51.206 27.5867 51.4194 27.0933 51.4194 26.48C51.4194 26 51.1927 25.6 50.7394 25.28C50.3127 24.9333 49.7527 24.6133 49.0594 24.32C48.3927 24.0267 47.6727 23.72 46.8994 23.4C46.126 23.0533 45.3927 22.6667 44.6994 22.24C44.0327 21.7867 43.4727 21.24 43.0194 20.6C42.5927 19.96 42.3794 19.1733 42.3794 18.24C42.3794 17.0133 42.686 15.96 43.2994 15.08C43.9127 14.2 44.7927 13.52 45.9394 13.04C47.086 12.56 48.446 12.32 50.0194 12.32C51.2994 12.32 52.3794 12.4267 53.2594 12.64C54.166 12.8533 55.0194 13.1467 55.8194 13.52V18.08H53.2194C53.0327 17.04 52.646 16.28 52.0594 15.8C51.4994 15.32 50.8194 15.08 50.0194 15.08C49.326 15.08 48.7927 15.2667 48.4194 15.64C48.046 16.0133 47.8594 16.4667 47.8594 17C47.8594 17.48 48.0727 17.8933 48.4994 18.24C48.9527 18.56 49.526 18.8667 50.2194 19.16C50.9394 19.4533 51.686 19.7733 52.4594 20.12C53.2327 20.44 53.966 20.8133 54.6594 21.24C55.3794 21.6667 55.9527 22.1867 56.3794 22.8C56.8327 23.4133 57.0594 24.1733 57.0594 25.08C57.0594 27 56.286 28.52 54.7394 29.64C53.2194 30.7333 51.1394 31.28 48.4994 31.28ZM71.3688 15.56H62.2488V12.6H71.3688V15.56ZM71.6088 27.4L72.2888 29.44C71.5421 29.92 70.6088 30.3467 69.4888 30.72C68.3954 31.0933 67.3021 31.28 66.2088 31.28C64.4221 31.28 62.9954 30.7467 61.9288 29.68C60.8621 28.5867 60.3288 27.1867 60.3288 25.48V15.56H58.6888V13.2C59.8354 12.8 60.8354 12.2 61.6888 11.4C62.5688 10.5733 63.1688 9.58667 63.4888 8.44H66.2888V24.72C66.2888 25.6267 66.5688 26.36 67.1288 26.92C67.7154 27.48 68.4621 27.76 69.3688 27.76C69.7154 27.76 70.0754 27.7333 70.4488 27.68C70.8221 27.6 71.2088 27.5067 71.6088 27.4ZM86.0953 14.8V12.6H93.4153V14.8C92.9353 15.0667 92.522 15.4 92.1753 15.8C91.8553 16.2 91.562 16.6933 91.2953 17.28L85.2553 30.68L82.0953 39H76.2553V37.6L82.8953 29.4L82.4953 32.2L74.9353 17.28C74.6686 16.7467 74.402 16.2667 74.1353 15.84C73.8953 15.4133 73.5086 15.0667 72.9753 14.8V12.6H82.3753V14.8C81.7886 14.8 81.3753 15.0267 81.1353 15.48C80.922 15.9067 80.9486 16.4533 81.2153 17.12L85.5353 27.72L82.9753 29.24L87.5353 17.28C87.8286 16.48 87.8153 15.8667 87.4953 15.44C87.1753 15.0133 86.7086 14.8 86.0953 14.8Z" fill="#E1DCD3"/>
+<mask id="mask0_5_3" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="114" y="0" width="78" height="38">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M119.386 2.80517C119.393 2.57069 119.348 2.3392 119.255 2.11928C119.077 1.69954 118.738 1.35465 118.322 1.09748C117.492 0.583728 116.265 0.358072 114.914 0.593113C114.642 0.640467 114.46 0.899396 114.507 1.17145C114.555 1.4435 114.814 1.62565 115.086 1.5783C116.246 1.37641 117.214 1.58769 117.796 1.94781C118.087 2.12758 118.258 2.32886 118.334 2.50991C118.406 2.67803 118.409 2.85596 118.314 3.05449L117.972 3.77039L118.765 3.77039C119.904 3.77038 120.736 4.1618 121.218 4.86417C121.39 5.11429 121.483 5.44798 121.482 5.76505C121.481 6.0947 121.382 6.31239 121.286 6.40364L120.764 6.90069L121.412 7.21564C122.24 7.61757 122.429 7.99264 122.466 8.17495C122.54 8.54668 122.46 8.71831 122.354 8.8474C122.234 8.99365 122.072 9.10377 121.831 9.26727C121.766 9.31167 121.695 9.36 121.617 9.41405L120.813 9.97426L121.739 10.2966C122.236 10.4697 122.394 10.7161 122.455 10.8959C122.527 11.1066 122.498 11.3263 122.468 11.4645C122.394 11.8016 122.305 12.0481 122.168 12.2356C122.04 12.4099 121.845 12.5677 121.486 12.6759L120.565 12.9541L121.322 13.548C121.573 13.7444 121.673 13.9419 121.699 14.1108C121.725 14.2821 121.684 14.4881 121.533 14.7163C121.223 15.185 120.479 15.6817 119.307 15.8858L118.383 16.0467L119.032 16.7242C119.301 17.0058 119.388 17.2148 119.408 17.3507C119.425 17.4739 119.396 17.5921 119.3 17.7253C119.082 18.0295 118.583 18.3156 117.973 18.5278C117.713 18.6186 117.575 18.9036 117.666 19.1644C117.756 19.4252 119.322 19.0653 119.583 18.9745C120.229 18.7498 119.704 18.8782 120.113 18.3085C120.331 18.0048 120.458 17.6314 120.398 17.2085C120.372 17.0331 120.317 16.8611 120.233 16.6925C121.205 16.3964 121.956 15.8899 122.367 15.2683C122.627 14.8751 122.758 14.422 122.687 13.9597C122.653 13.7336 122.572 13.5204 122.452 13.3238C122.661 13.1854 122.834 13.0189 122.975 12.8265C123.236 12.4705 123.36 12.0615 123.444 11.6797C123.489 11.478 123.561 11.0424 123.402 10.5734C123.302 10.2809 123.122 10.0029 122.837 9.76967C122.942 9.68153 123.042 9.58562 123.127 9.48112C123.442 9.09731 123.574 8.61354 123.446 7.97837C123.346 7.47759 122.991 6.99962 122.334 6.58393C122.437 6.32347 122.481 6.03787 122.482 5.76804C122.483 5.27517 122.344 4.73691 122.043 4.2982C121.436 3.4142 120.492 2.93274 119.386 2.80517Z" fill="#111111"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M122.077 22.0329C122.147 21.8107 122.162 21.5752 122.123 21.3365C122.047 20.8784 121.78 20.4524 121.418 20.091C120.692 19.3664 119.473 18.7822 117.994 18.5849C117.72 18.5484 117.468 18.7406 117.432 19.0144C117.395 19.2881 117.588 19.5396 117.861 19.5761C119.175 19.7514 120.174 20.2624 120.711 20.7987C120.981 21.0679 121.106 21.3137 121.136 21.4993C121.163 21.6615 121.126 21.8081 120.981 21.9538L120.388 22.5499L121.195 22.7861C122.442 23.1513 123.238 23.7987 123.561 24.6146C123.673 24.8991 123.678 25.2292 123.594 25.5111C123.508 25.8016 123.354 25.9674 123.224 26.0243L122.48 26.3508L123.107 26.868C123.898 27.5207 123.986 27.9365 123.977 28.0958C123.965 28.286 123.923 28.3995 123.88 28.4709C123.839 28.5405 123.78 28.5977 123.691 28.651C123.52 28.753 123.31 28.8076 123.007 28.8865C122.926 28.9077 122.838 28.9306 122.742 28.9567L121.674 29.2474L122.598 29.8566C123.107 30.1922 123.202 30.4846 123.217 30.6555C123.233 30.8574 123.151 31.0399 123.083 31.1562C122.914 31.4447 122.756 31.6434 122.561 31.7746C122.376 31.8993 122.113 31.9922 121.68 31.9815L120.597 31.9547L121.279 32.7961C121.5 33.0694 121.544 33.2822 121.527 33.4273C121.511 33.5715 121.425 33.7401 121.203 33.9062C120.74 34.2519 119.794 34.4925 118.464 34.3151L117.434 34.1777L117.97 35.0684C118.183 35.423 118.211 35.6394 118.197 35.7544C118.185 35.8497 118.136 35.9401 117.998 36.0352C117.849 36.1381 117.619 36.2262 117.315 36.2876C117.016 36.348 116.677 36.3766 116.334 36.3811C116.058 36.3847 115.837 36.6114 115.841 36.8875C115.844 37.1636 116.071 37.3846 116.347 37.381C116.732 37.376 117.137 37.3439 117.513 37.2678C117.884 37.1928 118.26 37.0687 118.565 36.8591C118.881 36.6418 119.134 36.3195 119.189 35.8776C119.21 35.7126 119.201 35.5441 119.166 35.3728C120.266 35.3986 121.194 35.1612 121.802 34.7072C122.188 34.4181 122.466 34.0213 122.521 33.5403C122.546 33.3234 122.523 33.1081 122.459 32.8983C122.705 32.8349 122.924 32.7362 123.12 32.604C123.499 32.349 123.748 31.9987 123.946 31.6615C124.051 31.4819 124.256 31.0805 124.213 30.5719C124.188 30.2688 124.078 29.9641 123.861 29.6725C123.981 29.6266 124.097 29.5733 124.203 29.5101C124.408 29.3881 124.598 29.2204 124.739 28.9828C124.88 28.7471 124.955 28.4712 124.975 28.1572C125.006 27.6401 124.757 27.0842 124.188 26.5028C124.358 26.2934 124.479 26.0454 124.553 25.7955C124.695 25.3176 124.692 24.7567 124.491 24.2469C124.085 23.2217 123.212 22.4859 122.077 22.0329Z" fill="#111111"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M122.077 5.5L118.765 2.29038L115 0.5H191.5V37.5H116.5V36.5H118.197L119.032 35.0684L121.802 34.1777V32.604L123.88 31.1562L123.107 29.5101L124.491 28.9828L123.88 26.868L124.213 24.7771L122.561 22.5499L119.408 19.1644L120 16.5L121.195 16.0467L123 11L122.077 5.5Z" fill="#111111"/>
+</mask>
+<g mask="url(#mask0_5_3)">
+<rect x="100" y="1" width="91" height="36" rx="2" fill="#E1DCD3"/>
+<path d="M116.16 19.92L116.12 19.36C117.72 19.36 119.12 19.6133 120.32 20.12C121.547 20.6267 122.507 21.3333 123.2 22.24C123.893 23.1467 124.24 24.2 124.24 25.4C124.24 26.7067 123.827 27.8667 123 28.88C122.173 29.8667 121.013 30.64 119.52 31.2C118.053 31.7333 116.32 32 114.32 32H110.96V29.24L112.92 29.12C113.907 29.0667 114.747 28.88 115.44 28.56C116.16 28.24 116.707 27.8 117.08 27.24C117.48 26.6533 117.68 25.9867 117.68 25.24C117.68 24.4133 117.48 23.7067 117.08 23.12C116.707 22.5333 116.133 22.0667 115.36 21.72C114.587 21.3467 113.6 21.12 112.4 21.04L110.96 20.92V18.4L112.56 18.28C114.213 18.1467 115.413 17.7333 116.16 17.04C116.933 16.3467 117.32 15.4267 117.32 14.28C117.32 13.1867 116.92 12.32 116.12 11.68C115.32 11.0133 114.28 10.64 113 10.56L110.96 10.44V7.84H113.68C115.627 7.84 117.333 8.12 118.8 8.68C120.267 9.21333 121.413 9.97333 122.24 10.96C123.067 11.92 123.48 13.0533 123.48 14.36C123.48 15.4533 123.173 16.4267 122.56 17.28C121.947 18.1067 121.093 18.76 120 19.24C118.907 19.6933 117.627 19.92 116.16 19.92ZM111.72 7.84V32H103.4V29.8C104.173 29.6133 104.747 29.3333 105.12 28.96C105.52 28.5867 105.72 28.0133 105.72 27.24V12.6C105.72 11.8267 105.533 11.24 105.16 10.84C104.813 10.4133 104.227 10.1467 103.4 10.04V7.84H111.72ZM128.233 8.28C128.233 7.34667 128.579 6.56 129.273 5.92C129.966 5.28 130.806 4.96 131.793 4.96C132.779 4.96 133.606 5.28 134.273 5.92C134.939 6.56 135.273 7.34667 135.273 8.28C135.273 9.24 134.939 10.0533 134.273 10.72C133.606 11.36 132.779 11.68 131.793 11.68C130.806 11.68 129.966 11.36 129.273 10.72C128.579 10.0533 128.233 9.24 128.233 8.28ZM137.193 32H126.833V29.8C127.633 29.5867 128.193 29.2933 128.513 28.92C128.859 28.52 129.033 27.92 129.033 27.12V20.36C129.033 19.5867 128.859 19.0133 128.513 18.64C128.166 18.2667 127.606 18 126.833 17.84V15.64L132.473 13.6H134.993V27.24C134.993 28.0133 135.166 28.5867 135.513 28.96C135.886 29.3333 136.446 29.6133 137.193 29.8V32ZM151.298 16.56H142.178V13.6H151.298V16.56ZM151.538 28.4L152.218 30.44C151.472 30.92 150.538 31.3467 149.418 31.72C148.325 32.0933 147.232 32.28 146.138 32.28C144.352 32.28 142.925 31.7467 141.858 30.68C140.792 29.5867 140.258 28.1867 140.258 26.48V16.56H138.618V14.2C139.765 13.8 140.765 13.2 141.618 12.4C142.498 11.5733 143.098 10.5867 143.418 9.44H146.218V25.72C146.218 26.6267 146.498 27.36 147.058 27.92C147.645 28.48 148.392 28.76 149.298 28.76C149.645 28.76 150.005 28.7333 150.378 28.68C150.752 28.6 151.138 28.5067 151.538 28.4ZM169.554 27.68L170.394 29.96C169.648 30.44 168.621 30.9467 167.314 31.48C166.034 32.0133 164.541 32.28 162.834 32.28C161.021 32.28 159.381 31.9067 157.914 31.16C156.474 30.4133 155.328 29.36 154.474 28C153.621 26.64 153.194 25.0267 153.194 23.16C153.194 21.2933 153.608 19.6267 154.434 18.16C155.288 16.6667 156.448 15.4933 157.914 14.64C159.381 13.76 161.048 13.32 162.914 13.32C164.728 13.32 166.234 13.76 167.434 14.64C168.661 15.4933 169.581 16.6533 170.194 18.12C170.808 19.5867 171.114 21.2267 171.114 23.04H159.034V20.48L165.554 20.12C165.554 19.4267 165.448 18.8 165.234 18.24C165.048 17.68 164.741 17.24 164.314 16.92C163.914 16.5733 163.408 16.4 162.794 16.4C161.994 16.4 161.354 16.6933 160.874 17.28C160.394 17.8667 160.048 18.5867 159.834 19.44C159.648 20.2933 159.554 21.12 159.554 21.92C159.554 23.8667 160.048 25.4667 161.034 26.72C162.021 27.9467 163.341 28.56 164.994 28.56C165.661 28.56 166.421 28.4667 167.274 28.28C168.128 28.0933 168.888 27.8933 169.554 27.68ZM179.64 32.28C178.227 32.28 177.04 32.1467 176.08 31.88C175.12 31.6133 174.32 31.3067 173.68 30.96V25.96H176.28C176.493 27.1067 176.893 27.9867 177.48 28.6C178.093 29.2133 178.973 29.52 180.12 29.52C180.893 29.52 181.493 29.3333 181.92 28.96C182.347 28.5867 182.56 28.0933 182.56 27.48C182.56 27 182.333 26.6 181.88 26.28C181.453 25.9333 180.893 25.6133 180.2 25.32C179.533 25.0267 178.813 24.72 178.04 24.4C177.267 24.0533 176.533 23.6667 175.84 23.24C175.173 22.7867 174.613 22.24 174.16 21.6C173.733 20.96 173.52 20.1733 173.52 19.24C173.52 18.0133 173.827 16.96 174.44 16.08C175.053 15.2 175.933 14.52 177.08 14.04C178.227 13.56 179.587 13.32 181.16 13.32C182.44 13.32 183.52 13.4267 184.4 13.64C185.307 13.8533 186.16 14.1467 186.96 14.52V19.08H184.36C184.173 18.04 183.787 17.28 183.2 16.8C182.64 16.32 181.96 16.08 181.16 16.08C180.467 16.08 179.933 16.2667 179.56 16.64C179.187 17.0133 179 17.4667 179 18C179 18.48 179.213 18.8933 179.64 19.24C180.093 19.56 180.667 19.8667 181.36 20.16C182.08 20.4533 182.827 20.7733 183.6 21.12C184.373 21.44 185.107 21.8133 185.8 22.24C186.52 22.6667 187.093 23.1867 187.52 23.8C187.973 24.4133 188.2 25.1733 188.2 26.08C188.2 28 187.427 29.52 185.88 30.64C184.36 31.7333 182.28 32.28 179.64 32.28Z" fill="#443023"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_5_3">
+<rect width="192" height="40" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/front/src/pages/PageCart.svelte b/front/src/pages/PageCart.svelte
index c5e412b..fd0db9a 100644
--- a/front/src/pages/PageCart.svelte
+++ b/front/src/pages/PageCart.svelte
@@ -1,2 +1,18 @@
+<script>
+    import { link } from 'svelte-spa-router';
+</script>
+
 <h1>Shopping Cart</h1>
-<p>Empty....</p>
+
+<div class="container">
+    <div class="section">
+        <p>Empty....</p>
+    </div>
+</div>
+
+<div class="spacer"></div>
+
+<p>Looking past orders? Check out the <a href="/contact" use:link>commonly asked questions</a></p>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/front/src/pages/PageContact.svelte b/front/src/pages/PageContact.svelte
index e427d5e..fc62c2b 100644
--- a/front/src/pages/PageContact.svelte
+++ b/front/src/pages/PageContact.svelte
@@ -4,22 +4,25 @@
 
 <h1>Contact us</h1>
 
-<div class="menu-filter">
-    <div class="menu-filter-header">
+<div class="container">
+    <div class="header">
         <h2>Commonly Asked Questions</h2>
     </div>
     <hr>
-
-    <div class="menu-filter-section">
+    <div class="section">
         <DropDown name="Can I refund my order?">
             <p>If you ordered online, if we haven't started making your food yet, a refund is possible.</p>
             <p>If you reserved a table, you can refund upto 1 hour before your time.</p>
         </DropDown>
     </div>
-
     <hr>
-
-    <div class="menu-filter-section">
+    <div class="section">
+        <DropDown name="Where can I find my past orders!">
+            <p>Email....</p>
+        </DropDown>
+    </div>
+    <hr>
+    <div class="section">
         <DropDown name="Deez nuts">
             <p>Gottem</p>
         </DropDown>
@@ -29,46 +32,6 @@
 <div class="spacer"></div>
 
 <h2>Contact From</h2>
+<form>
 
-<style lang="scss">
-    @import "%/styles/vars";
-
-    h1, h2 {
-        margin-bottom: $spacing-small;
-    }
-    .spacer {
-        height: $spacing-large;
-    }
-
-    .menu-filter {
-        border-radius: $border-radius-normal;
-        background-image: url('/BackgroundTextureAlt.svg');
-        background-repeat: no-repeat;
-        background-size: 200px 250px;
-        background-position: 5px -43px;
-        background-color: $color-light;
-        color: $color-on-light;
-
-        h2 {
-            margin-bottom: 0;
-        }
-
-        hr {
-            height: 1px;
-            border: 0 transparent;
-            background-color: rgba($color-dark, 0.1);
-        }
-
-        .menu-filter-header {
-            padding: $spacing-normal;
-            display: flex;
-            flex-direction: row;
-            justify-content: space-between;
-            align-items: center;
-        }
-
-        .menu-filter-section {
-            padding: $spacing-normal;
-        }
-    }
-</style>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/front/src/pages/PageIndex.svelte b/front/src/pages/PageIndex.svelte
index 9e7d459..5fb7108 100644
--- a/front/src/pages/PageIndex.svelte
+++ b/front/src/pages/PageIndex.svelte
@@ -29,13 +29,14 @@
 
 <div>
     <AnnouncementBanner />
-    <a href="/annoucements" use:link style="float: right">Learn More <ArrowUpRight /></a>
+    <a href="/annoucements" use:link>Learn More <ArrowUpRight /></a>
     <div class="spacer"></div>
 
     <h2>Where to find us</h2>
-    <div class="contact">
+    <div id="contact">
         <div id="map"></div>
-        <div class="contact-detail">
+        <div class="container">
+            <h2>Some Title</h2>
             <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Perspiciatis dolore maiores, dolorem unde, illo vero dolores magnam omnis, explicabo vel eos voluptatem libero ullam ipsa molestias laboriosam voluptas nisi sunt.</p>
         </div>
     </div>
@@ -43,40 +44,17 @@
 
     <h2>Popular Today</h2>
     <MenuList {items} />
-    <a href="/menu" use:link style="float: right">See All <ArrowUpRight /></a>
+    <a href="/menu" use:link>See All <ArrowUpRight /></a>
     <div class="spacer"></div>
 
-    <h2>About Us</h2>
+    <h2>About Us</h2>contact
     <p>Want to know the story of the restaurant?</p>
-    <a href="/about" use:link style="float: right">Continue reading <ArrowUpRight /></a>
+    <a href="/about" use:link>Continue reading <ArrowUpRight /></a>
 </div>
 
 <style lang="scss">
     @import "%/styles/vars";
 
-    h2 {
-        margin-bottom: $spacing-small;
-    }
-    .spacer {
-        height: $spacing-large;
-    }
-
-    .contact {
-        display: flex;
-        flex-direction: row;
-
-        #map {
-            min-width: 600px;
-            height: 400px;
-
-            border-radius: $border-radius-normal;
-        }
-
-        .contact-detail {
-            padding-left: $spacing-normal;
-        }
-    }
-
     a {
         margin-top: 8px;
 
@@ -89,6 +67,8 @@
         justify-content: center;
         align-items: center;
 
+        float: right;
+
         text-decoration: none;
 
         border-radius: 9999px;
@@ -100,4 +80,43 @@
             color: $color-on-light;
         }
     }
+
+    #contact {
+        display: flex;
+        flex-direction: row;
+
+        .container {
+            margin-left: $spacing-normal;
+            padding: $spacing-normal;
+        }
+    }
+
+    #map {
+        min-width: 550px;
+        height: 350px;
+
+        border-radius: $border-radius-normal;
+    }
+
+    @media only screen and (max-width: 900px) {
+        #map {
+            min-width: 400px;
+            height: 300px;
+        }
+    }
+    @media only screen and (max-width: 750px) {
+        #contact {
+            display: flex;
+            flex-direction: column;
+
+            .container {
+                margin-left: 0;
+                margin-top: $spacing-normal;
+            }
+        }
+        #map {
+            min-width: unset;
+            height: 350px;
+        }
+    }
 </style>
diff --git a/front/src/pages/PageMenu.svelte b/front/src/pages/PageMenu.svelte
index 7acc82d..578f0f7 100644
--- a/front/src/pages/PageMenu.svelte
+++ b/front/src/pages/PageMenu.svelte
@@ -8,14 +8,13 @@
 </script>
 
 <div class="menu">
-    <div class="menu-filter">
-        <div class="menu-filter-header">
+    <div class="container" id="filter">
+        <div class="header">
             <h2>Filters</h2>
             <button><ArrowClockwise /></button>
         </div>
         <hr>
-
-        <div class="menu-filter-section">
+        <div class="section">
             <DropDown name="Meal Prefrences" open={true}>
                 <ul>
                     <li>
@@ -39,10 +38,8 @@
                 </ul>
             </DropDown>
         </div>
-
         <hr>
-
-        <div class="menu-filter-section">
+        <div class="section">
             <DropDown name="Allergies" open={true}>
                 <ul>
                     <li>
@@ -72,10 +69,8 @@
                 </ul>
             </DropDown>
         </div>
-
         <hr>
-
-        <div class="menu-filter-section">
+        <div class="section">
             <DropDown name="Meal Types" open={true}>
                 <ul>
                     <li>
@@ -124,8 +119,7 @@
             </DropDown>
         </div>
         <hr>
-
-        <div class="menu-filter-section">
+        <div class="section">
             <DropDown name="Other">
                 <ul>
                     <li>
@@ -151,7 +145,7 @@
         </div>
     </div>
 
-    <div class="menu-list">
+    <div id="menu-list">
         <h2>Main Menu</h2>
         <MenuList items={items} />
         <div class="spacer"></div>
@@ -168,13 +162,6 @@
 <style lang="scss">
     @import "%/styles/vars";
 
-    h2 {
-        margin-bottom: $spacing-small;
-    }
-    .spacer {
-        height: $spacing-large;
-    }
-
     .menu {
         display: flex;
         flex-direction: row;
@@ -182,35 +169,17 @@
         align-items: flex-start;
     }
 
-    .menu-list {
+    #menu-list {
         padding-left: $spacing-normal;
     }
 
-    .menu-filter {
+    #filter {
+        min-width: calc(300px - $spacing-normal);
         width: 100%;
         max-width: calc(300px - $spacing-normal);
-
         position: sticky;
         top: calc($sizing-navigation-height + $spacing-normal);
 
-        border-radius: $border-radius-normal;
-        background-image: url('/BackgroundTextureAlt.svg');
-        background-repeat: no-repeat;
-        background-size: 200px 250px;
-        background-position: 5px -43px;
-        background-color: $color-light;
-        color: $color-on-light;
-
-        h2 {
-            margin-bottom: 0;
-        }
-
-        hr {
-            height: 1px;
-            border: 0 transparent;
-            background-color: rgba($color-dark, 0.1);
-        }
-
         button {
             height: 32px;
             width: 32px;
@@ -232,18 +201,6 @@
                 color: $color-on-primary;
             }
         }
-
-        .menu-filter-header {
-            padding: $spacing-normal;
-            display: flex;
-            flex-direction: row;
-            justify-content: space-between;
-            align-items: center;
-        }
-
-        .menu-filter-section {
-            padding: $spacing-normal;
-        }
     }
 
     @media only screen and (max-width: 670px) {
@@ -251,14 +208,14 @@
             flex-direction: column;
         }
 
-        .menu-list {
-            padding-left: 0;
-            padding-top: $spacing-normal;
-        }
-
-        .menu-filter {
+        #filter {
             max-width: unset;
             position: unset;
         }
+
+        #menu-list {
+            padding-left: 0;
+            padding-top: $spacing-normal;
+        }
     }
 </style>
diff --git a/front/src/pages/elements/AnnouncementBanner.svelte b/front/src/pages/elements/AnnouncementBanner.svelte
index 3b4e6b9..1f58efa 100644
--- a/front/src/pages/elements/AnnouncementBanner.svelte
+++ b/front/src/pages/elements/AnnouncementBanner.svelte
@@ -1,9 +1,9 @@
 <script>
-    import LoadingBar from "%/pages/elements/LoadingBar.svelte";
+    // import LoadingBar from "%/pages/elements/LoadingBar.svelte";
     import LoadingImage from '/BannerLoading.svg';
 </script>
 
 <div class="announcement-banner">
-    <LoadingBar bottom={true} />
+<!--    <LoadingBar bottom={true} />-->
     <img src={LoadingImage} alt="">
 </div>
diff --git a/front/src/pages/elements/NavigationBar.svelte b/front/src/pages/elements/NavigationBar.svelte
index 6077417..4ad9026 100644
--- a/front/src/pages/elements/NavigationBar.svelte
+++ b/front/src/pages/elements/NavigationBar.svelte
@@ -1,6 +1,7 @@
 <script>
     import { link } from 'svelte-spa-router';
     import active from 'svelte-spa-router/active'
+    import Logo from '/LogoAlt.svg';
 
     export let scrolled = false;
 </script>
@@ -15,7 +16,7 @@
         </li>
     </ul>
 
-    <span>TastyBites</span>
+    <span><img src={Logo} alt="TastyBites"></span>
 
     <ul style="justify-content: flex-start">
         <li use:active={{path: '/contact', className: 'active'}}>
diff --git a/front/src/styles/_announcement_banner.scss b/front/src/styles/_announcement_banner.scss
index 252d5c5..8db9ca1 100644
--- a/front/src/styles/_announcement_banner.scss
+++ b/front/src/styles/_announcement_banner.scss
@@ -1,20 +1,26 @@
 .announcement-banner {
-    padding: $spacing-large;
-
-    height: 400px;
+    position: relative;
 
+    border-radius: $border-radius-normal;
     background-color: $color-light;
     color: $color-on-light;
-    //border: 1px solid $color-dark;
-    border-radius: $border-radius-normal;
-    position: relative;
+
     overflow: hidden;
 
     img{
-        position: absolute;
-        top: 0;
-        left: 0;
         width: 100%;
-        height: auto;
+        max-height: 400%;
+
+        display: block;
+
+        object-fit: cover;
     }
 }
+
+@media only screen and (max-width: 670px) {
+    .announcement-banner {
+        margin: -$spacing-normal;
+        margin-bottom: 0;
+        border-radius: 0;
+    }
+}
\ No newline at end of file
diff --git a/front/src/styles/_container.scss b/front/src/styles/_container.scss
new file mode 100644
index 0000000..0985eeb
--- /dev/null
+++ b/front/src/styles/_container.scss
@@ -0,0 +1,25 @@
+.container {
+    border-radius: $border-radius-normal;
+    background-image: url('/BackgroundTextureAlt.svg');
+    background-repeat: no-repeat;
+    background-size: 200px 250px;
+    background-position: 5px -43px;
+    background-color: $color-light;
+    color: $color-on-light;
+
+    .header {
+        padding: $spacing-normal;
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+
+        h2 {
+            padding-bottom: 0;
+        }
+    }
+
+    .section {
+        padding: $spacing-normal;
+    }
+}
\ No newline at end of file
diff --git a/front/src/styles/_navigation_bar.scss b/front/src/styles/_navigation_bar.scss
index 4df3a5e..31b458f 100644
--- a/front/src/styles/_navigation_bar.scss
+++ b/front/src/styles/_navigation_bar.scss
@@ -1,5 +1,5 @@
 nav {
-    padding: $spacing-normal;
+    padding: $spacing-small;
 
     width: 100%;
     height: $sizing-navigation-height;
@@ -51,6 +51,13 @@ nav {
         padding: 0 $spacing-normal;
         font-weight: $font-weight-black;
         font-size: $font-size-h1;
+
+        > img {
+            height: calc($sizing-navigation-height - calc(2 * $spacing-small));
+
+            display: block;
+        }
+
     }
 
     &.scrolled {
diff --git a/front/src/styles/_reset.scss b/front/src/styles/_reset.scss
index 5445e6b..ca0d33e 100644
--- a/front/src/styles/_reset.scss
+++ b/front/src/styles/_reset.scss
@@ -20,6 +20,10 @@ body {
     color: $color-on-background;
 }
 
+
+h1, h2, h3, h4, h5, h6 {
+    padding-bottom: $spacing-small;
+}
 h1 {
     font-size: $font-size-h1;
     font-weight: $font-weight-bolder;
@@ -53,6 +57,15 @@ small {
     font-weight: $font-weight-thin;
 }
 
+hr {
+    height: 1px;
+    border: 0 transparent;
+    background-color: rgba($color-dark, 0.1);
+}
+
+.spacer {
+    height: $spacing-large;
+}
 
 main {
     margin-left: auto;
diff --git a/front/src/styles/main.scss b/front/src/styles/main.scss
index 026e9fb..1e7537f 100644
--- a/front/src/styles/main.scss
+++ b/front/src/styles/main.scss
@@ -4,4 +4,5 @@
 @import "loading_bar";
 @import "navigation_bar";
 @import "announcement_banner";
+@import "container";
 @import "menu_item";
diff --git a/front/src/testData.js b/front/src/testData.js
index 1a49529..ea5ed23 100644
--- a/front/src/testData.js
+++ b/front/src/testData.js
@@ -36,7 +36,7 @@ export default Items = [
         name: "GwaGwa",
         price: "Priceless",
         labels: ["nut"],
-        image: "/dab.jpg",
+        // image: "/dab.jpg",
     },
     {
         name: "Hogermellon",