Fix row & rows alternance
Merge subdivision and alignment blocks
Update sample