#87 - Michael/Raz - Added product links