Few more media query tweaks