Fix media queries and styles

[#47736459 #40093885]