Working template to replace old view #SGoo-49 comment