Locations pages refactor 9