Nested grid additions

* Improved block nesting
* Added block rows to allow for better layouts