Added links on detial page and a few bug fixes