Added the media queries from the other branch. All tests pass and everything looks good.