Fixed CSS to better handle media queries