Add even more media queries, improve margins