Map and data final change

re mapped data and final changes to app