Improvement on Media Queries