Refactored Media Queries