Revert "Revert "Row/Colum Alignment""

This reverts commit a68385b1955bd9414ab53b39c2cd0cadb9cf7caa.