Refactor @media queries +