Redesign: more media query testing and fixes.