add links to marker popups, and give max height on popup
fix merge