Updated how labels are called when clicking on a mark for more info
Fixing merge conflicts