more cleanly nesting sass

putting media queries that are related together, so it is easier to read.