Changed media queries to overlap instead of exclusive