simplifying grid and adding media query vals