Updated datagrid and styling
Fixed merge