Rework media queries & change associated classes.