restructured media queries