Updated spotlight template, better layout and full image pop up