Only adjust width media queries & do it more succinctly