Moved Media Queries To Main CSS, and Changed Some Elements To Flex Boxes