better media query refactoring begins