Changing to map and list instead of multiple lists for UI
Updated map to show locations and rank