Edit formating, use proper links