Separate resolution and layout media queries

Also "future-proofed" the resolution query. This will stop triggering the wrong layout on HiDPI computers, and will stop displaying a teeny-weenie image on standard DPI phones.