Added support for Grid layouts in XML