Add media queries to grid, resolve #1