Added support to colSpan/ rowSpan to Layout