Fixed modal pop-up not working and updated map