more cleanup, more sensible widths for media queries