Tweaked media queries to prevent overlap