Second attempt at margin layout fixes.