Refactor the media queries