Add Google Maps. Clean up templates