Modified views, template according to comment