rewrote conditions for media queries