adding id and fixing link