About to refactor media queries