Updates

Updated Grid to match with media query changes