Clean up layout across media queries