Fixed issue with nesting rows