Improvements on Media Queries, considering device-width