Grid and margin updates