Cleaned up and finally bound the correct data to Datagrid

Back on track & ~more