Bugfix

Links fixed
Added return links