Fine-tune media queries and add layout variables.