Fixed models and templates

#note not working pa update/delete