Location link fixes and formatting