Changed back to DataGrid. Tweaks to layout