Moved media queries into context