make list item logic and template fits new models