Changing to proper links