better organized media queries