Separate resolution and layout media queries

As promised!