Small layout tweaks around media queries