Fix 132 - Integrate Locations page