Improve the CSS and add media queries