Added link on images
Alterations to views and fix for tests