Media query reorg