Updated with media queries