Improve CSS with media-queries