Refactoring out all media queries to it's context