Changed dataGrid to work with updated recordlayout
Merging origin/jye/master-pending-datagrid-recordLayoutChanges into master