Improved layout / markers / geolocation